Browse Source

Fix databind tests

tags/gwtquery-project-1.5-beta1
Maxime Mériouma-Caron 8 years ago
parent
commit
416c892905

+ 3
- 3
gwtquery-core/pom.xml View File

@@ -8,8 +8,8 @@


<properties>
<!-- valid emulations are FF17 IE8 IE9 Chrome, but only FF17 works. -->
<gwt.test.htmlunit>FF17</gwt.test.htmlunit>
<!-- valid emulations are FF17 IE8 IE9 Chrome, but only Chrome works. -->
<gwt.test.htmlunit>Chrome</gwt.test.htmlunit>
<gwt.test.default>-ea -out ${basedir}/target/gwt-junit -checkAssertions</gwt.test.default>
<gwt.args />
</properties>
@@ -17,7 +17,7 @@
<profile>
<!-- example:
$ mvn clean test -Ptest-prod
$ mvn clean test -Ptest-prod -Dgwt.test.htmlunit=FF17
$ mvn clean test -Ptest-prod -Dgwt.test.htmlunit=Chrome
-->
<id>test-prod</id>
<properties>

+ 1
- 1
gwtquery-core/src/main/java/com/google/gwt/query/rebind/JsonBuilderGenerator.java View File

@@ -209,7 +209,7 @@ public class JsonBuilderGenerator extends Generator {
if (arr != null) {
sw.println("return " + ret + ";");
} else {
sw.println("return Arrays.asList(" + ret + ");");
sw.println("return a == null ? null : Arrays.asList(" + ret + ");");
}
} else if (method.getReturnType().isEnum() != null) {
sw.println("return " + method.getReturnType().getQualifiedSourceName()

+ 1
- 1
gwtquery-core/src/main/java/com/google/gwt/query/vm/JsonBuilderHandler.java View File

@@ -349,4 +349,4 @@ public class JsonBuilderHandler implements InvocationHandler {

return ispropertyGetters;
}
}
}

+ 2
- 2
gwtquery-core/src/test/java/com/google/gwt/query/client/dbinding/DataBindingTestJre.java View File

@@ -249,9 +249,9 @@ public class DataBindingTestJre extends GWTTestCase {
//WHEN fetching that user
GUser retrievedUser = GQ.create(GUser.class);
retrievedUser.parse(json, true);
//THEN
List<String> phones = retrievedUser.getPhones();
assertNull(phones);
}
}
}

Loading…
Cancel
Save