svn commit: r952551 - in /shindig/trunk/java: common/src/test/java/org/apache/shindig/protocol/conversion/ gadgets/src/test/java/org/apache/shindig/gadgets/variables/ server/src/test/java/org/apache/shindig/server/endtoend/

[li...@apache.org]

Author: lindner
Date: Tue Jun  8 06:56:35 2010
New Revision: 952551

URL: http://svn.apache.org/viewvc?rev=952551&view=rev
Log:
re-enable some tests

Modified:
    shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanXmlConverterTest.java
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/BidiSubstituterTest.java
    shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java

Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanXmlConverterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanXmlConverterTest.java?rev=952551&r1=952550&r2=952551&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanXmlConverterTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanXmlConverterTest.java Tue Jun  8 06:56:35 2010
@@ -58,8 +58,8 @@ public class BeanXmlConverterTest extend
   }
 
   @Test
-  @Ignore("unknown why this is disabled")
-  public void xxxtestMapsToXml() throws Exception {
+  //@Ignore("unknown why this is disabled")
+  public void testMapsToXml() throws Exception {
     // This is the structure our app data currently takes
     Map<String, Map<String, String>> map = Maps.newTreeMap();
     Map<String, String> item1Map = ImmutableMap.of("value","1");
@@ -76,7 +76,7 @@ public class BeanXmlConverterTest extend
     // TODO: I don't believe this is the output we are looking for for app
     // data... we will probably have to tweak this.
     String expectedXml =
-        "<treemap>" +
+        "<response>" +
         "<empty>false</empty>" +
         "<entry>" +
           "<key>item1</key>" +
@@ -98,7 +98,7 @@ public class BeanXmlConverterTest extend
             "</entry>" +
           "</value>" +
         "</entry>" +
-        "</treemap>";
+        "</response>";
     assertEquals(expectedXml, StringUtils.deleteWhitespace(xml));
   }
 

Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/BidiSubstituterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/BidiSubstituterTest.java?rev=952551&r1=952550&r2=952551&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/BidiSubstituterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/BidiSubstituterTest.java Tue Jun  8 06:56:35 2010
@@ -21,6 +21,7 @@ import org.apache.shindig.common.uri.Uri
 import org.apache.shindig.gadgets.GadgetContext;
 import org.apache.shindig.gadgets.render.FakeMessageBundleFactory;
 import org.apache.shindig.gadgets.spec.GadgetSpec;
+import org.apache.shindig.gadgets.spec.SpecParserException;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -37,18 +38,11 @@ public class BidiSubstituterTest extends
     assertLeftToRight(BidiSubstituter.LTR);
   }
 
-  @Test
-  @Ignore("Is this valid behaviour?")
+  @Test(expected=SpecParserException.class)
   public void testBidiWithEmpty() throws Exception {
     assertLeftToRight("");
   }
 
-  @Test
-  @Ignore("Is this valid behaviour?")
-  public void testBidiWithNull() throws Exception {
-    assertLeftToRight(null);
-  }
-
   private void assertRightToLeft(String direction) throws Exception {
     assertSubstitutions(direction, BidiSubstituter.RIGHT,
         BidiSubstituter.LEFT, BidiSubstituter.RTL, BidiSubstituter.LTR);

Modified: shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java?rev=952551&r1=952550&r2=952551&view=diff
==============================================================================
--- shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java (original)
+++ shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java Tue Jun  8 06:56:35 2010
@@ -257,13 +257,13 @@ public class EndToEndTest {
 
 
   @Test
-  @Ignore("Problem with taming") // FIXME
+  //@Ignore("Problem with taming") // FIXME
   public void testCajaOsapiAppdata() throws Exception {
     executeAllPageTests("osapi/appdataTest", true /* caja */);
   }
 
   @Test
-  @Ignore("Problem with taming") // FIXME
+  //@Ignore("Problem with taming") // FIXME
   public void testCajaOsapiBatch() throws Exception {
     executeAllPageTests("osapi/batchTest", true /* caja */);
   }