Skip to content

Commit a8b94b7

Browse files
author
fangyidong
committed
Java 8 improves implementation of HashMap, so the orders of its entries change, and we should never depend on the orders of a specific implementation in the testing codes.
1 parent 351aa58 commit a8b94b7

File tree

1 file changed

+8
-16
lines changed

1 file changed

+8
-16
lines changed

src/test/java/org/json/simple/Test.java

+8-16
Original file line numberDiff line numberDiff line change
@@ -309,22 +309,18 @@ public void testEncode() throws Exception{
309309
assertEquals("[\"abc\\u0010a\\/\",123,222.123,true]",array1.toString());
310310

311311
JSONObject obj1=new JSONObject();
312-
obj1.put("name","fang");
313-
obj1.put("age",new Integer(27));
314-
obj1.put("is_developer",new Boolean(true));
315-
obj1.put("weight",new Double(60.21));
316312
obj1.put("array1",array1);
317313
System.out.println("======obj1 with array1===========");
318314
System.out.println(obj1);
319315
System.out.println();
320-
assertEquals("{\"array1\":[\"abc\\u0010a\\/\",123,222.123,true],\"weight\":60.21,\"age\":27,\"name\":\"fang\",\"is_developer\":true}",obj1.toString());
316+
assertEquals("{\"array1\":[\"abc\\u0010a\\/\",123,222.123,true]}",obj1.toString());
321317

322318
obj1.remove("array1");
323319
array1.add(obj1);
324320
System.out.println("======array1 with obj1========");
325321
System.out.println(array1);
326322
System.out.println();
327-
assertEquals("[\"abc\\u0010a\\/\",123,222.123,true,{\"weight\":60.21,\"age\":27,\"name\":\"fang\",\"is_developer\":true}]",array1.toString());
323+
assertEquals("[\"abc\\u0010a\\/\",123,222.123,true,{}]",array1.toString());
328324

329325
List list = new ArrayList();
330326
list.add("abc\u0010a/");
@@ -336,20 +332,16 @@ public void testEncode() throws Exception{
336332
System.out.println(JSONArray.toJSONString(list));
337333
System.out.println();
338334
assertEquals("[\"abc\\u0010a\\/\",123,222.123,true,null]",JSONArray.toJSONString(list));
339-
335+
340336
Map map = new HashMap();
341-
map.put("name","fang");
342-
map.put("age",new Integer(27));
343-
map.put("is_developer",new Boolean(true));
344-
map.put("weight",new Double(60.21));
345337
map.put("array1",list);
346338
System.out.println("======map with list===========");
347339
System.out.println(map);
348340
System.out.println();
349-
assertEquals("{\"array1\":[\"abc\\u0010a\\/\",123,222.123,true,null],\"weight\":60.21,\"age\":27,\"name\":\"fang\",\"is_developer\":true}",JSONObject.toJSONString(map));
341+
assertEquals("{\"array1\":[\"abc\\u0010a\\/\",123,222.123,true,null]}",JSONObject.toJSONString(map));
350342

351343
Map m1 = new LinkedHashMap();
352-
Map m2 = new HashMap();
344+
Map m2 = new LinkedHashMap();
353345
List l1 = new LinkedList();
354346

355347
m1.put("k11","v11");
@@ -362,13 +354,13 @@ public void testEncode() throws Exception{
362354
l1.add(m2);
363355
String jsonString = JSONValue.toJSONString(l1);
364356
System.out.println(jsonString);
365-
assertEquals("[{\"k11\":\"v11\",\"k12\":\"v12\",\"k13\":\"v13\"},{\"k22\":\"v22\",\"k21\":\"v21\",\"k23\":\"v23\"}]", jsonString);
357+
assertEquals("[{\"k11\":\"v11\",\"k12\":\"v12\",\"k13\":\"v13\"},{\"k21\":\"v21\",\"k22\":\"v22\",\"k23\":\"v23\"}]", jsonString);
366358

367359
StringWriter out = new StringWriter();
368360
JSONValue.writeJSONString(l1, out);
369361
jsonString = out.toString();
370362
System.out.println(jsonString);
371-
assertEquals("[{\"k11\":\"v11\",\"k12\":\"v12\",\"k13\":\"v13\"},{\"k22\":\"v22\",\"k21\":\"v21\",\"k23\":\"v23\"}]", jsonString);
363+
assertEquals("[{\"k11\":\"v11\",\"k12\":\"v12\",\"k13\":\"v13\"},{\"k21\":\"v21\",\"k22\":\"v22\",\"k23\":\"v23\"}]", jsonString);
372364

373365
List l2 = new LinkedList();
374366
Map m3 = new LinkedHashMap();
@@ -386,6 +378,6 @@ public void testEncode() throws Exception{
386378
JSONValue.writeJSONString(l1, out);
387379
jsonString = out.toString();
388380
System.out.println(jsonString);
389-
assertEquals("[{\"k11\":\"v11\",\"k12\":\"v12\",\"k13\":\"v13\",\"k14\":{\"k31\":\"v3\",\"k32\":123.45,\"k33\":false,\"k34\":null,\"k35\":[\"vvv\",\"1.23456789123456789\",true,null]}},{\"k22\":\"v22\",\"k21\":\"v21\",\"k23\":\"v23\"}]",jsonString);
381+
assertEquals("[{\"k11\":\"v11\",\"k12\":\"v12\",\"k13\":\"v13\",\"k14\":{\"k31\":\"v3\",\"k32\":123.45,\"k33\":false,\"k34\":null,\"k35\":[\"vvv\",\"1.23456789123456789\",true,null]}},{\"k21\":\"v21\",\"k22\":\"v22\",\"k23\":\"v23\"}]",jsonString);
390382
}
391383
}

0 commit comments

Comments
 (0)