mirror of
https://github.com/fankes/JSON-java-compat.git
synced 2025-09-07 19:14:15 +08:00
Merge pull request #773 from eedijs/master
Add optJSONArray method to JSONObject with a default value
This commit is contained in:
@@ -595,13 +595,17 @@ public class JSONArrayTest {
|
||||
|
||||
JSONArray nestedJsonArray = jsonArray.optJSONArray(9);
|
||||
assertTrue("Array opt JSONArray", nestedJsonArray != null);
|
||||
assertTrue("Array opt JSONArray default",
|
||||
assertTrue("Array opt JSONArray null",
|
||||
null == jsonArray.optJSONArray(99));
|
||||
assertTrue("Array opt JSONArray default",
|
||||
"value".equals(jsonArray.optJSONArray(99, new JSONArray("[\"value\"]")).getString(0)));
|
||||
|
||||
JSONObject nestedJsonObject = jsonArray.optJSONObject(10);
|
||||
assertTrue("Array opt JSONObject", nestedJsonObject != null);
|
||||
assertTrue("Array opt JSONObject default",
|
||||
assertTrue("Array opt JSONObject null",
|
||||
null == jsonArray.optJSONObject(99));
|
||||
assertTrue("Array opt JSONObject default",
|
||||
"value".equals(jsonArray.optJSONObject(99, new JSONObject("{\"key\":\"value\"}")).getString("key")));
|
||||
|
||||
assertTrue("Array opt long",
|
||||
0 == jsonArray.optLong(11));
|
||||
|
@@ -2510,6 +2510,8 @@ public class JSONObjectTest {
|
||||
MyEnum.VAL1.equals(jsonObject.optEnum(MyEnum.class, "myKey", MyEnum.VAL1)));
|
||||
assertTrue("optJSONArray() should return null ",
|
||||
null==jsonObject.optJSONArray("myKey"));
|
||||
assertTrue("optJSONArray() should return default JSONArray",
|
||||
"value".equals(jsonObject.optJSONArray("myKey", new JSONArray("[\"value\"]")).getString(0)));
|
||||
assertTrue("optJSONObject() should return default JSONObject ",
|
||||
jsonObject.optJSONObject("myKey", new JSONObject("{\"testKey\":\"testValue\"}")).getString("testKey").equals("testValue"));
|
||||
assertTrue("optLong() should return default long",
|
||||
@@ -2555,6 +2557,8 @@ public class JSONObjectTest {
|
||||
Integer.valueOf(42).equals(jsonObject.optIntegerObject("myKey", 42)));
|
||||
assertTrue("optEnum() should return default Enum",
|
||||
MyEnum.VAL1.equals(jsonObject.optEnum(MyEnum.class, "myKey", MyEnum.VAL1)));
|
||||
assertTrue("optJSONArray() should return default JSONArray",
|
||||
"value".equals(jsonObject.optJSONArray("myKey", new JSONArray("[\"value\"]")).getString(0)));
|
||||
assertTrue("optJSONArray() should return null ",
|
||||
null==jsonObject.optJSONArray("myKey"));
|
||||
assertTrue("optJSONObject() should return default JSONObject ",
|
||||
|
Reference in New Issue
Block a user