From ed6250fc26b6f645cffeecade4ad3c28db837362 Mon Sep 17 00:00:00 2001 From: Manolo Carrasco Date: Fri, 11 Jun 2010 23:25:50 +0000 Subject: [PATCH] fixed tests --- .../gwt/query/client/impl/DocumentStyleImpl.java | 12 ++++++------ .../com/google/gwt/query/client/GQueryCoreTest.java | 4 ++-- .../google/gwt/query/client/GQueryEffectsTest.java | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/DocumentStyleImpl.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/DocumentStyleImpl.java index 7d87797c..bcb81fd4 100644 --- a/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/DocumentStyleImpl.java +++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/DocumentStyleImpl.java @@ -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); } } diff --git a/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryCoreTest.java b/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryCoreTest.java index c1d240b6..c133128a 100644 --- a/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryCoreTest.java +++ b/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryCoreTest.java @@ -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(); diff --git a/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryEffectsTest.java b/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryEffectsTest.java index 94e2bd11..3e095f1b 100644 --- a/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryEffectsTest.java +++ b/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryEffectsTest.java @@ -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, -- 2.39.5