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 65a19d0 GEODE-5008: Add unit tests for GfJsonArray (#1758)
65a19d0 is described below
commit 65a19d0ccfd14a4ad02607ebacc83926b4c5b252
Author: Jens Deppe <jde...@pivotal.io>
AuthorDate: Tue Apr 10 06:31:06 2018 -0700
GEODE-5008: Add unit tests for GfJsonArray (#1758)
* GEODE-5008: Add unit tests for GfJsonArray
- Remove some unused methods from GfJsonArray
---
.../management/internal/cli/json/GfJsonArray.java | 23 ---
.../internal/cli/json/GfJsonArrayTest.java | 155 +++++++++++++++++++++
2 files changed, 155 insertions(+), 23 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonArray.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonArray.java
index bfc6672..593192a 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonArray.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonArray.java
@@ -54,17 +54,6 @@ public class GfJsonArray {
}
/**
- * @throws GfJsonException If there is a syntax error.
- */
- public GfJsonArray(String source) throws GfJsonException {
- try {
- this.jsonArray = new JSONArray(source);
- } catch (JSONException e) {
- throw new GfJsonException(e.getMessage());
- }
- }
-
- /**
* Get the object value associated with an index.
*
* @return An object value.
@@ -150,18 +139,6 @@ public class GfJsonArray {
return jsonArray.toString();
}
- /**
- * @return this GfJsonArray
- * @throws GfJsonException If the object contains an invalid number.
- */
- public String toIndentedString(int indentFactor) throws GfJsonException {
- try {
- return jsonArray.toString(indentFactor);
- } catch (JSONException e) {
- throw new GfJsonException(e.getMessage());
- }
- }
-
public static byte[] toByteArray(GfJsonArray jsonArray) throws
GfJsonException {
byte[] byteArray = null;
if (jsonArray != null) {
diff --git
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/GfJsonArrayTest.java
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/GfJsonArrayTest.java
new file mode 100644
index 0000000..b9305a4
--- /dev/null
+++
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/GfJsonArrayTest.java
@@ -0,0 +1,155 @@
+/*
+ * 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 java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+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 GfJsonArrayTest {
+
+ private GfJsonArray gfJsonArray;
+
+ public static class Simple {
+ private int key;
+ private String value;
+
+ public Simple(int key, String value) {
+ this.key = key;
+ this.value = value;
+ }
+
+ public int getKey() {
+ return key;
+ }
+
+ public String getValue() {
+ return value;
+ }
+ }
+
+ @Before
+ public void setup() {
+ gfJsonArray = new GfJsonArray();
+ }
+
+ @Test
+ public void emptyArray() {
+ assertThat(gfJsonArray.size()).isEqualTo(0);
+ assertThat(gfJsonArray.toString()).isEqualTo("[]");
+ }
+
+ @Test
+ public void arrayFromPrimitives() throws Exception {
+ gfJsonArray = new GfJsonArray(new String[] {"a", "b", "c"});
+
+ assertThat(gfJsonArray.size()).isEqualTo(3);
+ assertThat(gfJsonArray.get(0)).isEqualTo("a");
+ assertThat(gfJsonArray.get(1)).isEqualTo("b");
+ assertThat(gfJsonArray.get(2)).isEqualTo("c");
+ }
+
+ @Test
+ public void addSingleObject() throws Exception {
+ gfJsonArray.put("a");
+ assertThat(gfJsonArray.get(0)).isEqualTo("a");
+ assertThat(gfJsonArray.toString()).isEqualTo("[\"a\"]");
+ }
+
+ @Test
+ public void addMultipleObjects() throws Exception {
+ gfJsonArray.put("a");
+ gfJsonArray.put("b");
+ gfJsonArray.put("c");
+
+ assertThat(gfJsonArray.get(0)).isEqualTo("a");
+ assertThat(gfJsonArray.get(1)).isEqualTo("b");
+ assertThat(gfJsonArray.get(2)).isEqualTo("c");
+ assertThat(gfJsonArray.toString()).isEqualTo("[\"a\",\"b\",\"c\"]");
+ }
+
+ @Test
+ public void putCollection() throws Exception {
+ List<String> multiple = new ArrayList<>();
+ multiple.add("a");
+ multiple.add("b");
+ multiple.add("c");
+ gfJsonArray.put(multiple);
+ gfJsonArray.put(1, multiple);
+
+ assertThat(gfJsonArray.size()).isEqualTo(2);
+ assertThat(gfJsonArray.get(0).toString()).isEqualTo("[\"a\",\"b\",\"c\"]");
+ assertThat(gfJsonArray.get(1).toString()).isEqualTo("[\"a\",\"b\",\"c\"]");
+ }
+
+ @Test
+ public void putMap() throws Exception {
+ Map<Integer, String> multiple = new HashMap<>();
+ multiple.put(1, "a");
+ multiple.put(2, "b");
+ multiple.put(3, "c");
+ gfJsonArray.put(multiple);
+ gfJsonArray.put(1, multiple);
+
+ assertThat(gfJsonArray.size()).isEqualTo(2);
+ assertThat(gfJsonArray.get(0).toString()).isEqualTo("{1=a, 2=b, 3=c}");
+ assertThat(gfJsonArray.get(1).toString()).isEqualTo("{1=a, 2=b, 3=c}");
+ }
+
+ @Test
+ public void putObject() throws Exception {
+ GfJsonObject obj = new GfJsonObject(new Simple(1, "a"));
+ gfJsonArray.put(obj);
+ gfJsonArray.put(1, obj);
+
+ assertThat(gfJsonArray.getJSONObject(0).get("key")).isEqualTo(1);
+ assertThat(gfJsonArray.getJSONObject(0).get("value")).isEqualTo("a");
+ assertThat(gfJsonArray.getJSONObject(1).get("key")).isEqualTo(1);
+ assertThat(gfJsonArray.getJSONObject(1).get("value")).isEqualTo("a");
+ }
+
+ @Test
+ public void putOutOfBoundsAddsNull() throws Exception {
+ gfJsonArray.put(1, "a");
+
+ assertThat(gfJsonArray.size()).isEqualTo(2);
+ assertThat(gfJsonArray.toString()).isEqualTo("[null,\"a\"]");
+ }
+
+ @Test
+ public void stringifyArray() throws Exception {
+ List<String> multiple = new ArrayList<>();
+ multiple.add("a");
+ multiple.add("b");
+ gfJsonArray.put(multiple);
+ gfJsonArray.put(1, multiple);
+ gfJsonArray.put("c");
+
+
assertThat(GfJsonArray.toStringArray(gfJsonArray)).contains("[\"a\",\"b\"]",
"[\"a\",\"b\"]",
+ "c");
+ }
+
+}
--
To stop receiving notification emails like this one, please contact
jensde...@apache.org.
