зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1319496 - 2. Add more GeckoBundle tests in testEventDispatcher; r=snorp
Add more tests for edge cases in testEventDispatcher, such as null arrays, nonexistent values, and object arrays containing only nulls.
This commit is contained in:
Jim Chen
Родитель
cc57abd3cd
Коммит
ba7b253f47
|
|
@ -211,8 +211,32 @@ public class testEventDispatcher extends JavascriptBridgeTest
|
|||
checkBundle(message);
|
||||
checkBundle(message.getBundle("object"));
|
||||
fAssertSame("Bundle null object has correct value", null, message.getBundle("nullObject"));
|
||||
fAssertSame("Bundle nonexistent object returns null",
|
||||
null, message.getBundle("nonexistentObject"));
|
||||
|
||||
// XXX add objectArray check when we remove NativeJSObject
|
||||
final GeckoBundle[] objectArray = message.getBundleArray("objectArray");
|
||||
fAssertNotNull("Bundle object array should exist", objectArray);
|
||||
fAssertEquals("Bundle object array has correct length", 2, objectArray.length);
|
||||
fAssertSame("Bundle object array index 0 has correct value", null, objectArray[0]);
|
||||
checkBundle(objectArray[1]);
|
||||
|
||||
final GeckoBundle[] objectArrayOfNull = message.getBundleArray("objectArrayOfNull");
|
||||
fAssertNotNull("Bundle object array of null should exist", objectArrayOfNull);
|
||||
fAssertEquals("Bundle object array of null has correct length", 2, objectArrayOfNull.length);
|
||||
fAssertSame("Bundle object array of null index 0 has correct value",
|
||||
null, objectArrayOfNull[0]);
|
||||
fAssertSame("Bundle object array of null index 1 has correct value",
|
||||
null, objectArrayOfNull[1]);
|
||||
|
||||
final GeckoBundle[] emptyObjectArray = message.getBundleArray("emptyObjectArray");
|
||||
fAssertNotNull("Bundle empty object array should exist", emptyObjectArray);
|
||||
fAssertEquals("Bundle empty object array has correct length", 0, emptyObjectArray.length);
|
||||
|
||||
fAssertSame("Bundle null object array exists",
|
||||
null, message.getBundleArray("nullObjectArray"));
|
||||
|
||||
fAssertSame("Bundle nonexistent object array returns null",
|
||||
null, message.getBundleArray("nonexistentObjectArray"));
|
||||
|
||||
} else if (UI_RESPONSE_EVENT.equals(event) || BACKGROUND_RESPONSE_EVENT.equals(event)) {
|
||||
final String response = message.getString("response");
|
||||
|
|
@ -390,6 +414,24 @@ public class testEventDispatcher extends JavascriptBridgeTest
|
|||
fAssertEquals("Bundle double has correct value", 0.5, bundle.getDouble("double"));
|
||||
fAssertEquals("Bundle string has correct value", "foo", bundle.getString("string"));
|
||||
|
||||
fAssertEquals("Bundle default boolean has correct value",
|
||||
true, bundle.getBoolean("nonexistentBoolean", true));
|
||||
fAssertEquals("Bundle default int has correct value",
|
||||
1, bundle.getInt("nonexistentInt", 1));
|
||||
fAssertEquals("Bundle default double has correct value",
|
||||
0.5, bundle.getDouble("nonexistentDouble", 0.5));
|
||||
fAssertEquals("Bundle default string has correct value",
|
||||
"foo", bundle.getString("nonexistentString", "foo"));
|
||||
|
||||
fAssertEquals("Bundle nonexistent boolean returns false",
|
||||
false, bundle.getBoolean("nonexistentBoolean"));
|
||||
fAssertEquals("Bundle nonexistent int returns 0",
|
||||
0, bundle.getInt("nonexistentInt"));
|
||||
fAssertEquals("Bundle nonexistent double returns 0.0",
|
||||
0.0, bundle.getDouble("nonexistentDouble"));
|
||||
fAssertSame("Bundle nonexistent string returns null",
|
||||
null, bundle.getString("nonexistentString"));
|
||||
|
||||
fAssertSame("Bundle null string has correct value", null, bundle.getString("nullString"));
|
||||
fAssertEquals("Bundle empty string has correct value", "", bundle.getString("emptyString"));
|
||||
fAssertEquals("Bundle default null string is correct", "foo",
|
||||
|
|
@ -421,6 +463,14 @@ public class testEventDispatcher extends JavascriptBridgeTest
|
|||
fAssertEquals("Bundle string array index 0 has correct value", "bar", stringArray[0]);
|
||||
fAssertEquals("Bundle string array index 1 has correct value", "baz", stringArray[1]);
|
||||
|
||||
final String[] stringArrayOfNull = bundle.getStringArray("stringArrayOfNull");
|
||||
fAssertNotNull("Bundle string array of null should exist", stringArrayOfNull);
|
||||
fAssertEquals("Bundle string array of null has correct length", 2, stringArrayOfNull.length);
|
||||
fAssertSame("Bundle string array of null index 0 has correct value",
|
||||
null, stringArrayOfNull[0]);
|
||||
fAssertSame("Bundle string array of null index 1 has correct value",
|
||||
null, stringArrayOfNull[1]);
|
||||
|
||||
final boolean[] emptyBooleanArray = bundle.getBooleanArray("emptyBooleanArray");
|
||||
fAssertNotNull("Bundle empty boolean array should exist", emptyBooleanArray);
|
||||
fAssertEquals("Bundle empty boolean array has correct length", 0, emptyBooleanArray.length);
|
||||
|
|
@ -437,6 +487,24 @@ public class testEventDispatcher extends JavascriptBridgeTest
|
|||
fAssertNotNull("Bundle empty String array should exist", emptyStringArray);
|
||||
fAssertEquals("Bundle empty String array has correct length", 0, emptyStringArray.length);
|
||||
|
||||
fAssertSame("Bundle null boolean array exists",
|
||||
null, bundle.getBooleanArray("nullBooleanArray"));
|
||||
fAssertSame("Bundle null int array exists",
|
||||
null, bundle.getIntArray("nullIntArray"));
|
||||
fAssertSame("Bundle null double array exists",
|
||||
null, bundle.getDoubleArray("nullDoubleArray"));
|
||||
fAssertSame("Bundle null string array exists",
|
||||
null, bundle.getStringArray("nullStringArray"));
|
||||
|
||||
fAssertSame("Bundle nonexistent boolean array returns null",
|
||||
null, bundle.getBooleanArray("nonexistentBooleanArray"));
|
||||
fAssertSame("Bundle nonexistent int array returns null",
|
||||
null, bundle.getIntArray("nonexistentIntArray"));
|
||||
fAssertSame("Bundle nonexistent double array returns null",
|
||||
null, bundle.getDoubleArray("nonexistentDoubleArray"));
|
||||
fAssertSame("Bundle nonexistent string array returns null",
|
||||
null, bundle.getStringArray("nonexistentStringArray"));
|
||||
|
||||
// XXX add mixedArray check when we remove NativeJSObject
|
||||
}
|
||||
|
||||
|
|
@ -580,12 +648,18 @@ public class testEventDispatcher extends JavascriptBridgeTest
|
|||
bundle.putString("nullString", null);
|
||||
bundle.putString("emptyString", "");
|
||||
bundle.putStringArray("stringArray", new String[] {"bar", "baz"});
|
||||
bundle.putStringArray("stringArrayOfNull", new String[2]);
|
||||
|
||||
bundle.putBooleanArray("emptyBooleanArray", new boolean[0]);
|
||||
bundle.putIntArray("emptyIntArray", new int[0]);
|
||||
bundle.putDoubleArray("emptyDoubleArray", new double[0]);
|
||||
bundle.putStringArray("emptyStringArray", new String[0]);
|
||||
|
||||
bundle.putBooleanArray("nullBooleanArray", (boolean[]) null);
|
||||
bundle.putIntArray("nullIntArray", (int[]) null);
|
||||
bundle.putDoubleArray("nullDoubleArray", (double[]) null);
|
||||
bundle.putStringArray("nullStringArray", (String[]) null);
|
||||
|
||||
return bundle;
|
||||
}
|
||||
|
||||
|
|
@ -596,7 +670,9 @@ public class testEventDispatcher extends JavascriptBridgeTest
|
|||
outer.putBundle("object", inner);
|
||||
outer.putBundle("nullObject", null);
|
||||
outer.putBundleArray("objectArray", new GeckoBundle[] {null, inner});
|
||||
outer.putBundleArray("objectArrayOfNull", new GeckoBundle[2]);
|
||||
outer.putBundleArray("emptyObjectArray", new GeckoBundle[0]);
|
||||
outer.putBundleArray("nullObjectArray", (GeckoBundle[]) null);
|
||||
|
||||
return outer;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,10 +21,15 @@ function get_test_message() {
|
|||
nullString: null,
|
||||
emptyString: "",
|
||||
stringArray: ["bar", "baz"],
|
||||
stringArrayOfNull: [null, null],
|
||||
emptyBooleanArray: [],
|
||||
emptyIntArray: [],
|
||||
emptyDoubleArray: [],
|
||||
emptyStringArray: [],
|
||||
nullBooleanArray: null,
|
||||
nullIntArray: null,
|
||||
nullDoubleArray: null,
|
||||
nullStringArray: null,
|
||||
// XXX enable when we remove NativeJSObject
|
||||
// mixedArray: [1, 1.5],
|
||||
};
|
||||
|
|
@ -35,7 +40,9 @@ function get_test_message() {
|
|||
outerObject.object = innerObject;
|
||||
outerObject.nullObject = null;
|
||||
outerObject.objectArray = [null, innerObject];
|
||||
outerObject.objectArrayOfNull = [null, null];
|
||||
outerObject.emptyObjectArray = [];
|
||||
outerObject.nullObjectArray = null;
|
||||
return outerObject;
|
||||
}
|
||||
|
||||
|
|
@ -104,10 +111,19 @@ let listener = {
|
|||
do_check_eq(obj.stringArray[0], "bar");
|
||||
do_check_eq(obj.stringArray[1], "baz");
|
||||
|
||||
do_check_eq(obj.stringArrayOfNull.length, 2);
|
||||
do_check_eq(obj.stringArrayOfNull[0], null);
|
||||
do_check_eq(obj.stringArrayOfNull[1], null);
|
||||
|
||||
do_check_eq(obj.emptyBooleanArray.length, 0);
|
||||
do_check_eq(obj.emptyIntArray.length, 0);
|
||||
do_check_eq(obj.emptyDoubleArray.length, 0);
|
||||
do_check_eq(obj.emptyStringArray.length, 0);
|
||||
|
||||
do_check_eq(obj.nullBooleanArray, null);
|
||||
do_check_eq(obj.nullIntArray, null);
|
||||
do_check_eq(obj.nullDoubleArray, null);
|
||||
do_check_eq(obj.nullStringArray, null);
|
||||
},
|
||||
|
||||
onEvent: function (event, data, callback) {
|
||||
|
|
@ -122,7 +138,13 @@ let listener = {
|
|||
do_check_eq(data.objectArray.length, 2);
|
||||
do_check_eq(data.objectArray[0], null);
|
||||
this._checkObject(data.objectArray[1]);
|
||||
|
||||
do_check_eq(data.objectArrayOfNull.length, 2);
|
||||
do_check_eq(data.objectArrayOfNull[0], null);
|
||||
do_check_eq(data.objectArrayOfNull[1], null);
|
||||
|
||||
do_check_eq(data.emptyObjectArray.length, 0);
|
||||
do_check_eq(data.nullObjectArray, null);
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче