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 13:55:52 UTC
svn commit: r1771741 - in /jackrabbit/trunk/jackrabbit-jcr-commons: pom.xml
src/test/java/org/apache/jackrabbit/commons/json/JsonParserTest.java
Author: reschke
Date: Mon Nov 28 13:55:52 2016
New Revision: 1771741
URL: http://svn.apache.org/viewvc?rev=1771741&view=rev
Log:
JCR-4068: jcr-commons: get rid of test dependency to json.org JSON parser
Modified:
jackrabbit/trunk/jackrabbit-jcr-commons/pom.xml
jackrabbit/trunk/jackrabbit-jcr-commons/src/test/java/org/apache/jackrabbit/commons/json/JsonParserTest.java
Modified: jackrabbit/trunk/jackrabbit-jcr-commons/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-commons/pom.xml?rev=1771741&r1=1771740&r2=1771741&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-commons/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jcr-commons/pom.xml Mon Nov 28 13:55:52 2016
@@ -118,8 +118,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/trunk/jackrabbit-jcr-commons/src/test/java/org/apache/jackrabbit/commons/json/JsonParserTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-commons/src/test/java/org/apache/jackrabbit/commons/json/JsonParserTest.java?rev=1771741&r1=1771740&r2=1771741&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-commons/src/test/java/org/apache/jackrabbit/commons/json/JsonParserTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-commons/src/test/java/org/apache/jackrabbit/commons/json/JsonParserTest.java Mon Nov 28 13:55:52 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;
}