erik/JSON-java
erik/JSON-java
1
0
Fork 0
mirror of https://github.com/ethauvin/JSON-java.git synced 2025-06-18 00:10:51 -07:00
Code Releases Activity

added embedded quotes and escapes

Browse source
This commit is contained in:
stleary 2015-03-18 10:13:13 -05:00
parent 5b56b57074
commit 6c5e25dcb9
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
CDLTest.java
View file

@ -59,20 +59,27 @@ public class CDLTest {
String[] values = row.split(","); String[] values = row.split(",");
// need a value for every key to proceed // need a value for every key to proceed
if (keys.length != values.length) { if (keys.length != values.length) {
System.out.println("keys: " + Arrays.toString(keys));
System.out.println("values: " + Arrays.toString(values));
return("row: " +i+ " key and value counts do not match"); return("row: " +i+ " key and value counts do not match");
} }
JSONObject jsonObject = jsonArray.getJSONObject(i); JSONObject jsonObject = jsonArray.getJSONObject(i);
// need a key for every JSONObject entry to proceed // need a key for every JSONObject entry to proceed
if (keys.length != jsonObject.length()) { if (keys.length != jsonObject.length()) {
System.out.println("keys: " + Arrays.toString(keys));
System.out.println("jsonObject: " + jsonObject.toString());
return("row: " +i+ " key and jsonObject counts do not match"); return("row: " +i+ " key and jsonObject counts do not match");
} }
/** /**
* convert string entries into a natural order map. Trim the * convert string entries into a natural order map. Trim the
* keys and values for tokener compatibility * keys and values for tokener compatibility.
*/ */
Map<String, String> strMap = new TreeMap<String, String>(); Map<String, String> strMap = new TreeMap<String, String>();
for (int j = 0; j < keys.length; ++j) { for (int j = 0; j < keys.length; ++j) {
strMap.put(keys[j].trim(), values[j].trim()); values[j] = values[j].trim();
// strip optional surrounding quotes
values[j] = values[j].replaceAll("^\"|\"$", "");
strMap.put(keys[j].trim(), values[j]);
} }
// put the JSONObjet key/value pairs in natural key order // put the JSONObjet key/value pairs in natural key order
Iterator<String> keyIt = jsonObject.keys(); Iterator<String> keyIt = jsonObject.keys();
@ -82,6 +89,8 @@ public class CDLTest {
jsonObjectMap.put(key, jsonObject.get(key).toString()); jsonObjectMap.put(key, jsonObject.get(key).toString());
} }
if (!strMap.equals(jsonObjectMap)) { if (!strMap.equals(jsonObjectMap)) {
System.out.println("strMap: " +strMap.toString());
System.out.println("jsonObjectMap: " +jsonObjectMap.toString());
return("row: " +i+ "string does not match jsonObject"); return("row: " +i+ "string does not match jsonObject");
} }
} }
@ -99,7 +108,11 @@ public class CDLTest {
String lines = new String( String lines = new String(
"Col 1, Col 2, Col 3, Col 4, Col 5, Col 6, Col 7\n" + "Col 1, Col 2, Col 3, Col 4, Col 5, Col 6, Col 7\n" +
"val1, val2, val3, val4, val5, val6, val7\n" + "val1, val2, val3, val4, val5, val6, val7\n" +
"1, 2, 3, 4, 5, 6, 7\n"); "1, 2, 3, 4, 5, 6, 7\n" +
"true, false, true, true, false, false, false\n" +
"0.23, 57.42, 5e27, -234.879, 2.34e5, 0.0, 9e-3\n" +
"\"va\tl1\", \"val2\", \"val\\b3\", \"val4\\n\", \"va\\rl5\", val6, val7\n"
);
JSONArray jsonArray = CDL.toJSONArray(lines); JSONArray jsonArray = CDL.toJSONArray(lines);
String resultStr = compareJSONArrayToString(jsonArray, lines); String resultStr = compareJSONArrayToString(jsonArray, lines);
if (resultStr != null) { if (resultStr != null) {