diff options
-rwxr-xr-x | tests/assets/bindings_test.html | 8 | ||||
-rw-r--r-- | tests/src/com/android/browser/JNIBindingsTest.java | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/tests/assets/bindings_test.html b/tests/assets/bindings_test.html index 71f34381..2d20adae 100755 --- a/tests/assets/bindings_test.html +++ b/tests/assets/bindings_test.html @@ -7,7 +7,7 @@ function testPrimitiveTypes() { } function testObjectTypes() { - return JNIBindingsTest.testObjectTypes("Foo", "", {"foo":"bar"}, {}); + return JNIBindingsTest.testObjectTypes("Foo", "", null, {"foo":"bar"}, {}); } function testArray() { @@ -104,6 +104,12 @@ function testJavaReturnTypes() { return false; } + returned = JNIBindingsTest.returnNullString(); + if (returned !== undefined) { + appendLog("returnNullString() failed: expected undefined, got " + returned); + return false; + } + returned = JNIBindingsTest.returnObject(); if (returned == null) { appendLog("returnObject() failed: expected non-null, got " + returned); diff --git a/tests/src/com/android/browser/JNIBindingsTest.java b/tests/src/com/android/browser/JNIBindingsTest.java index 94dc9855..8c25a802 100644 --- a/tests/src/com/android/browser/JNIBindingsTest.java +++ b/tests/src/com/android/browser/JNIBindingsTest.java @@ -82,8 +82,8 @@ public class JNIBindingsTest extends AndroidTestCase { return true; } - public boolean testObjectTypes(String stringParam, String emptyString, Object objectParam, - Object emptyObject) { + public boolean testObjectTypes(String stringParam, String emptyString, String nullString, + Object objectParam, Object emptyObject) { String expectedString = "Foo"; String expectedEmptyString = ""; @@ -92,6 +92,7 @@ public class JNIBindingsTest extends AndroidTestCase { assertNotNull(emptyString); assertEquals(expectedString, stringParam); assertEquals(expectedEmptyString, emptyString); + assertNull(nullString); assertNull(objectParam); assertNull(emptyObject); } catch (AssertionFailedError e) { @@ -267,6 +268,7 @@ public class JNIBindingsTest extends AndroidTestCase { public long returnLong() { return 1234L; } public short returnShort() { return 12345; } public String returnString() { return "Hello World!"; } + public String returnNullString() { return null; } public class TestObject { public int x = 123; |