[iotdb] branch master updated: [IOTDB-4821]Move settleIT (#7853)

[xi...@apache.org]

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

xingtanzjr 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 9663127db1 [IOTDB-4821]Move settleIT (#7853)
9663127db1 is described below

commit 9663127db1593a4a92307c07bbac0234f0a75c5d
Author: 周沛辰 <45...@users.noreply.github.com>
AuthorDate: Thu Nov 3 14:30:35 2022 +0800

    [IOTDB-4821]Move settleIT (#7853)
---
 .../org/apache/iotdb/db/it}/IoTDBSettleIT.java     | 25 ++++++++++++----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBSettleIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSettleIT.java
similarity index 81%
rename from integration/src/test/java/org/apache/iotdb/db/integration/IoTDBSettleIT.java
rename to integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSettleIT.java
index 3dbe962aeb..a408e01ac9 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBSettleIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSettleIT.java
@@ -16,27 +16,32 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.iotdb.db.integration;
+package org.apache.iotdb.db.it;
 
-import org.apache.iotdb.db.utils.EnvironmentUtils;
-import org.apache.iotdb.itbase.category.LocalStandaloneTest;
-import org.apache.iotdb.jdbc.Config;
+import org.apache.iotdb.it.env.EnvFactory;
+import org.apache.iotdb.it.framework.IoTDBTestRunner;
+import org.apache.iotdb.itbase.category.ClusterIT;
+import org.apache.iotdb.itbase.category.LocalStandaloneIT;
 
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
 
 import java.sql.Connection;
-import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
-@Category({LocalStandaloneTest.class})
+// Todo: settle does not support mpp currently.
+@Ignore
+@RunWith(IoTDBTestRunner.class)
+@Category({LocalStandaloneIT.class, ClusterIT.class})
 public class IoTDBSettleIT {
   private static List<String> sqls = new ArrayList<>();
   private static Connection connection;
@@ -44,14 +49,14 @@ public class IoTDBSettleIT {
   @BeforeClass
   public static void setUp() throws Exception {
     initCreateSQLStatement();
-    EnvironmentUtils.envSetUp();
+    EnvFactory.getEnv().initBeforeTest();
     executeSql();
   }
 
   @AfterClass
   public static void tearDown() throws Exception {
     close();
-    EnvironmentUtils.cleanEnv();
+    EnvFactory.getEnv().initBeforeTest();
   }
 
   @Test
@@ -84,9 +89,7 @@ public class IoTDBSettleIT {
   }
 
   private static void executeSql() throws ClassNotFoundException, SQLException {
-    Class.forName(Config.JDBC_DRIVER_NAME);
-    connection =
-        DriverManager.getConnection(Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
+    connection = EnvFactory.getEnv().getConnection();
     try (Statement statement = connection.createStatement()) {
       for (String sql : sqls) {
         statement.execute(sql);