You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2016/11/28 14:48:04 UTC
svn commit: r1771754 - in /jackrabbit/branches/2.8: ./
jackrabbit-jcr-commons/pom.xml
jackrabbit-jcr-commons/src/test/java/org/apache/jackrabbit/commons/json/JsonParserTest.java
Author: reschke
Date: Mon Nov 28 14:48:04 2016
New Revision: 1771754
URL: http://svn.apache.org/viewvc?rev=1771754&view=rev
Log:
JCR-4068: jcr-commons: get rid of test dependency to json.org JSON parser (ported to 2.8)
Modified:
jackrabbit/branches/2.8/ (props changed)
jackrabbit/branches/2.8/jackrabbit-jcr-commons/pom.xml
jackrabbit/branches/2.8/jackrabbit-jcr-commons/src/test/java/org/apache/jackrabbit/commons/json/JsonParserTest.java
Propchange: jackrabbit/branches/2.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 28 14:48:04 2016
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1625561,1634584,1653275,1667787,1674859,1680757,1709811,1729382,1732436,1740814-1740815,1751279,1752165,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078
+/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1625561,1634584,1653275,1667787,1674859,1680757,1709811,1729382,1732436,1740814-1740815,1751279,1752165,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078,1771741
Modified: jackrabbit/branches/2.8/jackrabbit-jcr-commons/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-jcr-commons/pom.xml?rev=1771754&r1=1771753&r2=1771754&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-jcr-commons/pom.xml (original)
+++ jackrabbit/branches/2.8/jackrabbit-jcr-commons/pom.xml Mon Nov 28 14:48:04 2016
@@ -114,8 +114,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
+ <groupId>com.googlecode.json-simple</groupId>
+ <artifactId>json-simple</artifactId>
+ <version>1.1.1</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: jackrabbit/branches/2.8/jackrabbit-jcr-commons/src/test/java/org/apache/jackrabbit/commons/json/JsonParserTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-jcr-commons/src/test/java/org/apache/jackrabbit/commons/json/JsonParserTest.java?rev=1771754&r1=1771753&r2=1771754&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-jcr-commons/src/test/java/org/apache/jackrabbit/commons/json/JsonParserTest.java (original)
+++ jackrabbit/branches/2.8/jackrabbit-jcr-commons/src/test/java/org/apache/jackrabbit/commons/json/JsonParserTest.java Mon Nov 28 14:48:04 2016
@@ -16,9 +16,6 @@
*/
package org.apache.jackrabbit.commons.json;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
import junit.framework.TestCase;
import java.util.ArrayList;
@@ -26,6 +23,9 @@ import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
/**
* <code>JSONParserTest</code>...
*/
@@ -298,7 +298,7 @@ public class JsonParserTest extends Test
public void testNullValue() throws Exception {
JSONObject obj = new JSONObject();
- obj.put("null", JSONObject.NULL);
+ obj.put("null", null);
JsonHandler handler = new DummyJsonHandler() {
public void key(String key) {
@@ -493,7 +493,7 @@ public class JsonParserTest extends Test
l.add("{\"a\":{\"b\":{\"c\":{}}}}");
l.add("{\"a\":{},\"b\":{\"c\":{}}}");
l.add("{\"a\":{\"b\":{},\"c\":{}}}");
-
+
for (Iterator it = l.iterator(); it.hasNext();) {
JsonHandler handler = new DummyJsonHandler() {
private int objectCnt = 0;
@@ -527,8 +527,8 @@ public class JsonParserTest extends Test
parser.parse(it.next().toString());
}
}
-
- private static JSONObject getObj() throws JSONException {
+
+ private static JSONObject getObj() {
JSONObject obj = new JSONObject();
obj.put("boolean", true);
obj.put("long", 1);
@@ -540,16 +540,16 @@ public class JsonParserTest extends Test
return obj;
}
- private static JSONObject getSimpleObj(Object value) throws JSONException {
+ private static JSONObject getSimpleObj(Object value) {
JSONObject obj = new JSONObject();
obj.put("v", value);
return obj;
}
- private static JSONArray getSimpleArray(Object[] values) throws JSONException {
+ private static JSONArray getSimpleArray(Object[] values) {
JSONArray arr = new JSONArray();
for (int i = 0; i < values.length; i++) {
- arr.put(values[i]);
+ arr.add(values[i]);
}
return arr;
}