summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-09-02 13:16:42 +0100
committerSteve Block <steveblock@google.com>2011-09-05 12:27:32 +0100
commit6d3975f136ea15fa4390edccaa78b95adf1b85d9 (patch)
tree116ea66829ed5601621fb927f13573228a45c171 /tests
parent012dcd474cd3980aa206e4b7a31fa67114f56d54 (diff)
downloadpackages_apps_Browser-6d3975f136ea15fa4390edccaa78b95adf1b85d9.tar.gz
packages_apps_Browser-6d3975f136ea15fa4390edccaa78b95adf1b85d9.tar.bz2
packages_apps_Browser-6d3975f136ea15fa4390edccaa78b95adf1b85d9.zip
Update Java bridge test to reflect the fact that we now return undefined for all object properties
Bug: 5252112 Change-Id: Ic291658e1d69aa47a1651e4fbc673438734ca2e6
Diffstat (limited to 'tests')
-rwxr-xr-xtests/assets/bindings_test.html26
1 files changed, 9 insertions, 17 deletions
diff --git a/tests/assets/bindings_test.html b/tests/assets/bindings_test.html
index 2d20adae3..7218f5804 100755
--- a/tests/assets/bindings_test.html
+++ b/tests/assets/bindings_test.html
@@ -114,16 +114,12 @@ function testJavaReturnTypes() {
if (returned == null) {
appendLog("returnObject() failed: expected non-null, got " + returned);
return false;
- } else if (returned.x != 0) {
- // EMULATE_JSC_BINDINGS
- // Note: the Java sets the x property to 123. JSC and V8 do not support object
- // members in the bindings though.
- appendLog("returnObject() failed: expected 'x' property 0, got " + returned.x)
+ } else if (returned.x != undefined) {
+ // We do not support getting object properties.
+ appendLog("returnObject() failed: expected 'x' property undefined, got " + returned.x)
return false;
} else if (returned.s != undefined) {
- // EMULATE_JSC_BINDINGS
- // Note that the java class returned has s set to Hello World. JSC and V8 do not support
- // getting properties.
+ // We do not support getting object properties.
appendLog("returnObject() failed: expected 's' property undefined, got " + returned.s);
return false;
} else if (!returned.aMethod()) {
@@ -150,19 +146,15 @@ function testJavaReturnTypes() {
}
function getIfaceProperties() {
- if (JNIBindingsTest.mInt != 0) {
- // EMULATE_JSC_BINDINGS
- // Note: the Java sets the mInt property to 123. JSC and V8 do not support object
- // members in the bindings though.
- appendLog("getIfaceProperties() failed: expected mInt = 0, got " + JNIBindingsTest.mInt);
+ if (JNIBindingsTest.mInt != undefined) {
+ // We do not support getting object properties.
+ appendLog("getIfaceProperties() failed: expected mInt = undefined, got " + JNIBindingsTest.mInt);
return false;
}
if (JNIBindingsTest.mString != undefined) {
- // EMULATE_JSC_BINDINGS
- // Note that the java class returned has s set to Hello World. JSC and V8 do not support
- // getting properties.
- appendLog("getIfaceProperties() failed: expected mString = 'Hello World', got " + JNIBindingsTest.mString);
+ // We do not support getting object properties.
+ appendLog("getIfaceProperties() failed: expected mString = undefined, got " + JNIBindingsTest.mString);
return false;
}