Skip to content

Change assertion to prevent IoTDBInterpreterTest from failing due to indeterminate ordering #5666

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
faaple wants to merge 2 commits into from
Closed

Change assertion to prevent IoTDBInterpreterTest from failing due to indeterminate ordering #5666

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ea07bb
fix
faaple Apr 15, 2022
2ded3dd
add a helper function
faaple Apr 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions zeppelin-interpreter/src/test/java/org/apache/zeppelin/iotdb/IoTDBInterpreterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -324,7 +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());
Assert.assertEquals(gt, actual.message().get(0).getData());
assertEqualsNonStrict(gt, actual.message().get(0).getData());
}

@Test
Expand All @@ -334,7 +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());
Assert.assertEquals(gt, actual.message().get(0).getData());
assertEqualsNonStrict(gt, actual.message().get(0).getData());
}

@Test
Expand All @@ -348,7 +352,7 @@ 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());
assertEqualsNonStrict(gt, actual.message().get(0).getData());
}

@Test
Expand All @@ -358,7 +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());
Assert.assertEquals(gt, actual.message().get(0).getData());
assertEqualsNonStrict(gt, actual.message().get(0).getData());
}

@Test
Expand All @@ -377,7 +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());
Assert.assertEquals(gt, actual.message().get(0).getData());
assertEqualsNonStrict(gt, actual.message().get(0).getData());
}

@Test
Expand All @@ -389,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<String> actualList = new ArrayList<String>(Arrays.asList(actual.split("\n")));
List<String> expectedList = new ArrayList<String>(Arrays.asList(gt.split("\n")));
Assert.assertEquals(expectedList.get(0), actualList.get(0));
Assert.assertEquals(new HashSet<String>(expectedList), new HashSet<String>(actualList));
Copy link
Member

@jixuan1989 jixuan1989 Apr 30, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This modification has a benifit that we can know which line of results are incorrect.
However, IMO, it is sensitive about the order of the resultset table.
So, using Hashset to compare the result is not very good.
We may need to use ArrayList to split the result and compare them line by line.

}
}