Arent-Jan Banck pushed to branch release/4.2 at cms-community / hippo-cms
Commits:
ab3db59d by Arent-Jan Banck at 2018-03-14T10:53:47+01:00
CMS-11127 Update json-lib to version 2.4
- - - - -
2 changed files:
- pom.xml
-
test/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings.java
Changes:
=====================================
pom.xml
=====================================
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@
<httpclient.version>4.5.2</httpclient.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>
<sanselan.version>0.97-incubator</sanselan.version>
=====================================
test/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings.java
=====================================
---
a/test/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings.java
+++
b/test/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings.java
@@ -1,5 +1,5 @@
/*
- * 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");
* you may not use this file except in compliance with the License.
@@ -43,6 +43,7 @@ import junit.framework.TestCase;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import net.sf.json.JsonConfig;
+import net.sf.json.JSONNull;
public class TestSettings extends TestCase {
@@ -138,7 +139,7 @@ public class TestSettings extends TestCase {
JsonConfig jsonConfig = new JsonConfig();
jsonConfig.registerJsonValueProcessor(YuiId.class, new
YuiIdProcessor());
JSONObject wfObject = JSONObject.fromObject(wfSettings, jsonConfig);
- assertTrue(((JSONObject) wfObject.get("rootId")).isNullObject());
+ assertEquals(JSONNull.getInstance(), wfObject.get("rootId"));
JSONArray units = wfObject.getJSONArray("units");
Map<String, JSONObject> unitMap = new TreeMap<String, JSONObject>();
@@ -171,7 +172,7 @@ public class TestSettings extends TestCase {
JsonConfig jsonConfig = new JsonConfig();
jsonConfig.registerJsonValueProcessor(YuiId.class, new
YuiIdProcessor());
JSONObject wfObject = JSONObject.fromObject(wfSettings, jsonConfig);
- assertTrue(((JSONObject) wfObject.get("rootId")).isNullObject());
+ assertEquals(JSONNull.getInstance(), wfObject.get("rootId"));
JSONArray units = wfObject.getJSONArray("units");
JSONObject centerObject = null;
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/ab3db59d275afeb064f4659a5d69cd66a989b35f
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/ab3db59d275afeb064f4659a5d69cd66a989b35f
You're receiving this email because of your account on code.onehippo.org.
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
