diff --git a/jOOQ/src/main/java/org/jooq/tools/json/JSONArray.java b/jOOQ/src/main/java/org/jooq/tools/json/JSONArray.java index f594fb8a83..c43f0529e5 100644 --- a/jOOQ/src/main/java/org/jooq/tools/json/JSONArray.java +++ b/jOOQ/src/main/java/org/jooq/tools/json/JSONArray.java @@ -115,4 +115,9 @@ public class JSONArray extends ArrayList { sb.append(']'); return sb.toString(); } + + @Override + public String toString() { + return toJSONString(this); + } } diff --git a/jOOQ/src/test/java/org/jooq/tools/JSONTest.java b/jOOQ/src/test/java/org/jooq/tools/JSONTest.java new file mode 100644 index 0000000000..def581bcc8 --- /dev/null +++ b/jOOQ/src/test/java/org/jooq/tools/JSONTest.java @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2015 by Data Geekery GmbH (http://www.datageekery.com) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jooq.tools; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +import org.jooq.tools.json.JSONArray; +import org.jooq.tools.json.JSONObject; + +import org.junit.Test; + +/** + * @author Alok Menghrajani + */ +public class JSONTest { + + @Test + public void testJSONObjectToString() { + HashMap map = new HashMap(); + + map.put("foo", "bar"); + assertEquals("{\"foo\":\"bar\"}", new JSONObject(map).toString()); + assertEquals("{\"foo\":\"bar\"}", JSONObject.toJSONString(map)); + + map.put("jOOQ", "isfun!"); + String s = new JSONObject(map).toString(); + assertTrue(s.equals("{\"foo\":\"bar\",\"jOOQ\":\"isfun!\"}") || + s.equals("{\"jOOQ\":\"isfun!\",\"foo\":\"bar\"}")); + + s = JSONObject.toJSONString(map); + assertTrue(s.equals("{\"foo\":\"bar\",\"jOOQ\":\"isfun!\"}") || + s.equals("{\"jOOQ\":\"isfun!\",\"foo\":\"bar\"}")); + } + + @Test + public void testJSONArrayToString() { + List list = new ArrayList(); + + list.add("foo"); + list.add("bar"); + assertEquals("[\"foo\",\"bar\"]", new JSONArray(list).toString()); + assertEquals("[\"foo\",\"bar\"]", JSONArray.toJSONString(list)); + } +} \ No newline at end of file