[geode] branch develop updated: GEODE-5009: Add unit tests for GfJsonObject (#1761)

[je...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jensdeppe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 24840e2  GEODE-5009: Add unit tests for GfJsonObject (#1761)
24840e2 is described below

commit 24840e2e9b3efd7e9e6382067e4b080d1456361b
Author: Jens Deppe <jd...@pivotal.io>
AuthorDate: Tue Apr 10 06:31:29 2018 -0700

    GEODE-5009: Add unit tests for GfJsonObject (#1761)
---
 .../management/internal/cli/json/GfJsonObject.java |  15 ---
 .../internal/cli/json/GfJsonObjectTest.java        | 148 +++++++++++++++++++++
 2 files changed, 148 insertions(+), 15 deletions(-)

diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonObject.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonObject.java
index 3326118..c8f3cb5 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonObject.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonObject.java
@@ -106,21 +106,6 @@ public class GfJsonObject {
     return this;
   }
 
-  public GfJsonObject accumulateAsJSONObject(String key, Object value) throws GfJsonException {
-    JSONObject val = new JSONObject(value);
-    try {
-      if (jsonObject.has(key)) {
-        jsonObject.append(key, val);
-      } else {
-        // first time always add JSONArray for accumulate - for convenience
-        jsonObject.put(key, new JSONArray().put(val));
-      }
-    } catch (JSONException e) {
-      throw new GfJsonException(e.getMessage());
-    }
-    return this;
-  }
-
   /**
    *
    * @param key
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/GfJsonObjectTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/GfJsonObjectTest.java
new file mode 100644
index 0000000..b4bd1d1
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/GfJsonObjectTest.java
@@ -0,0 +1,148 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.apache.geode.management.internal.cli.json;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+
+@Category(UnitTest.class)
+public class GfJsonObjectTest {
+
+  private GfJsonObject gfJsonObject;
+
+  public static class Simple {
+    private int key;
+    private String value;
+
+    public int getKey() {
+      return key;
+    }
+
+    public String getValue() {
+      return value;
+    }
+
+    public Simple(int key, String value) {
+      this.key = key;
+      this.value = value;
+    }
+  }
+
+  @Before
+  public void setup() {
+    gfJsonObject = new GfJsonObject();
+  }
+
+  @Test
+  public void emptyObject() {
+    assertThat(gfJsonObject.toString()).isEqualTo("{}");
+  }
+
+  @Test
+  public void addObject() {
+    gfJsonObject = new GfJsonObject(new Simple(1, "a"));
+
+    assertThat(gfJsonObject.getString("key")).isEqualTo("1");
+    assertThat(gfJsonObject.getString("value")).isEqualTo("a");
+  }
+
+  @Test
+  public void addRawObject() throws Exception {
+    gfJsonObject = new GfJsonObject("{\"key\":1}");
+    assertThat(gfJsonObject.getString("key")).isEqualTo("1");
+  }
+
+  @Test
+  public void accumulatePrimitives() throws Exception {
+    gfJsonObject.accumulate("string", "value1");
+    gfJsonObject.accumulate("string", "value2");
+
+    assertThat(gfJsonObject.getString("string")).isEqualTo("[\"value1\",\"value2\"]");
+  }
+
+  @Test
+  public void putAndGetPrimitives() throws Exception {
+    gfJsonObject.put("string", "value1");
+    gfJsonObject.put("int", Integer.MAX_VALUE);
+    gfJsonObject.put("boolean", true);
+    gfJsonObject.put("double", Double.MAX_VALUE);
+    gfJsonObject.put("long", Long.MAX_VALUE);
+
+    assertThat(gfJsonObject.getString("string")).isEqualTo("value1");
+
+    assertThat(gfJsonObject.getString("int")).isEqualTo(Integer.toString(Integer.MAX_VALUE));
+    assertThat(gfJsonObject.getInt("int")).isEqualTo(Integer.MAX_VALUE);
+
+    assertThat(gfJsonObject.getString("boolean")).isEqualTo("true");
+    assertThat(gfJsonObject.getBoolean("boolean")).isEqualTo(true);
+
+    assertThat(gfJsonObject.getString("double")).isEqualTo(Double.toString(Double.MAX_VALUE));
+    assertThat(gfJsonObject.getDouble("double")).isEqualTo(Double.MAX_VALUE);
+
+    assertThat(gfJsonObject.getString("long")).isEqualTo(Long.toString(Long.MAX_VALUE));
+    assertThat(gfJsonObject.getDouble("long")).isEqualTo(Long.MAX_VALUE);
+  }
+
+  @Test
+  public void appendCreatesAndAddsToArray() throws Exception {
+    gfJsonObject.append("array", 1);
+    gfJsonObject.append("array", 2);
+
+    assertThat(gfJsonObject.getString("array")).isEqualTo("[1,2]");
+  }
+
+  @Test
+  public void cannotAppendToExistingKey() throws Exception {
+    gfJsonObject.put("wat", 1);
+    assertThatThrownBy(() -> gfJsonObject.append("wat", 2)).isInstanceOf(GfJsonException.class);
+  }
+
+  @Test
+  public void canGetGfJsonObject() throws Exception {
+    GfJsonObject sub = new GfJsonObject();
+    sub.put("foo", "bar");
+    gfJsonObject.put("sub", sub);
+
+    assertThat(gfJsonObject.getJSONObject("sub").toString()).isEqualTo("{\"foo\":\"bar\"}");
+  }
+
+  @Test
+  public void canGetGfJsonArray() throws Exception {
+    gfJsonObject.append("array", 1);
+    gfJsonObject.append("array", "a");
+
+    assertThat(gfJsonObject.getJSONArray("array").toString()).isEqualTo("[1,\"a\"]");
+  }
+
+  @Test
+  public void canGetNames() throws Exception {
+    gfJsonObject.put("string", "value1");
+    gfJsonObject.put("int", Integer.MAX_VALUE);
+    gfJsonObject.put("boolean", true);
+    gfJsonObject.put("double", Double.MAX_VALUE);
+    gfJsonObject.put("long", Long.MAX_VALUE);
+
+    assertThat(gfJsonObject.names().size()).isEqualTo(5);
+    assertThat(gfJsonObject.names().toString())
+        .isEqualTo("[\"string\",\"int\",\"boolean\",\"double\",\"long\"]");
+  }
+}

-- 
To stop receiving notification emails like this one, please contact
jensdeppe@apache.org.