[iotdb] branch master updated: Pipe IT: Stablelized pipe IT by prohibiting exceptions from assertEqual function (#10881)

[rong]

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

rong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 0a90c45486d Pipe IT: Stablelized pipe IT by prohibiting exceptions 
from assertEqual function (#10881)
0a90c45486d is described below

commit 0a90c45486de25b87b6beaab14a26a7484b0d5d6
Author: Caideyipi <87789683+caidey...@users.noreply.github.com>
AuthorDate: Thu Aug 17 12:15:30 2023 +0800

    Pipe IT: Stablelized pipe IT by prohibiting exceptions from assertEqual 
function (#10881)
---
 .../org/apache/iotdb/db/it/utils/TestUtils.java    | 102 +++++++++------------
 .../apache/iotdb/pipe/it/IoTDBPipeDataSyncIT.java  |   4 +-
 2 files changed, 45 insertions(+), 61 deletions(-)

diff --git 
a/integration-test/src/test/java/org/apache/iotdb/db/it/utils/TestUtils.java 
b/integration-test/src/test/java/org/apache/iotdb/db/it/utils/TestUtils.java
index c4d724452dc..0aaf98bab0e 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/utils/TestUtils.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/utils/TestUtils.java
@@ -37,7 +37,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 
 import static org.apache.iotdb.itbase.constant.TestConstant.DELTA;
@@ -226,80 +225,65 @@ public class TestUtils {
   }
 
   public static void assertResultSetEqual(
-      ResultSet actualResultSet, String expectedHeader, String[] 
expectedRetArray)
-      throws SQLException {
+      ResultSet actualResultSet, String expectedHeader, String[] 
expectedRetArray) {
     assertResultSetEqual(actualResultSet, expectedHeader, expectedRetArray, 
null);
   }
 
   public static void assertResultSetEqual(
-      ResultSet actualResultSet, String expectedHeader, Set<String> 
expectedRetSet)
-      throws SQLException {
-    ResultSetMetaData resultSetMetaData = actualResultSet.getMetaData();
-    StringBuilder header = new StringBuilder();
-    for (int i = 1; i <= resultSetMetaData.getColumnCount(); i++) {
-      header.append(resultSetMetaData.getColumnName(i)).append(",");
-    }
-    assertEquals(expectedHeader, header.toString());
-
-    Set<String> actualRetSet = new HashSet<>();
-    while (actualResultSet.next()) {
-      StringBuilder builder = new StringBuilder();
+      ResultSet actualResultSet, String expectedHeader, Set<String> 
expectedRetSet) {
+    try {
+      ResultSetMetaData resultSetMetaData = actualResultSet.getMetaData();
+      StringBuilder header = new StringBuilder();
       for (int i = 1; i <= resultSetMetaData.getColumnCount(); i++) {
-        builder.append(actualResultSet.getString(i)).append(",");
+        header.append(resultSetMetaData.getColumnName(i)).append(",");
       }
-      actualRetSet.add(builder.toString());
-    }
-    assertEquals(expectedRetSet, actualRetSet);
-  }
+      assertEquals(expectedHeader, header.toString());
 
-  public static boolean isResultSetEqual(
-      ResultSet actualResultSet, String expectedHeader, Set<String> 
expectedRetSet)
-      throws SQLException {
-    ResultSetMetaData resultSetMetaData = actualResultSet.getMetaData();
-    StringBuilder header = new StringBuilder();
-    for (int i = 1; i <= resultSetMetaData.getColumnCount(); i++) {
-      header.append(resultSetMetaData.getColumnName(i)).append(",");
-    }
-    if (!Objects.deepEquals(expectedHeader, header.toString())) {
-      return false;
-    }
+      Set<String> actualRetSet = new HashSet<>();
 
-    Set<String> actualRetSet = new HashSet<>();
-    while (actualResultSet.next()) {
-      StringBuilder builder = new StringBuilder();
-      for (int i = 1; i <= resultSetMetaData.getColumnCount(); i++) {
-        builder.append(actualResultSet.getString(i)).append(",");
+      while (actualResultSet.next()) {
+        StringBuilder builder = new StringBuilder();
+        for (int i = 1; i <= resultSetMetaData.getColumnCount(); i++) {
+          builder.append(actualResultSet.getString(i)).append(",");
+        }
+        actualRetSet.add(builder.toString());
       }
-      actualRetSet.add(builder.toString());
+      assertEquals(expectedRetSet, actualRetSet);
+    } catch (Exception e) {
+      e.printStackTrace();
+      Assert.fail(String.valueOf(e));
     }
-    return Objects.deepEquals(expectedRetSet, actualRetSet);
   }
 
   public static void assertResultSetEqual(
-      ResultSet actualResultSet, String expectedHeader, String[] 
expectedRetArray, DateFormat df)
-      throws SQLException {
-    ResultSetMetaData resultSetMetaData = actualResultSet.getMetaData();
-    StringBuilder header = new StringBuilder();
-    for (int i = 1; i <= resultSetMetaData.getColumnCount(); i++) {
-      header.append(resultSetMetaData.getColumnName(i)).append(",");
-    }
-    assertEquals(expectedHeader, header.toString());
-
-    int cnt = 0;
-    while (actualResultSet.next()) {
-      StringBuilder builder = new StringBuilder();
-      if (df != null) {
-        
builder.append(df.format(Long.parseLong(actualResultSet.getString(1)))).append(",");
-      } else {
-        builder.append(actualResultSet.getString(1)).append(",");
+      ResultSet actualResultSet, String expectedHeader, String[] 
expectedRetArray, DateFormat df) {
+    try {
+      ResultSetMetaData resultSetMetaData = actualResultSet.getMetaData();
+      StringBuilder header = new StringBuilder();
+      for (int i = 1; i <= resultSetMetaData.getColumnCount(); i++) {
+        header.append(resultSetMetaData.getColumnName(i)).append(",");
       }
-      for (int i = 2; i <= resultSetMetaData.getColumnCount(); i++) {
-        builder.append(actualResultSet.getString(i)).append(",");
+      assertEquals(expectedHeader, header.toString());
+
+      int cnt = 0;
+      while (actualResultSet.next()) {
+        StringBuilder builder = new StringBuilder();
+        if (df != null) {
+          
builder.append(df.format(Long.parseLong(actualResultSet.getString(1)))).append(",");
+        } else {
+          builder.append(actualResultSet.getString(1)).append(",");
+        }
+        for (int i = 2; i <= resultSetMetaData.getColumnCount(); i++) {
+          builder.append(actualResultSet.getString(i)).append(",");
+        }
+        assertEquals(expectedRetArray[cnt], builder.toString());
+        cnt++;
       }
-      assertEquals(expectedRetArray[cnt], builder.toString());
-      cnt++;
+      assertEquals(expectedRetArray.length, cnt);
+    } catch (Exception e) {
+      e.printStackTrace();
+      Assert.fail(String.valueOf(e));
     }
-    assertEquals(expectedRetArray.length, cnt);
   }
 
   public static void executeNonQuery(String sql) {
diff --git 
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/IoTDBPipeDataSyncIT.java
 
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/IoTDBPipeDataSyncIT.java
index 95e95756103..0e48b93e614 100644
--- 
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/IoTDBPipeDataSyncIT.java
+++ 
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/IoTDBPipeDataSyncIT.java
@@ -116,9 +116,9 @@ public class IoTDBPipeDataSyncIT {
           Statement statement = connection.createStatement()) {
         await()
             .atMost(600, TimeUnit.SECONDS)
-            .until(
+            .untilAsserted(
                 () ->
-                    TestUtils.isResultSetEqual(
+                    TestUtils.assertResultSetEqual(
                         statement.executeQuery("select * from root.**"),
                         "Time,root.vehicle.d0.s1,",
                         Collections.singleton("0,1.0,")));