@@ -24,13 +24,15 @@ static class StringStringMap extends LinkedHashMap<String,String> { };
2424 private final String DOC_WITH_DUPS = a2q (
2525 "{'hello': 'world',\n "
2626 + "'lists' : 1,\n "
27- + "'lists' : 2,\n "
27+ + "'lists' : 2.5 ,\n "
2828 + "'lists' : {\n "
2929 + " 'inner' : 'internal',\n "
3030 + " 'time' : 123\n "
3131 + "},\n "
32- + "'lists' : 3,\n "
33- + "'single' : 'one'\n "
32+ + "'lists' : true,\n "
33+ + "'single' : 'one',\n "
34+ + "'lists' : false,\n "
35+ + "'lists' : null\n "
3436 + "}" );
3537
3638 // Testing the baseline non-merging behavior
@@ -84,7 +86,7 @@ private <T> void _verifyDupsNoMerging(Class<T> cls) throws Exception
8486
8587 String json = JSON_MAPPER .writeValueAsString (value );
8688 assertEquals (a2q (
87- "{'hello':'world','lists':3 ,'single':'one'}" ),
89+ "{'hello':'world','lists':null ,'single':'one'}" ),
8890 json );
8991 }
9092
@@ -94,8 +96,8 @@ private <T> void _verifyDupsNoMerging(Class<T> cls) throws Exception
9496 private void _verifyDupsAreMerged (Class <?> cls ) throws Exception
9597 {
9698 assertEquals (a2q (
97- "{'hello':'world','lists':[1,2,"
98- +"{'inner':'internal','time':123},3 ],'single':'one'}" ),
99+ "{'hello':'world','lists':[1,2.5 ,"
100+ +"{'inner':'internal','time':123},true,false,null ],'single':'one'}" ),
99101 _readWriteDupDoc (DOC_WITH_DUPS , cls ));
100102 }
101103
0 commit comments