GitLab Mirror pushed to branch 2.10 at cms-community / hippo-jackrabbit
Commits: f97cc219 by Julian Reschke at 2016-11-28T14:36:12+00:00 JCR-4068: jcr-commons: get rid of test dependency to json.org JSON parser (ported to 2.10) git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.10@1771750 13f79535-47bb-0310-9956-ffa450edef68 - - - - - 2 changed files: - jackrabbit-jcr-commons/pom.xml - jackrabbit-jcr-commons/src/test/java/org/apache/jackrabbit/commons/json/JsonParserTest.java Changes: ===================================== jackrabbit-jcr-commons/pom.xml ===================================== --- a/jackrabbit-jcr-commons/pom.xml +++ b/jackrabbit-jcr-commons/pom.xml @@ -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> ===================================== jackrabbit-jcr-commons/src/test/java/org/apache/jackrabbit/commons/json/JsonParserTest.java ===================================== --- a/jackrabbit-jcr-commons/src/test/java/org/apache/jackrabbit/commons/json/JsonParserTest.java +++ b/jackrabbit-jcr-commons/src/test/java/org/apache/jackrabbit/commons/json/JsonParserTest.java @@ -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 TestCase { 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 TestCase { 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 TestCase { 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 TestCase { 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; } View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/f97cc219d7a90ea3baf6a1f00020981424181d01
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
