From 8ed0362683acd784fbd0a9d75beb86e56ed300d9 Mon Sep 17 00:00:00 2001 From: stleary Date: Sat, 14 May 2016 13:38:46 -0500 Subject: [PATCH] convert remaining JsonPath expressions to JSONPointer --- src/test/org/json/junit/CookieListTest.java | 40 +++---- src/test/org/json/junit/EnumTest.java | 64 +++++------ src/test/org/json/junit/JSONArrayTest.java | 104 +++++++++--------- src/test/org/json/junit/JSONStringerTest.java | 68 ++++++------ 4 files changed, 138 insertions(+), 138 deletions(-) diff --git a/src/test/org/json/junit/CookieListTest.java b/src/test/org/json/junit/CookieListTest.java index 815c767..7a710db 100644 --- a/src/test/org/json/junit/CookieListTest.java +++ b/src/test/org/json/junit/CookieListTest.java @@ -78,7 +78,7 @@ public class CookieListTest { // validate JSON content Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString()); assertTrue("Expected 1 top level item", ((Map)(JsonPath.read(doc, "$"))).size() == 1); - assertTrue("expected 31d4d96e407aad42", "31d4d96e407aad42".equals(JsonPath.read(doc, "$.SID"))); + assertTrue("expected 31d4d96e407aad42", "31d4d96e407aad42".equals(jsonObject.query("/SID"))); } /** @@ -91,7 +91,7 @@ public class CookieListTest { // validate JSON content Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString()); assertTrue("Expected 1 top level item", ((Map)(JsonPath.read(doc, "$"))).size() == 1); - assertTrue("expected 31d4d96e407aad42", "31d4d96e407aad42".equals(JsonPath.read(doc, "$.SID"))); + assertTrue("expected 31d4d96e407aad42", "31d4d96e407aad42".equals(jsonObject.query("/SID"))); } /** @@ -111,12 +111,12 @@ public class CookieListTest { // validate JSON content Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString()); assertTrue("Expected 6 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 6); - assertTrue("expected myCookieValue1", "myCookieValue1".equals(JsonPath.read(doc, "$.name1"))); - assertTrue("expected myCookieValue2", "myCookieValue2".equals(JsonPath.read(doc, "$.name2"))); - assertTrue("expected myCookieValue3", "myCookieValue3".equals(JsonPath.read(doc, "$.name3"))); - assertTrue("expected myCookieValue4", "myCookieValue4".equals(JsonPath.read(doc, "$.name4"))); - assertTrue("expected myCookieValue5", "myCookieValue5".equals(JsonPath.read(doc, "$.name5"))); - assertTrue("expected myCookieValue6", "myCookieValue6".equals(JsonPath.read(doc, "$.name6"))); + assertTrue("expected myCookieValue1", "myCookieValue1".equals(jsonObject.query("/name1"))); + assertTrue("expected myCookieValue2", "myCookieValue2".equals(jsonObject.query("/name2"))); + assertTrue("expected myCookieValue3", "myCookieValue3".equals(jsonObject.query("/name3"))); + assertTrue("expected myCookieValue4", "myCookieValue4".equals(jsonObject.query("/name4"))); + assertTrue("expected myCookieValue5", "myCookieValue5".equals(jsonObject.query("/name5"))); + assertTrue("expected myCookieValue6", "myCookieValue6".equals(jsonObject.query("/name6"))); } /** @@ -151,12 +151,12 @@ public class CookieListTest { // validate JSON content Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString()); assertTrue("Expected 6 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 6); - assertTrue("expected myCookieValue1", "myCookieValue1".equals(JsonPath.read(doc, "$.name1"))); - assertTrue("expected myCookieValue2", "myCookieValue2".equals(JsonPath.read(doc, "$.name2"))); - assertTrue("expected myCookieValue3", "myCookieValue3".equals(JsonPath.read(doc, "$.name3"))); - assertTrue("expected myCookieValue4", "myCookieValue4".equals(JsonPath.read(doc, "$.name4"))); - assertTrue("expected myCookieValue5", "myCookieValue5".equals(JsonPath.read(doc, "$.name5"))); - assertTrue("expected myCookieValue6", "myCookieValue6".equals(JsonPath.read(doc, "$.name6"))); + assertTrue("expected myCookieValue1", "myCookieValue1".equals(jsonObject.query("/name1"))); + assertTrue("expected myCookieValue2", "myCookieValue2".equals(jsonObject.query("/name2"))); + assertTrue("expected myCookieValue3", "myCookieValue3".equals(jsonObject.query("/name3"))); + assertTrue("expected myCookieValue4", "myCookieValue4".equals(jsonObject.query("/name4"))); + assertTrue("expected myCookieValue5", "myCookieValue5".equals(jsonObject.query("/name5"))); + assertTrue("expected myCookieValue6", "myCookieValue6".equals(jsonObject.query("/name6"))); } /** @@ -176,11 +176,11 @@ public class CookieListTest { // validate JSON content Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString()); assertTrue("Expected 6 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 6); - assertTrue("expected myCookieValue1", "myCookieValue1".equals(JsonPath.read(doc, "$.name1"))); - assertTrue("expected my Cookie Value 2", "my Cookie Value 2".equals(JsonPath.read(doc, "$.name2"))); - assertTrue("expected my+Cookie&Value;3=", "my+Cookie&Value;3=".equals(JsonPath.read(doc, "$.name3"))); - assertTrue("expected my%CookieValue4", "my%CookieValue4".equals(JsonPath.read(doc, "$.name4"))); - assertTrue("expected my%CookieValue5", "myCookieValue5".equals(JsonPath.read(doc, "$.name5"))); - assertTrue("expected myCookieValue6", "myCookieValue6".equals(JsonPath.read(doc, "$.name6"))); + assertTrue("expected myCookieValue1", "myCookieValue1".equals(jsonObject.query("/name1"))); + assertTrue("expected my Cookie Value 2", "my Cookie Value 2".equals(jsonObject.query("/name2"))); + assertTrue("expected my+Cookie&Value;3=", "my+Cookie&Value;3=".equals(jsonObject.query("/name3"))); + assertTrue("expected my%CookieValue4", "my%CookieValue4".equals(jsonObject.query("/name4"))); + assertTrue("expected my%CookieValue5", "myCookieValue5".equals(jsonObject.query("/name5"))); + assertTrue("expected myCookieValue6", "myCookieValue6".equals(jsonObject.query("/name6"))); } } diff --git a/src/test/org/json/junit/EnumTest.java b/src/test/org/json/junit/EnumTest.java index a591dba..ff4b294 100644 --- a/src/test/org/json/junit/EnumTest.java +++ b/src/test/org/json/junit/EnumTest.java @@ -36,8 +36,8 @@ public class EnumTest { Object doc = Configuration.defaultConfiguration().jsonProvider() .parse(jsonObject.toString()); assertTrue("expecting 2 items in top level object", ((Map)(JsonPath.read(doc, "$"))).size() == 2); - assertTrue("expecting val 2", "val 2".equals(JsonPath.read(doc, "$.value"))); - assertTrue("expecting 2", Integer.valueOf(2).equals(JsonPath.read(doc, "$.intVal"))); + assertTrue("expecting val 2", "val 2".equals(jsonObject.query("/value"))); + assertTrue("expecting 2", Integer.valueOf(2).equals(jsonObject.query("/intVal"))); /** * class which contains enum instances. Each enum should be stored @@ -53,8 +53,8 @@ public class EnumTest { assertTrue("expecting 2 items in top level object", ((Map)(JsonPath.read(doc, "$"))).size() == 2); assertTrue("expecting 2 items in myEnumField object", ((Map)(JsonPath.read(doc, "$.myEnumField"))).size() == 2); assertTrue("expecting 0 items in myEnum object", ((Map)(JsonPath.read(doc, "$.myEnum"))).size() == 0); - assertTrue("expecting 3", Integer.valueOf(3).equals(JsonPath.read(doc, "$.myEnumField.intVal"))); - assertTrue("expecting val 3", "val 3".equals(JsonPath.read(doc, "$.myEnumField.value"))); + assertTrue("expecting 3", Integer.valueOf(3).equals(jsonObject.query("/myEnumField/intVal"))); + assertTrue("expecting val 3", "val 3".equals(jsonObject.query("/myEnumField/value"))); } /** @@ -74,9 +74,9 @@ public class EnumTest { // validate JSON object Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString()); assertTrue("expected 3 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 3); - assertTrue("expected VAL1", "VAL1".equals(JsonPath.read(doc, "$.VAL1"))); - assertTrue("expected VAL2", "VAL2".equals(JsonPath.read(doc, "$.VAL2"))); - assertTrue("expected VAL3", "VAL3".equals(JsonPath.read(doc, "$.VAL3"))); + assertTrue("expected VAL1", MyEnum.VAL1.equals(jsonObject.query("/VAL1"))); + assertTrue("expected VAL2", MyEnum.VAL2.equals(jsonObject.query("/VAL2"))); + assertTrue("expected VAL3", MyEnum.VAL3.equals(jsonObject.query("/VAL3"))); MyEnumField myEnumField = MyEnumField.VAL3; names = JSONObject.getNames(myEnumField); @@ -84,9 +84,9 @@ public class EnumTest { jsonObject = new JSONObject(myEnumField, names); doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString()); assertTrue("expected 3 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 3); - assertTrue("expected VAL1", "VAL1".equals(JsonPath.read(doc, "$.VAL1"))); - assertTrue("expected VAL2", "VAL2".equals(JsonPath.read(doc, "$.VAL2"))); - assertTrue("expected VAL3", "VAL3".equals(JsonPath.read(doc, "$.VAL3"))); + assertTrue("expected VAL1", MyEnumField.VAL1.equals(jsonObject.query("/VAL1"))); + assertTrue("expected VAL2", MyEnumField.VAL2.equals(jsonObject.query("/VAL2"))); + assertTrue("expected VAL3", myEnumField.VAL3.equals(jsonObject.query("/VAL3"))); } @@ -105,8 +105,8 @@ public class EnumTest { // validate JSON content Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString()); assertTrue("expected 2 top level objects", ((Map)(JsonPath.read(doc, "$"))).size() == 2); - assertTrue("expected VAL2", "VAL2".equals(JsonPath.read(doc, "$.myEnum"))); - assertTrue("expected VAL1", "VAL1".equals(JsonPath.read(doc, "$.myEnumField"))); + assertTrue("expected VAL2", MyEnum.VAL2.equals(jsonObject.query("/myEnum"))); + assertTrue("expected VAL1", MyEnumField.VAL1.equals(jsonObject.query("/myEnumField"))); JSONArray jsonArray = new JSONArray(); jsonArray.put(myEnum); @@ -115,8 +115,8 @@ public class EnumTest { // validate JSON content doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonArray.toString()); assertTrue("expected 2 top level objects", ((List)(JsonPath.read(doc, "$"))).size() == 2); - assertTrue("expected VAL2", "VAL2".equals(JsonPath.read(doc, "$[0]"))); - assertTrue("expected VAL1", "VAL1".equals(JsonPath.read(doc, "$[1]"))); + assertTrue("expected VAL2", MyEnum.VAL2.equals(jsonArray.query("/0"))); + assertTrue("expected VAL1", MyEnumField.VAL1.equals(jsonArray.query("/1"))); /** * Leaving these tests because they exercise get, opt, and remove @@ -174,8 +174,8 @@ public class EnumTest { // validate JSON content Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString()); assertTrue("expected 2 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 2); - assertTrue("expected val 2", "val 2".equals(JsonPath.read(doc, "$.value"))); - assertTrue("expected 2", Integer.valueOf(2).equals(JsonPath.read(doc, "$.intVal"))); + assertTrue("expected val 2", "val 2".equals(jsonObject.query("/value"))); + assertTrue("expected 2", Integer.valueOf(2).equals(jsonObject.query("/intVal"))); MyEnumClass myEnumClass = new MyEnumClass(); myEnumClass.setMyEnum(MyEnum.VAL1); @@ -187,8 +187,8 @@ public class EnumTest { assertTrue("expected 2 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 2); assertTrue("expected 2 myEnumField items", ((Map)(JsonPath.read(doc, "$.myEnumField"))).size() == 2); assertTrue("expected 0 myEnum items", ((Map)(JsonPath.read(doc, "$.myEnum"))).size() == 0); - assertTrue("expected 3", Integer.valueOf(3).equals(JsonPath.read(doc, "$.myEnumField.intVal"))); - assertTrue("expected val 3", "val 3".equals(JsonPath.read(doc, "$.myEnumField.value"))); + assertTrue("expected 3", Integer.valueOf(3).equals(jsonObject.query("/myEnumField/intVal"))); + assertTrue("expected val 3", "val 3".equals(jsonObject.query("/myEnumField/value"))); String [] names = JSONObject.getNames(myEnum); jsonObject = new JSONObject(myEnum, names); @@ -196,9 +196,9 @@ public class EnumTest { // validate JSON content doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString()); assertTrue("expected 3 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 3); - assertTrue("expected VAL1", "VAL1".equals(JsonPath.read(doc, "$.VAL1"))); - assertTrue("expected VAL2", "VAL2".equals(JsonPath.read(doc, "$.VAL2"))); - assertTrue("expected VAL3", "VAL3".equals(JsonPath.read(doc, "$.VAL3"))); + assertTrue("expected VAL1", MyEnum.VAL1.equals(jsonObject.query("/VAL1"))); + assertTrue("expected VAL2", MyEnum.VAL2.equals(jsonObject.query("/VAL2"))); + assertTrue("expected VAL3", MyEnum.VAL3.equals(jsonObject.query("/VAL3"))); names = JSONObject.getNames(myEnumField); jsonObject = new JSONObject(myEnumField, names); @@ -206,9 +206,9 @@ public class EnumTest { // validate JSON content doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString()); assertTrue("expected 3 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 3); - assertTrue("expected VAL1", "VAL1".equals(JsonPath.read(doc, "$.VAL1"))); - assertTrue("expected VAL2", "VAL2".equals(JsonPath.read(doc, "$.VAL2"))); - assertTrue("expected VAL3", "VAL3".equals(JsonPath.read(doc, "$.VAL3"))); + assertTrue("expected VAL1", MyEnumField.VAL1.equals(jsonObject.query("/VAL1"))); + assertTrue("expected VAL2", MyEnumField.VAL2.equals(jsonObject.query("/VAL2"))); + assertTrue("expected VAL3", MyEnumField.VAL3.equals(jsonObject.query("/VAL3"))); expectedStr = "{\"myEnum\":\"VAL2\", \"myEnumField\":\"VAL2\"}"; jsonObject = new JSONObject(); @@ -218,8 +218,8 @@ public class EnumTest { // validate JSON content doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString()); assertTrue("expected 2 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 2); - assertTrue("expected VAL2", "VAL2".equals(JsonPath.read(doc, "$.myEnum"))); - assertTrue("expected VAL2", "VAL2".equals(JsonPath.read(doc, "$.myEnumField"))); + assertTrue("expected VAL2", MyEnum.VAL2.equals(jsonObject.query("/myEnum"))); + assertTrue("expected VAL2", MyEnumField.VAL2.equals(jsonObject.query("/myEnumField"))); JSONArray jsonArray = new JSONArray(); jsonArray.put(myEnum); @@ -228,8 +228,8 @@ public class EnumTest { // validate JSON content doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonArray.toString()); assertTrue("expected 2 top level items", ((List)(JsonPath.read(doc, "$"))).size() == 2); - assertTrue("expected VAL2", "VAL2".equals(JsonPath.read(doc, "$[0]"))); - assertTrue("expected VAL2", "VAL2".equals(JsonPath.read(doc, "$[1]"))); + assertTrue("expected VAL2", MyEnum.VAL2.equals(jsonArray.query("/0"))); + assertTrue("expected VAL2", MyEnumField.VAL2.equals(jsonArray.query("/1"))); } /** @@ -248,8 +248,8 @@ public class EnumTest { // validate JSON content Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString()); assertTrue("expected 2 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 2); - assertTrue("expected val 2", "val 2".equals(JsonPath.read(doc, "$.value"))); - assertTrue("expected 2", Integer.valueOf(2).equals(JsonPath.read(doc, "$.intVal"))); + assertTrue("expected val 2", "val 2".equals(jsonObject.query("/value"))); + assertTrue("expected 2", Integer.valueOf(2).equals(jsonObject.query("/intVal"))); MyEnumClass myEnumClass = new MyEnumClass(); myEnumClass.setMyEnum(MyEnum.VAL1); @@ -261,8 +261,8 @@ public class EnumTest { assertTrue("expected 2 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 2); assertTrue("expected 2 myEnumField items", ((Map)(JsonPath.read(doc, "$.myEnumField"))).size() == 2); assertTrue("expected 0 myEnum items", ((Map)(JsonPath.read(doc, "$.myEnum"))).size() == 0); - assertTrue("expected 3", Integer.valueOf(3).equals(JsonPath.read(doc, "$.myEnumField.intVal"))); - assertTrue("expected val 3", "val 3".equals(JsonPath.read(doc, "$.myEnumField.value"))); + assertTrue("expected 3", Integer.valueOf(3).equals(jsonObject.query("/myEnumField/intVal"))); + assertTrue("expected val 3", "val 3".equals(jsonObject.query("/myEnumField/value"))); } diff --git a/src/test/org/json/junit/JSONArrayTest.java b/src/test/org/json/junit/JSONArrayTest.java index 455d680..4bc95ef 100644 --- a/src/test/org/json/junit/JSONArrayTest.java +++ b/src/test/org/json/junit/JSONArrayTest.java @@ -316,24 +316,24 @@ public class JSONArrayTest { */ Object doc = Configuration.defaultConfiguration().jsonProvider().parse("["+joinStr+"]"); assertTrue("expected 13 items in top level object", ((List)(JsonPath.read(doc, "$"))).size() == 13); - assertTrue("expected true", Boolean.TRUE.equals(JsonPath.read(doc, "$[0]"))); - assertTrue("expected false", Boolean.FALSE.equals(JsonPath.read(doc, "$[1]"))); - assertTrue("expected \"true\"", "true".equals(JsonPath.read(doc, "$[2]"))); - assertTrue("expected \"false\"", "false".equals(JsonPath.read(doc, "$[3]"))); - assertTrue("expected hello", "hello".equals(JsonPath.read(doc, "$[4]"))); - assertTrue("expected 0.002345", Double.valueOf(0.002345).equals(JsonPath.read(doc, "$[5]"))); - assertTrue("expected \"23.45\"", "23.45".equals(JsonPath.read(doc, "$[6]"))); - assertTrue("expected 42", Integer.valueOf(42).equals(JsonPath.read(doc, "$[7]"))); - assertTrue("expected \"43\"", "43".equals(JsonPath.read(doc, "$[8]"))); + assertTrue("expected true", Boolean.TRUE.equals(jsonArray.query("/0"))); + assertTrue("expected false", Boolean.FALSE.equals(jsonArray.query("/1"))); + assertTrue("expected \"true\"", "true".equals(jsonArray.query("/2"))); + assertTrue("expected \"false\"", "false".equals(jsonArray.query("/3"))); + assertTrue("expected hello", "hello".equals(jsonArray.query("/4"))); + assertTrue("expected 0.002345", Double.valueOf(0.002345).equals(jsonArray.query("/5"))); + assertTrue("expected \"23.45\"", "23.45".equals(jsonArray.query("/6"))); + assertTrue("expected 42", Integer.valueOf(42).equals(jsonArray.query("/7"))); + assertTrue("expected \"43\"", "43".equals(jsonArray.query("/8"))); assertTrue("expected 1 item in [9]", ((List)(JsonPath.read(doc, "$[9]"))).size() == 1); - assertTrue("expected world", "world".equals(JsonPath.read(doc, "$[9][0]"))); + assertTrue("expected world", "world".equals(jsonArray.query("/9/0"))); assertTrue("expected 4 items in [10]", ((Map)(JsonPath.read(doc, "$[10]"))).size() == 4); - assertTrue("expected value1", "value1".equals(JsonPath.read(doc, "$[10].key1"))); - assertTrue("expected value2", "value2".equals(JsonPath.read(doc, "$[10].key2"))); - assertTrue("expected value3", "value3".equals(JsonPath.read(doc, "$[10].key3"))); - assertTrue("expected value4", "value4".equals(JsonPath.read(doc, "$[10].key4"))); - assertTrue("expected 0", Integer.valueOf(0).equals(JsonPath.read(doc, "$[11]"))); - assertTrue("expected \"-1\"", "-1".equals(JsonPath.read(doc, "$[12]"))); + assertTrue("expected value1", "value1".equals(jsonArray.query("/10/key1"))); + assertTrue("expected value2", "value2".equals(jsonArray.query("/10/key2"))); + assertTrue("expected value3", "value3".equals(jsonArray.query("/10/key3"))); + assertTrue("expected value4", "value4".equals(jsonArray.query("/10/key4"))); + assertTrue("expected 0", Integer.valueOf(0).equals(jsonArray.query("/11"))); + assertTrue("expected \"-1\"", "-1".equals(jsonArray.query("/12"))); } /** @@ -461,24 +461,24 @@ public class JSONArrayTest { // validate JSON Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonArray.toString()); assertTrue("expected 10 top level items", ((List)(JsonPath.read(doc, "$"))).size() == 10); - assertTrue("expected true", Boolean.TRUE.equals(JsonPath.read(doc, "$[0]"))); - assertTrue("expected false", Boolean.FALSE.equals(JsonPath.read(doc, "$[1]"))); + assertTrue("expected true", Boolean.TRUE.equals(jsonArray.query("/0"))); + assertTrue("expected false", Boolean.FALSE.equals(jsonArray.query("/1"))); assertTrue("expected 2 items in [2]", ((List)(JsonPath.read(doc, "$[2]"))).size() == 2); - assertTrue("expected hello", "hello".equals(JsonPath.read(doc, "$[2][0]"))); - assertTrue("expected world", "world".equals(JsonPath.read(doc, "$[2][1]"))); - assertTrue("expected 2.5", Double.valueOf(2.5).equals(JsonPath.read(doc, "$[3]"))); - assertTrue("expected 1", Integer.valueOf(1).equals(JsonPath.read(doc, "$[4]"))); - assertTrue("expected 45", Integer.valueOf(45).equals(JsonPath.read(doc, "$[5]"))); - assertTrue("expected objectPut", "objectPut".equals(JsonPath.read(doc, "$[6]"))); + assertTrue("expected hello", "hello".equals(jsonArray.query("/2/0"))); + assertTrue("expected world", "world".equals(jsonArray.query("/2/1"))); + assertTrue("expected 2.5", Double.valueOf(2.5).equals(jsonArray.query("/3"))); + assertTrue("expected 1", Integer.valueOf(1).equals(jsonArray.query("/4"))); + assertTrue("expected 45", Long.valueOf(45).equals(jsonArray.query("/5"))); + assertTrue("expected objectPut", "objectPut".equals(jsonArray.query("/6"))); assertTrue("expected 3 items in [7]", ((Map)(JsonPath.read(doc, "$[7]"))).size() == 3); - assertTrue("expected val10", "val10".equals(JsonPath.read(doc, "$[7].key10"))); - assertTrue("expected val20", "val20".equals(JsonPath.read(doc, "$[7].key20"))); - assertTrue("expected val30", "val30".equals(JsonPath.read(doc, "$[7].key30"))); + assertTrue("expected val10", "val10".equals(jsonArray.query("/7/key10"))); + assertTrue("expected val20", "val20".equals(jsonArray.query("/7/key20"))); + assertTrue("expected val30", "val30".equals(jsonArray.query("/7/key30"))); assertTrue("expected 1 item in [8]", ((Map)(JsonPath.read(doc, "$[8]"))).size() == 1); - assertTrue("expected v1", "v1".equals(JsonPath.read(doc, "$[8].k1"))); + assertTrue("expected v1", "v1".equals(jsonArray.query("/8/k1"))); assertTrue("expected 2 items in [9]", ((List)(JsonPath.read(doc, "$[9]"))).size() == 2); - assertTrue("expected 1", Integer.valueOf(1).equals(JsonPath.read(doc, "$[9][0]"))); - assertTrue("expected 2", Integer.valueOf(2).equals(JsonPath.read(doc, "$[9][1]"))); + assertTrue("expected 1", Integer.valueOf(1).equals(jsonArray.query("/9/0"))); + assertTrue("expected 2", Integer.valueOf(2).equals(jsonArray.query("/9/1"))); } /** @@ -538,25 +538,25 @@ public class JSONArrayTest { // validate JSON Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonArray.toString()); assertTrue("expected 11 top level items", ((List)(JsonPath.read(doc, "$"))).size() == 11); - assertTrue("expected true", Boolean.TRUE.equals(JsonPath.read(doc, "$[0]"))); - assertTrue("expected false", Boolean.FALSE.equals(JsonPath.read(doc, "$[1]"))); + assertTrue("expected true", Boolean.TRUE.equals(jsonArray.query("/0"))); + assertTrue("expected false", Boolean.FALSE.equals(jsonArray.query("/1"))); assertTrue("expected 2 items in [2]", ((List)(JsonPath.read(doc, "$[2]"))).size() == 2); - assertTrue("expected hello", "hello".equals(JsonPath.read(doc, "$[2][0]"))); - assertTrue("expected world", "world".equals(JsonPath.read(doc, "$[2][1]"))); - assertTrue("expected 2.5", Double.valueOf(2.5).equals(JsonPath.read(doc, "$[3]"))); - assertTrue("expected 1", Integer.valueOf(1).equals(JsonPath.read(doc, "$[4]"))); - assertTrue("expected 45", Integer.valueOf(45).equals(JsonPath.read(doc, "$[5]"))); - assertTrue("expected objectPut", "objectPut".equals(JsonPath.read(doc, "$[6]"))); - assertTrue("expected null", null == JsonPath.read(doc, "$[7]")); + assertTrue("expected hello", "hello".equals(jsonArray.query("/2/0"))); + assertTrue("expected world", "world".equals(jsonArray.query("/2/1"))); + assertTrue("expected 2.5", Double.valueOf(2.5).equals(jsonArray.query("/3"))); + assertTrue("expected 1", Integer.valueOf(1).equals(jsonArray.query("/4"))); + assertTrue("expected 45", Long.valueOf(45).equals(jsonArray.query("/5"))); + assertTrue("expected objectPut", "objectPut".equals(jsonArray.query("/6"))); + assertTrue("expected null", JSONObject.NULL.equals(jsonArray.query("/7"))); assertTrue("expected 3 items in [8]", ((Map)(JsonPath.read(doc, "$[8]"))).size() == 3); - assertTrue("expected val10", "val10".equals(JsonPath.read(doc, "$[8].key10"))); - assertTrue("expected val20", "val20".equals(JsonPath.read(doc, "$[8].key20"))); - assertTrue("expected val30", "val30".equals(JsonPath.read(doc, "$[8].key30"))); + assertTrue("expected val10", "val10".equals(jsonArray.query("/8/key10"))); + assertTrue("expected val20", "val20".equals(jsonArray.query("/8/key20"))); + assertTrue("expected val30", "val30".equals(jsonArray.query("/8/key30"))); assertTrue("expected 2 items in [9]", ((List)(JsonPath.read(doc, "$[9]"))).size() == 2); - assertTrue("expected 1", Integer.valueOf(1).equals(JsonPath.read(doc, "$[9][0]"))); - assertTrue("expected 2", Integer.valueOf(2).equals(JsonPath.read(doc, "$[9][1]"))); + assertTrue("expected 1", Integer.valueOf(1).equals(jsonArray.query("/9/0"))); + assertTrue("expected 2", Integer.valueOf(2).equals(jsonArray.query("/9/1"))); assertTrue("expected 1 item in [10]", ((Map)(JsonPath.read(doc, "$[10]"))).size() == 1); - assertTrue("expected v1", "v1".equals(JsonPath.read(doc, "$[10].k1"))); + assertTrue("expected v1", "v1".equals(jsonArray.query("/10/k1"))); } /** @@ -637,13 +637,13 @@ public class JSONArrayTest { // validate JSON Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonArray.toString()); assertTrue("expected 7 top level items", ((List)(JsonPath.read(doc, "$"))).size() == 7); - assertTrue("expected 1", Integer.valueOf(1).equals(JsonPath.read(doc, "$[0]"))); - assertTrue("expected 2", Integer.valueOf(2).equals(JsonPath.read(doc, "$[1]"))); - assertTrue("expected 3", Integer.valueOf(3).equals(JsonPath.read(doc, "$[2]"))); - assertTrue("expected 4", Integer.valueOf(4).equals(JsonPath.read(doc, "$[3]"))); - assertTrue("expected 5", Integer.valueOf(5).equals(JsonPath.read(doc, "$[4]"))); - assertTrue("expected 6", Integer.valueOf(6).equals(JsonPath.read(doc, "$[5]"))); - assertTrue("expected 7", Integer.valueOf(7).equals(JsonPath.read(doc, "$[6]"))); + assertTrue("expected 1", Integer.valueOf(1).equals(jsonArray.query("/0"))); + assertTrue("expected 2", Integer.valueOf(2).equals(jsonArray.query("/1"))); + assertTrue("expected 3", Integer.valueOf(3).equals(jsonArray.query("/2"))); + assertTrue("expected 4", Integer.valueOf(4).equals(jsonArray.query("/3"))); + assertTrue("expected 5", Integer.valueOf(5).equals(jsonArray.query("/4"))); + assertTrue("expected 6", Integer.valueOf(6).equals(jsonArray.query("/5"))); + assertTrue("expected 7", Integer.valueOf(7).equals(jsonArray.query("/6"))); } /** diff --git a/src/test/org/json/junit/JSONStringerTest.java b/src/test/org/json/junit/JSONStringerTest.java index 631d792..19b46de 100644 --- a/src/test/org/json/junit/JSONStringerTest.java +++ b/src/test/org/json/junit/JSONStringerTest.java @@ -194,13 +194,13 @@ public class JSONStringerTest { // validate JSON content Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString()); assertTrue("expected 7 top level items", ((Map)(JsonPath.read(doc, "$"))).size() == 7); - assertTrue("expected true", Boolean.TRUE.equals(JsonPath.read(doc, "$.trueValue"))); - assertTrue("expected false", Boolean.FALSE.equals(JsonPath.read(doc, "$.falseValue"))); - assertTrue("expected null", null == JsonPath.read(doc, "$.nullValue")); - assertTrue("expected hello world!", "hello world!".equals(JsonPath.read(doc, "$.stringValue"))); - assertTrue("expected h\be\tllo w\u1234orld!", "h\be\tllo w\u1234orld!".equals(JsonPath.read(doc, "$.complexStringValue"))); - assertTrue("expected 42", Integer.valueOf(42).equals(JsonPath.read(doc, "$.intValue"))); - assertTrue("expected -23.45e67", Double.valueOf(-23.45e67).equals(JsonPath.read(doc, "$.doubleValue"))); + assertTrue("expected true", Boolean.TRUE.equals(jsonObject.query("/trueValue"))); + assertTrue("expected false", Boolean.FALSE.equals(jsonObject.query("/falseValue"))); + assertTrue("expected null", JSONObject.NULL.equals(jsonObject.query("/nullValue"))); + assertTrue("expected hello world!", "hello world!".equals(jsonObject.query("/stringValue"))); + assertTrue("expected h\be\tllo w\u1234orld!", "h\be\tllo w\u1234orld!".equals(jsonObject.query("/complexStringValue"))); + assertTrue("expected 42", Integer.valueOf(42).equals(jsonObject.query("/intValue"))); + assertTrue("expected -23.45e67", Double.valueOf(-23.45e67).equals(jsonObject.query("/doubleValue"))); } /** @@ -224,12 +224,12 @@ public class JSONStringerTest { // validate JSON content Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonArray.toString()); assertTrue("expected 6 top level items", ((List)(JsonPath.read(doc, "$"))).size() == 6); - assertTrue("expected true", Boolean.TRUE.equals(JsonPath.read(doc, "$[0]"))); - assertTrue("expected false", Boolean.FALSE.equals(JsonPath.read(doc, "$[1]"))); - assertTrue("expected null", null == JsonPath.read(doc, "$[2]")); - assertTrue("expected hello world!", "hello world!".equals(JsonPath.read(doc, "$[3]"))); - assertTrue("expected 42", Integer.valueOf(42).equals(JsonPath.read(doc, "$[4]"))); - assertTrue("expected -23.45e67", Double.valueOf(-23.45e67).equals(JsonPath.read(doc, "$[5]"))); + assertTrue("expected true", Boolean.TRUE.equals(jsonArray.query("/0"))); + assertTrue("expected false", Boolean.FALSE.equals(jsonArray.query("/1"))); + assertTrue("expected null", JSONObject.NULL.equals(jsonArray.query("/2"))); + assertTrue("expected hello world!", "hello world!".equals(jsonArray.query("/3"))); + assertTrue("expected 42", Integer.valueOf(42).equals(jsonArray.query("/4"))); + assertTrue("expected -23.45e67", Double.valueOf(-23.45e67).equals(jsonArray.query("/5"))); } /** @@ -281,27 +281,27 @@ public class JSONStringerTest { assertTrue("expected 5 array1 items", ((List)(JsonPath.read(doc, "$.object2.array1"))).size() == 5); assertTrue("expected 4 array[2] items", ((Map)(JsonPath.read(doc, "$.object2.array1[2]"))).size() == 4); assertTrue("expected 4 array1[2].array2 items", ((List)(JsonPath.read(doc, "$.object2.array1[2].array2"))).size() == 4); - assertTrue("expected true", Boolean.TRUE.equals(JsonPath.read(doc, "$.trueValue"))); - assertTrue("expected false", Boolean.FALSE.equals(JsonPath.read(doc, "$.falseValue"))); - assertTrue("expected null", null == JsonPath.read(doc, "$.nullValue")); - assertTrue("expected hello world!", "hello world!".equals(JsonPath.read(doc, "$.stringValue"))); - assertTrue("expected 42", Integer.valueOf(42).equals(JsonPath.read(doc, "$.intValue"))); - assertTrue("expected -23.45e67", Double.valueOf(-23.45e67).equals(JsonPath.read(doc, "$.doubleValue"))); - assertTrue("expected h\be\tllo w\u1234orld!", "h\be\tllo w\u1234orld!".equals(JsonPath.read(doc, "$.complexStringValue"))); - assertTrue("expected v1", "v1".equals(JsonPath.read(doc, "$.object2.k1"))); - assertTrue("expected v2", "v2".equals(JsonPath.read(doc, "$.object2.k2"))); - assertTrue("expected v3", "v3".equals(JsonPath.read(doc, "$.object2.k3"))); - assertTrue("expected 1", Integer.valueOf(1).equals(JsonPath.read(doc, "$.object2.array1[0]"))); - assertTrue("expected 2", Integer.valueOf(2).equals(JsonPath.read(doc, "$.object2.array1[1]"))); - assertTrue("expected v4", "v4".equals(JsonPath.read(doc, "$.object2.array1[2].k4"))); - assertTrue("expected v5", "v5".equals(JsonPath.read(doc, "$.object2.array1[2].k5"))); - assertTrue("expected v6", "v6".equals(JsonPath.read(doc, "$.object2.array1[2].k6"))); - assertTrue("expected 5", Integer.valueOf(5).equals(JsonPath.read(doc, "$.object2.array1[2].array2[0]"))); - assertTrue("expected 6", Integer.valueOf(6).equals(JsonPath.read(doc, "$.object2.array1[2].array2[1]"))); - assertTrue("expected 7", Integer.valueOf(7).equals(JsonPath.read(doc, "$.object2.array1[2].array2[2]"))); - assertTrue("expected 8", Integer.valueOf(8).equals(JsonPath.read(doc, "$.object2.array1[2].array2[3]"))); - assertTrue("expected 3", Integer.valueOf(3).equals(JsonPath.read(doc, "$.object2.array1[3]"))); - assertTrue("expected 4", Integer.valueOf(4).equals(JsonPath.read(doc, "$.object2.array1[4]"))); + assertTrue("expected true", Boolean.TRUE.equals(jsonObject.query("/trueValue"))); + assertTrue("expected false", Boolean.FALSE.equals(jsonObject.query("/falseValue"))); + assertTrue("expected null", JSONObject.NULL.equals(jsonObject.query("/nullValue"))); + assertTrue("expected hello world!", "hello world!".equals(jsonObject.query("/stringValue"))); + assertTrue("expected 42", Integer.valueOf(42).equals(jsonObject.query("/intValue"))); + assertTrue("expected -23.45e67", Double.valueOf(-23.45e67).equals(jsonObject.query("/doubleValue"))); + assertTrue("expected h\be\tllo w\u1234orld!", "h\be\tllo w\u1234orld!".equals(jsonObject.query("/complexStringValue"))); + assertTrue("expected v1", "v1".equals(jsonObject.query("/object2/k1"))); + assertTrue("expected v2", "v2".equals(jsonObject.query("/object2/k2"))); + assertTrue("expected v3", "v3".equals(jsonObject.query("/object2/k3"))); + assertTrue("expected 1", Integer.valueOf(1).equals(jsonObject.query("/object2/array1/0"))); + assertTrue("expected 2", Integer.valueOf(2).equals(jsonObject.query("/object2/array1/1"))); + assertTrue("expected v4", "v4".equals(jsonObject.query("/object2/array1/2/k4"))); + assertTrue("expected v5", "v5".equals(jsonObject.query("/object2/array1/2/k5"))); + assertTrue("expected v6", "v6".equals(jsonObject.query("/object2/array1/2/k6"))); + assertTrue("expected 5", Integer.valueOf(5).equals(jsonObject.query("/object2/array1/2/array2/0"))); + assertTrue("expected 6", Integer.valueOf(6).equals(jsonObject.query("/object2/array1/2/array2/1"))); + assertTrue("expected 7", Integer.valueOf(7).equals(jsonObject.query("/object2/array1/2/array2/2"))); + assertTrue("expected 8", Integer.valueOf(8).equals(jsonObject.query("/object2/array1/2/array2/3"))); + assertTrue("expected 3", Integer.valueOf(3).equals(jsonObject.query("/object2/array1/3"))); + assertTrue("expected 4", Integer.valueOf(4).equals(jsonObject.query("/object2/array1/4"))); } }