]> source.dussan.org Git - gwtquery.git/commitdiff
fixed tests
authorManolo Carrasco <manolo@apache.org>
Fri, 11 Jun 2010 23:25:50 +0000 (23:25 +0000)
committerManolo Carrasco <manolo@apache.org>
Fri, 11 Jun 2010 23:25:50 +0000 (23:25 +0000)
gwtquery-core/src/main/java/com/google/gwt/query/client/impl/DocumentStyleImpl.java
gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryCoreTest.java
gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryEffectsTest.java

index 7d87797c54d0c09570637a1ce3ca6dc03776a11a..bcb81fd4320324618936475b9433dca65c84162f 100644 (file)
@@ -47,14 +47,14 @@ public class DocumentStyleImpl {
   /**
    * Return the string value of a css property of an element. 
    */
-  public String curCSS(Element elem, String prop) {
-    prop = fixPropertyName(prop);
+  public String curCSS(Element elem, String name) {
+    name = fixPropertyName(name);
     Style s = elem.getStyle();
-    if (SelectorEngine.truth(s.getProperty(prop))) {
-      return s.getProperty(prop);
+    if (SelectorEngine.truth(s.getProperty(name))) {
+      return s.getProperty(name);
     } else {
-      prop = hyphenize(prop);
-      return getComputedStyle(elem, prop, null);
+      name = hyphenize(name);
+      return getComputedStyle(elem, name, null);
     }
   }
 
index c1d240b6c8938fb32ee6d50c9d5a56f82e741d61..c133128aa8ffe008482c1c24a2774bed4f78a9d4 100644 (file)
@@ -607,10 +607,10 @@ public class GQueryCoreTest extends GWTTestCase {
     sectA.show();
     assertEquals("inline", sectA.css("display"));
     sectB.show();
-    assertEquals("", sectB.css("display"));
+    assertEquals("block", sectB.css("display"));
     
     // toggle()
-    assertEquals("", sectC.css("display"));
+    assertEquals("block", sectC.css("display"));
     sectC.toggle();
     assertEquals("none", sectC.css("display"));
     sectC.toggle();
index 94e2bd115310a27e6fc76e7ce8babd73b93a912f..3e095f1b781222b5082d1b9e6837a32dba5158c2 100644 (file)
@@ -84,7 +84,7 @@ public class GQueryEffectsTest extends GWTTestCase {
     Timer timerMidTime = new Timer() {
       public void run() {
         assertEquals("inline", sectA.css("display"));
-        assertEquals("", sectB.css("display"));
+        assertEquals("block", sectB.css("display"));
         double o = Double.valueOf(sectA.css("opacity"));
         assertTrue(
             "'sectA' opacity must be in the interval 0.5-1 but is: " + o,