pom changes in devtest module. Missing assertions and latest tests

diff --git a/devtest/pom.xml b/devtest/pom.xml
index add223c39001d611b9406e1cdbc01f7bc6acb9f9..934fd9452ace90595d46c39cbc9bf81b82c80140 100644 (file)
--- a/devtest/pom.xml
+++ b/devtest/pom.xml
@@ -33,7 +33,6 @@
         </dependency>        
     </dependencies>
     <build>
-       <outputDirectory>./target/www/WEB-INF/classes</outputDirectory>
         <resources>
             <resource>
                 <directory>${basedir}/src/main/java</directory>
@@ -50,7 +49,6 @@
                 <directory>${basedir}/src/test/resources</directory>
             </testResource>
         </testResources>
-
         <plugins>
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
@@ -84,5 +82,6 @@
               </configuration>
           </plugin>
         </plugins>
+        <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
     </build>
 </project>

diff --git a/devtest/src/main/java/com/google/gwt/query/client/DevTestRunner.java b/devtest/src/main/java/com/google/gwt/query/client/DevTestRunner.java
index 912e16d8c1b0b38c0bb2dea8ebd85f0d137c806a..81e718f648bf0f07bea3a606d14863e119125df9 100644 (file)
--- a/devtest/src/main/java/com/google/gwt/query/client/DevTestRunner.java
+++ b/devtest/src/main/java/com/google/gwt/query/client/DevTestRunner.java
@@ -22,6 +22,9 @@ import com.google.gwt.dom.client.Element;
 import com.google.gwt.event.dom.client.FocusHandler;\r
 import com.google.gwt.event.shared.GwtEvent;\r
 import com.google.gwt.event.shared.HandlerRegistration;\r
+import com.google.gwt.query.client.css.CSS;\r
+import com.google.gwt.query.client.css.RGBColor;\r
+import com.google.gwt.query.client.js.JsCache;\r
 import com.google.gwt.query.client.js.JsUtils;\r
 import com.google.gwt.query.client.plugins.Events;\r
 import com.google.gwt.query.client.plugins.effects.PropertiesAnimation;\r
@@ -49,8 +52,7 @@ public class DevTestRunner extends MyTestCase implements EntryPoint {
   public void onModuleLoad() {\r
     try {\r
       gwtSetUp();\r
-      testLive();\r
-//      testPropertiesAnimationComputeEffects();\r
+      testJsCache();\r
     } catch (Exception ex) {\r
       ex.printStackTrace();\r
       $(e).html("").after("<div>ERROR: " + ex.getMessage() + "</div>");\r
@@ -63,10 +65,51 @@ public class DevTestRunner extends MyTestCase implements EntryPoint {
     \r
   }\r
   \r
+  public void testJsCache() {\r
+    String[] slist = new String[]{"A", "B", "C"};\r
+    \r
+    JsCache c = JsCache.create();\r
+    assertTrue(c.isEmpty());\r
+    for (int i=0; i < slist.length; i++) {\r
+      c.put(i, slist[i]);\r
+    }\r
+    assertFalse(c.isEmpty());\r
+    assertEquals(3, c.length());\r
+    assertEquals(slist[1], c.get(1));\r
+    for (int i=0; i < slist.length; i++) {\r
+      c.put(slist[i], slist[i]);\r
+    }\r
+    assertEquals(6, c.length());\r
+    assertEquals(slist[1], c.get(1));\r
+    assertEquals(slist[1], c.get(slist[1]));\r
+    c.put(1, null);\r
+    c.put("X", "X");\r
+    assertNull(c.get(1));\r
+    assertEquals(slist[2], c.get(2));\r
+    assertEquals(7, c.length());\r
+    assertEquals(7, c.keys().length);\r
+    assertEquals(7, c.elements().length);\r
+    \r
+    assertTrue(c.exists(2));\r
+    assertFalse(c.exists(3));\r
+    assertTrue(c.exists("X"));\r
+    assertFalse(c.exists("V"));\r
+    \r
+    c.delete(2);\r
+    c.delete("C");\r
+    assertEquals(5, c.length());\r
+\r
+    c.put(-1, "N");\r
+    assertEquals(6, c.length());\r
+    assertEquals("N", c.get(-1));\r
+    System.out.println(c.tostring());\r
+  }\r
+  \r
   public void testLive() {\r
     $(e).html("<div id=d1 class='clickMe'>Content 1</div>");\r
-    GQuery q = $(".clickMe").live(Event.ONCLICK, new Function(){\r
+    final GQuery q = $(".clickMe").live(Event.ONCLICK, new Function(){\r
       public void f(Element e) {\r
+        System.out.println($(e));\r
         $(e).css("color", "red");\r
       }\r
     });\r
@@ -74,6 +117,7 @@ public class DevTestRunner extends MyTestCase implements EntryPoint {
     assertEquals("", $("#d1").css("color"));\r
     \r
     $(".clickMe", e).click();\r
+    \r
     assertEquals("red", $("#d1").css("color"));\r
     assertEquals("red", $("#d2").css("color"));\r
     \r

diff --git a/devtest/src/main/java/com/google/gwt/query/client/MyTestCase.java b/devtest/src/main/java/com/google/gwt/query/client/MyTestCase.java
index 04cedfa4d889e07d87c6d069cc9d26ef1f85cb74..8d8751a0cbe9570b75c42eed3948ec9de5345bdf 100644 (file)
--- a/devtest/src/main/java/com/google/gwt/query/client/MyTestCase.java
+++ b/devtest/src/main/java/com/google/gwt/query/client/MyTestCase.java
@@ -36,10 +36,18 @@ public class MyTestCase {
     check(!b, "assertTrue: actual should be false but is true");\r
   }\r
 \r
+  public static void assertFalse(String msg, boolean b) {\r
+    check(!b, msg);\r
+  }\r
+\r
   public static void assertNotNull(Object a) {\r
     check(a != null, "assertNotNull: actual object is null");\r
   }\r
 \r
+  public static void assertNull(Object a) {\r
+    check(a == null, "assertNull: actual object is not null");\r
+  }\r
+\r
   public static void assertTrue(boolean b) {\r
     check(b, "assertTrue: actual should be true but is false");\r
   }\r

diff --git a/devtest/src/main/java/com/google/gwt/query/public/test.html b/devtest/src/main/java/com/google/gwt/query/public/test.html
index fded28860ff0feb2882d473a38f615b4cd361a02..aa38d9c8e2df7a726139870fe7b0ef8cc29e6162 100644 (file)
--- a/devtest/src/main/java/com/google/gwt/query/public/test.html
+++ b/devtest/src/main/java/com/google/gwt/query/public/test.html
@@ -4,8 +4,6 @@
   </head>\r
   <body>\r
    <script language="javascript" src="test.nocache.js"></script>\r
-   <script  src="atest.nocache.js"></script>\r
-   \r
   </body>\r
 </html>\r
     \r