From 2ea07bb13a7bfef99abb55c880c4d081a167b384 Mon Sep 17 00:00:00 2001 From: Xinyu Wu Date: Fri, 15 Apr 2022 16:41:02 -0500 Subject: [PATCH 1/2] fix --- .../zeppelin/iotdb/IoTDBInterpreterTest.java | 34 ++++++++++++++++--- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/iotdb/IoTDBInterpreterTest.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/iotdb/IoTDBInterpreterTest.java index 352c6d85a5d99..6d54b73a70849 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/iotdb/IoTDBInterpreterTest.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/iotdb/IoTDBInterpreterTest.java @@ -30,6 +30,10 @@ import org.junit.Test; import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; import java.util.Properties; import static org.apache.zeppelin.iotdb.IoTDBInterpreter.DEFAULT_ENABLE_RPC_COMPRESSION; @@ -324,7 +328,11 @@ public void testShowTimeseries() { + "root.test.wf01.wt01.hardware\tnull\troot.test.wf01\tFLOAT\tGORILLA\tSNAPPY\tnull\tnull"; Assert.assertNotNull(actual); Assert.assertEquals(Code.SUCCESS, actual.code()); - Assert.assertEquals(gt, actual.message().get(0).getData()); + List actual_list = + new ArrayList(Arrays.asList(actual.message().get(0).getData().split("\n"))); + List expected_list = new ArrayList(Arrays.asList(gt.split("\n"))); + Assert.assertEquals(expected_list.get(0), actual_list.get(0)); + Assert.assertEquals(new HashSet(expected_list), new HashSet(actual_list)); } @Test @@ -334,7 +342,11 @@ public void testShowDevices() { "devices\tisAligned\n" + "root.test.wf02.wt02\tfalse\n" + "root.test.wf01.wt01\tfalse"; Assert.assertNotNull(actual); Assert.assertEquals(Code.SUCCESS, actual.code()); - Assert.assertEquals(gt, actual.message().get(0).getData()); + List actual_list = + new ArrayList(Arrays.asList(actual.message().get(0).getData().split("\n"))); + List expected_list = new ArrayList(Arrays.asList(gt.split("\n"))); + Assert.assertEquals(expected_list.get(0), actual_list.get(0)); + Assert.assertEquals(new HashSet(expected_list), new HashSet(actual_list)); } @Test @@ -348,7 +360,11 @@ public void testShowDevicesWithSg() { Assert.assertNotNull(actual); Assert.assertEquals(Code.SUCCESS, actual.code()); System.out.println(actual.message().get(0).getData()); - Assert.assertEquals(gt, actual.message().get(0).getData()); + List actual_list = + new ArrayList(Arrays.asList(actual.message().get(0).getData().split("\n"))); + List expected_list = new ArrayList(Arrays.asList(gt.split("\n"))); + Assert.assertEquals(expected_list.get(0), actual_list.get(0)); + Assert.assertEquals(new HashSet(expected_list), new HashSet(actual_list)); } @Test @@ -358,7 +374,11 @@ public void testShowAllTTL() { String gt = "storage group\tttl\n" + "root.test.wf02\tnull\n" + "root.test.wf01\t12345"; Assert.assertNotNull(actual); Assert.assertEquals(Code.SUCCESS, actual.code()); - Assert.assertEquals(gt, actual.message().get(0).getData()); + List actual_list = + new ArrayList(Arrays.asList(actual.message().get(0).getData().split("\n"))); + List expected_list = new ArrayList(Arrays.asList(gt.split("\n"))); + Assert.assertEquals(expected_list.get(0), actual_list.get(0)); + Assert.assertEquals(new HashSet(expected_list), new HashSet(actual_list)); } @Test @@ -377,7 +397,11 @@ public void testShowStorageGroup() { String gt = "storage group\n" + "root.test.wf02\n" + "root.test.wf01"; Assert.assertNotNull(actual); Assert.assertEquals(Code.SUCCESS, actual.code()); - Assert.assertEquals(gt, actual.message().get(0).getData()); + List actual_list = + new ArrayList(Arrays.asList(actual.message().get(0).getData().split("\n"))); + List expected_list = new ArrayList(Arrays.asList(gt.split("\n"))); + Assert.assertEquals(expected_list.get(0), actual_list.get(0)); + Assert.assertEquals(new HashSet(expected_list), new HashSet(actual_list)); } @Test From 2ded3ddcbc3e2e90208d31b76d0839b41cbc2e3f Mon Sep 17 00:00:00 2001 From: Xinyu Wu Date: Mon, 25 Apr 2022 10:32:57 -0500 Subject: [PATCH 2/2] add a helper function --- .../zeppelin/iotdb/IoTDBInterpreterTest.java | 37 ++++++------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/iotdb/IoTDBInterpreterTest.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/iotdb/IoTDBInterpreterTest.java index 6d54b73a70849..ff9a556c4fe23 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/iotdb/IoTDBInterpreterTest.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/iotdb/IoTDBInterpreterTest.java @@ -328,11 +328,7 @@ public void testShowTimeseries() { + "root.test.wf01.wt01.hardware\tnull\troot.test.wf01\tFLOAT\tGORILLA\tSNAPPY\tnull\tnull"; Assert.assertNotNull(actual); Assert.assertEquals(Code.SUCCESS, actual.code()); - List actual_list = - new ArrayList(Arrays.asList(actual.message().get(0).getData().split("\n"))); - List expected_list = new ArrayList(Arrays.asList(gt.split("\n"))); - Assert.assertEquals(expected_list.get(0), actual_list.get(0)); - Assert.assertEquals(new HashSet(expected_list), new HashSet(actual_list)); + assertEqualsNonStrict(gt, actual.message().get(0).getData()); } @Test @@ -342,11 +338,7 @@ public void testShowDevices() { "devices\tisAligned\n" + "root.test.wf02.wt02\tfalse\n" + "root.test.wf01.wt01\tfalse"; Assert.assertNotNull(actual); Assert.assertEquals(Code.SUCCESS, actual.code()); - List actual_list = - new ArrayList(Arrays.asList(actual.message().get(0).getData().split("\n"))); - List expected_list = new ArrayList(Arrays.asList(gt.split("\n"))); - Assert.assertEquals(expected_list.get(0), actual_list.get(0)); - Assert.assertEquals(new HashSet(expected_list), new HashSet(actual_list)); + assertEqualsNonStrict(gt, actual.message().get(0).getData()); } @Test @@ -360,11 +352,7 @@ public void testShowDevicesWithSg() { Assert.assertNotNull(actual); Assert.assertEquals(Code.SUCCESS, actual.code()); System.out.println(actual.message().get(0).getData()); - List actual_list = - new ArrayList(Arrays.asList(actual.message().get(0).getData().split("\n"))); - List expected_list = new ArrayList(Arrays.asList(gt.split("\n"))); - Assert.assertEquals(expected_list.get(0), actual_list.get(0)); - Assert.assertEquals(new HashSet(expected_list), new HashSet(actual_list)); + assertEqualsNonStrict(gt, actual.message().get(0).getData()); } @Test @@ -374,11 +362,7 @@ public void testShowAllTTL() { String gt = "storage group\tttl\n" + "root.test.wf02\tnull\n" + "root.test.wf01\t12345"; Assert.assertNotNull(actual); Assert.assertEquals(Code.SUCCESS, actual.code()); - List actual_list = - new ArrayList(Arrays.asList(actual.message().get(0).getData().split("\n"))); - List expected_list = new ArrayList(Arrays.asList(gt.split("\n"))); - Assert.assertEquals(expected_list.get(0), actual_list.get(0)); - Assert.assertEquals(new HashSet(expected_list), new HashSet(actual_list)); + assertEqualsNonStrict(gt, actual.message().get(0).getData()); } @Test @@ -397,11 +381,7 @@ public void testShowStorageGroup() { String gt = "storage group\n" + "root.test.wf02\n" + "root.test.wf01"; Assert.assertNotNull(actual); Assert.assertEquals(Code.SUCCESS, actual.code()); - List actual_list = - new ArrayList(Arrays.asList(actual.message().get(0).getData().split("\n"))); - List expected_list = new ArrayList(Arrays.asList(gt.split("\n"))); - Assert.assertEquals(expected_list.get(0), actual_list.get(0)); - Assert.assertEquals(new HashSet(expected_list), new HashSet(actual_list)); + assertEqualsNonStrict(gt, actual.message().get(0).getData()); } @Test @@ -413,4 +393,11 @@ public void testListUser() { Assert.assertEquals(Code.SUCCESS, actual.code()); Assert.assertEquals(gt, actual.message().get(0).getData()); } + + private void assertEqualsNonStrict(String gt, String actual) { + List actualList = new ArrayList(Arrays.asList(actual.split("\n"))); + List expectedList = new ArrayList(Arrays.asList(gt.split("\n"))); + Assert.assertEquals(expectedList.get(0), actualList.get(0)); + Assert.assertEquals(new HashSet(expectedList), new HashSet(actualList)); + } }