Revert "Remove org.json usage [run-systemtest]"

3 files changed, 49 insertions, 48 deletions

diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/state/CoredumpGathererTest.java b/container-core/src/test/java/com/yahoo/container/jdisc/state/CoredumpGathererTest.java
index 8a3d0e837c5..c1f7d790fa5 100644
--- a/container-core/src/test/java/com/yahoo/container/jdisc/state/CoredumpGathererTest.java
+++ b/container-core/src/test/java/com/yahoo/container/jdisc/state/CoredumpGathererTest.java
@@ -1,7 +1,8 @@
 // Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.container.jdisc.state;
 
-import com.fasterxml.jackson.databind.JsonNode;
+import org.json.JSONException;
+import org.json.JSONObject;
 import org.junit.Test;
 
 import java.nio.file.Path;
@@ -16,12 +17,12 @@ import static org.junit.Assert.assertEquals;
 public class CoredumpGathererTest {
 
     @Test
-    public void finds_one_coredump()  {
-    JsonNode packet = CoredumpGatherer.gatherCoredumpMetrics(new MockFileWrapper());
+    public void finds_one_coredump() throws JSONException {
+    JSONObject packet = CoredumpGatherer.gatherCoredumpMetrics(new MockFileWrapper());
 
-    assertEquals("system-coredumps-processing", packet.get("application").textValue());
-    assertEquals(1, packet.get("status_code").intValue());
-    assertEquals("Found 1 coredump(s)", packet.get("status_msg").textValue());
+    assertEquals("system-coredumps-processing", packet.getString("application"));
+    assertEquals(1, packet.getInt("status_code"));
+    assertEquals("Found 1 coredump(s)", packet.getString("status_msg"));
 
     }
 
diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/state/HostLifeGathererTest.java b/container-core/src/test/java/com/yahoo/container/jdisc/state/HostLifeGathererTest.java
index 12852c9d54c..d025b9662d2 100644
--- a/container-core/src/test/java/com/yahoo/container/jdisc/state/HostLifeGathererTest.java
+++ b/container-core/src/test/java/com/yahoo/container/jdisc/state/HostLifeGathererTest.java
@@ -1,7 +1,8 @@
 // Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.container.jdisc.state;
 
-import com.fasterxml.jackson.databind.JsonNode;
+import org.json.JSONException;
+import org.json.JSONObject;
 import org.junit.Test;
 
 import java.nio.file.Path;
@@ -15,15 +16,15 @@ import static org.junit.Assert.assertEquals;
 public class HostLifeGathererTest {
 
     @Test
-    public void host_is_alive() {
-        JsonNode packet = HostLifeGatherer.getHostLifePacket(new MockFileWrapper());
-        JsonNode metrics = packet.get("metrics");
-        assertEquals("host_life", packet.get("application").textValue());
-        assertEquals(0, packet.get("status_code").intValue());
-        assertEquals("OK", packet.get("status_msg").textValue());
-
-        assertEquals(123L, metrics.get("uptime").longValue());
-        assertEquals(1, metrics.get("alive").intValue());
+    public void host_is_alive() throws JSONException {
+        JSONObject packet = HostLifeGatherer.getHostLifePacket(new MockFileWrapper());
+        JSONObject metrics = packet.getJSONObject("metrics");
+        assertEquals("host_life", packet.getString("application"));
+        assertEquals(0, packet.getInt("status_code"));
+        assertEquals("OK", packet.getString("status_msg"));
+
+        assertEquals(123l, metrics.getLong("uptime"));
+        assertEquals(1, metrics.getInt("alive"));
 
     }
 
diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/state/StateHandlerTest.java b/container-core/src/test/java/com/yahoo/container/jdisc/state/StateHandlerTest.java
index 385eb627427..1258ecdc46f 100644
--- a/container-core/src/test/java/com/yahoo/container/jdisc/state/StateHandlerTest.java
+++ b/container-core/src/test/java/com/yahoo/container/jdisc/state/StateHandlerTest.java
@@ -98,38 +98,37 @@ public class StateHandlerTest extends StateHandlerTestBase {
         snapshotProvider.setSnapshot(snapshot);
         advanceToNextSnapshot();
         assertEquals("{\n" +
-                        "  \"time\" : 300000,\n" +
-                        "  \"status\" : {\n" +
-                        "    \"code\" : \"up\"\n" +
-                        "  },\n" +
-                        "  \"metrics\" : {\n" +
-                        "    \"snapshot\" : {\n" +
-                        "      \"from\" : 0.0,\n" +
-                        "      \"to\" : 300.0\n" +
-                        "    },\n" +
-                        "    \"values\" : [ {\n" +
-                        "      \"name\" : \"foo\",\n" +
-                        "      \"values\" : {\n" +
-                        "        \"count\" : 1,\n" +
-                        "        \"rate\" : 0.0033333333333333335\n" +
-                        "      }\n" +
-                        "    }, {\n" +
-                        "      \"name\" : \"bar\",\n" +
-                        "      \"values\" : {\n" +
-                        "        \"average\" : 3.5,\n" +
-                        "        \"sum\" : 14.0,\n" +
-                        "        \"count\" : 4,\n" +
-                        "        \"last\" : 5.0,\n" +
-                        "        \"max\" : 5.0,\n" +
-                        "        \"min\" : 2.0,\n" +
-                        "        \"rate\" : 0.013333333333333334\n" +
-                        "      },\n" +
-                        "      \"dimensions\" : {\n" +
-                        "        \"component\" : \"test\"\n" +
-                        "      }\n" +
-                        "    } ]\n" +
-                        "  }\n" +
-                        "}",
+                     "    \"metrics\": {\n" +
+                     "        \"snapshot\": {\n" +
+                     "            \"from\": 0,\n" +
+                     "            \"to\": 300\n" +
+                     "        },\n" +
+                     "        \"values\": [\n" +
+                     "            {\n" +
+                     "                \"name\": \"foo\",\n" +
+                     "                \"values\": {\n" +
+                     "                    \"count\": 1,\n" +
+                     "                    \"rate\": 0.0033333333333333335\n" +
+                     "                }\n" +
+                     "            },\n" +
+                     "            {\n" +
+                     "                \"dimensions\": {\"component\": \"test\"},\n" +
+                     "                \"name\": \"bar\",\n" +
+                     "                \"values\": {\n" +
+                     "                    \"average\": 3.5,\n" +
+                     "                    \"count\": 4,\n" +
+                     "                    \"last\": 5,\n" +
+                     "                    \"max\": 5,\n" +
+                     "                    \"min\": 2,\n" +
+                     "                    \"rate\": 0.013333333333333334,\n" +
+                     "                    \"sum\": 14\n" +
+                     "                }\n" +
+                     "            }\n" +
+                     "        ]\n" +
+                     "    },\n" +
+                     "    \"status\": {\"code\": \"up\"},\n" +
+                     "    \"time\": 300000\n" +
+                     "}",
                      requestAsString(V1_URI + "all"));
     }