Author: lindner
Date: Mon Jan 12 10:55:11 2009
New Revision: 733865
URL: http://svn.apache.org/viewvc?rev=733865&view=rev
Log:
SHINDIG-710 | Patch from Adam Winer | Add message bundle tests
Modified:
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
Modified:
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java?rev=733865&r1=733864&r2=733865&view=diff
==============================================================================
---
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
(original)
+++
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
Mon Jan 12 10:55:11 2009
@@ -61,6 +61,7 @@
private WebClient webClient;
private CollectingAlertHandler alertHandler;
private SecurityToken token;
+ private String language;
@Test
public void checkResources() throws Exception {
@@ -82,6 +83,19 @@
}
@Test
+ public void messageBundles() throws Exception {
+ executeAllPageTests("messageBundle");
+ }
+
+ @Test
+ public void messageBundlesRtl() throws Exception {
+ // Repeeat the messageBundle tests, but with the language set to "ar"
+ language = "ar";
+
+ executeAllPageTests("messageBundle");
+ }
+
+ @Test
public void notFoundError() throws Exception {
server.setDataServiceError(HttpServletResponse.SC_NOT_FOUND, "Not Found");
executePageTest("errorTest", "notFoundError");
@@ -125,6 +139,7 @@
alertHandler = new CollectingAlertHandler();
webClient.setAlertHandler(alertHandler);
token = createToken("canonical", "john.doe");
+ language = null;
}
@After
@@ -168,6 +183,10 @@
url += "&st=" + URLEncoder.encode(decoder.encodeToken(token), "UTF-8");
url += "&testMethod=" + URLEncoder.encode(testMethod, "UTF-8");
url += "&nocache=1";
+ if (language != null) {
+ url += "&lang=" + language;
+ }
+
Page page = webClient.getPage(url);
if (!(page instanceof HtmlPage)) {
fail("Got wrong page type. Was: " +
page.getWebResponse().getContentType());