Fix tests

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java
index b7937ba848274ac17713b9fc7f2ce7db4bb3eeeb..c91e63ae57f09c32b4833577301cd8c184aa2700 100644 (file)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java
@@ -449,13 +449,6 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
     return name != null ? d.get(name) : id;\r
   }\r
   \r
-  /**\r
-   * Set element data. \r
-   */\r
-       public static Object data(Element e, String key, String value) {\r
-               return GQuery.data(e, key, value);\r
-       }\r
-\r
   /**\r
    * Execute a function around each object\r
    */\r
@@ -661,6 +654,7 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
   /**\r
    * The nodeList of matched elements, modify this using setArray\r
    */\r
+  // TODO: remove this and use elements, change return type of get()\r
   private NodeList<Element> nodeList = JavaScriptObject.createArray().cast();\r
   \r
   private GQuery previousObject;\r
@@ -1926,11 +1920,11 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
             break;\r
         }\r
         EventsListener.rebind(n.<Element> cast());\r
-        \r
         // GqUi.attachWidget(w);\r
       }\r
     }\r
-    if (newNodes.size() > g.size()) {\r
+    // TODO: newNodes.size() > g.size() makes testRebind fail\r
+    if (newNodes.size() >= g.size()) {\r
       g.setArray(newNodes);\r
     }\r
     return this;\r

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngine.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngine.java
index 336a4abe8a23722c8a4c5a00525c0c9fd304bdf5..191aab2a14caf8fb066701b341b4c91d93003979 100644 (file)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngine.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngine.java
@@ -126,7 +126,7 @@ public class SelectorEngine implements HasSelector {
           } else if (s.endsWith(":hidden")) {\r
             nodes = filterByVisibility(select(s.substring(0, s.length() - 7), ctx), false);\r
           } else {\r
-            nodes = select(a.get(1) + "[type=" + a.get(2) + "]", ctx);\r
+            nodes = select((a.get(1) != null ? a.get(1) : "") + "[type=" + a.get(2) + "]", ctx);\r
           }          \r
         } else {\r
           nodes = select(s, ctx);\r

diff --git a/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryEventsTest.java b/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryEventsTest.java
index 2007160849c5716c35735b873e6b157e1f5bf93e..601d9e9965141ded6a2831953066d0764ccd2576 100644 (file)
--- a/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryEventsTest.java
+++ b/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryEventsTest.java
@@ -687,12 +687,18 @@ public void testUnDelegateAll2(){
 
   public void testRebind() {
     final GQuery b = $("<p>content</p>");
+    assertEquals(1, b.size());
+    assertEquals(1, b.get().getLength());
     b.click(new Function() {
       public void f(Element e){
         b.css(CSS.COLOR.with(RGBColor.RED));
       }
     });
     $(e).append(b);
+    // TODO: dom manipulations some times modifies gquery nodelist,
+    // we could remove the nodelist since we maintain a list of elements.
+    assertEquals(1, b.size());
+    assertEquals(1, b.get().getLength());
     b.click();
     assertEquals("red", $(b).css("color", false));
   }