Commit ab3db59d authored by Arent-Jan Banck's avatar Arent-Jan Banck

CMS-11127 Update json-lib to version 2.4

parent 7706b583
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
<httpclient.version>4.5.2</httpclient.version> <httpclient.version>4.5.2</httpclient.version>
<joda-time.version>2.0</joda-time.version> <joda-time.version>2.0</joda-time.version>
<json-lib.version>2.2.2</json-lib.version> <json-lib.version>2.4</json-lib.version>
<drewnoakes-extractor.version>2.6.2</drewnoakes-extractor.version> <drewnoakes-extractor.version>2.6.2</drewnoakes-extractor.version>
<sanselan.version>0.97-incubator</sanselan.version> <sanselan.version>0.97-incubator</sanselan.version>
......
/* /*
* Copyright 2009-2013 Hippo B.V. (http://www.onehippo.com) * Copyright 2009-2017 Hippo B.V. (http://www.onehippo.com)
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -43,6 +43,7 @@ import junit.framework.TestCase; ...@@ -43,6 +43,7 @@ import junit.framework.TestCase;
import net.sf.json.JSONArray; import net.sf.json.JSONArray;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
import net.sf.json.JsonConfig; import net.sf.json.JsonConfig;
import net.sf.json.JSONNull;
public class TestSettings extends TestCase { public class TestSettings extends TestCase {
...@@ -138,7 +139,7 @@ public class TestSettings extends TestCase { ...@@ -138,7 +139,7 @@ public class TestSettings extends TestCase {
JsonConfig jsonConfig = new JsonConfig(); JsonConfig jsonConfig = new JsonConfig();
jsonConfig.registerJsonValueProcessor(YuiId.class, new YuiIdProcessor()); jsonConfig.registerJsonValueProcessor(YuiId.class, new YuiIdProcessor());
JSONObject wfObject = JSONObject.fromObject(wfSettings, jsonConfig); JSONObject wfObject = JSONObject.fromObject(wfSettings, jsonConfig);
assertTrue(((JSONObject) wfObject.get("rootId")).isNullObject()); assertEquals(JSONNull.getInstance(), wfObject.get("rootId"));
JSONArray units = wfObject.getJSONArray("units"); JSONArray units = wfObject.getJSONArray("units");
Map<String, JSONObject> unitMap = new TreeMap<String, JSONObject>(); Map<String, JSONObject> unitMap = new TreeMap<String, JSONObject>();
...@@ -171,7 +172,7 @@ public class TestSettings extends TestCase { ...@@ -171,7 +172,7 @@ public class TestSettings extends TestCase {
JsonConfig jsonConfig = new JsonConfig(); JsonConfig jsonConfig = new JsonConfig();
jsonConfig.registerJsonValueProcessor(YuiId.class, new YuiIdProcessor()); jsonConfig.registerJsonValueProcessor(YuiId.class, new YuiIdProcessor());
JSONObject wfObject = JSONObject.fromObject(wfSettings, jsonConfig); JSONObject wfObject = JSONObject.fromObject(wfSettings, jsonConfig);
assertTrue(((JSONObject) wfObject.get("rootId")).isNullObject()); assertEquals(JSONNull.getInstance(), wfObject.get("rootId"));
JSONArray units = wfObject.getJSONArray("units"); JSONArray units = wfObject.getJSONArray("units");
JSONObject centerObject = null; JSONObject centerObject = null;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment