svn commit: r733870 - in /incubator/shindig/branches/1.0.x-incubating: ./ java/common/src/test/java/org/apache/shindig/common/ java/server/src/test/java/org/apache/shindig/server/endtoend/ java/server/src/test/resources/endtoend/

[lindner]

Author: lindner
Date: Mon Jan 12 11:11:24 2009
New Revision: 733870

URL: http://svn.apache.org/viewvc?rev=733870&view=rev
Log:
SHINDIG-710 | Patch from Adam Winer | Add message bundle tests

Added:
    
incubator/shindig/branches/1.0.x-incubating/java/server/src/test/resources/endtoend/messageBundle.xml
      - copied unchanged from r733869, 
incubator/shindig/trunk/java/server/src/test/resources/endtoend/messageBundle.xml
    
incubator/shindig/branches/1.0.x-incubating/java/server/src/test/resources/endtoend/messages.xml
      - copied unchanged from r733869, 
incubator/shindig/trunk/java/server/src/test/resources/endtoend/messages.xml
    
incubator/shindig/branches/1.0.x-incubating/java/server/src/test/resources/endtoend/messages_ar.xml
      - copied unchanged from r733869, 
incubator/shindig/trunk/java/server/src/test/resources/endtoend/messages_ar.xml
Modified:
    incubator/shindig/branches/1.0.x-incubating/   (props changed)
    
incubator/shindig/branches/1.0.x-incubating/java/common/src/test/java/org/apache/shindig/common/AllTests.java
   (props changed)
    
incubator/shindig/branches/1.0.x-incubating/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java

Propchange: incubator/shindig/branches/1.0.x-incubating/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 12 11:11:24 2009
@@ -1 +1 @@
-/incubator/shindig/trunk:724511-724522,724874,724915,724939,726597,727032-727033,727048,733593,733596-733666
+/incubator/shindig/trunk:724511-724522,724874,724915,724939,726597,727032-727033,727048,733593,733596-733666,733865-733869

Propchange: 
incubator/shindig/branches/1.0.x-incubating/java/common/src/test/java/org/apache/shindig/common/AllTests.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 12 11:11:24 2009
@@ -1 +1 @@
-/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/AllTests.java:733619-733666
+/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/AllTests.java:733619-733666,733865-733869

Modified: 
incubator/shindig/branches/1.0.x-incubating/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java?rev=733870&r1=733869&r2=733870&view=diff
==============================================================================
--- 
incubator/shindig/branches/1.0.x-incubating/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
 (original)
+++ 
incubator/shindig/branches/1.0.x-incubating/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
 Mon Jan 12 11:11:24 2009
@@ -60,6 +60,7 @@
   private WebClient webClient;
   private CollectingAlertHandler alertHandler;
   private SecurityToken token;
+  private String language;
 
   @Test
   public void checkResources() throws Exception {
@@ -81,6 +82,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");
@@ -124,6 +138,7 @@
     alertHandler = new CollectingAlertHandler();
     webClient.setAlertHandler(alertHandler);
     token = createToken("canonical", "john.doe");
+    language = null;
   }
 
   @After
@@ -167,6 +182,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());