This is an automated email from the ASF dual-hosted git repository.
zhouyao2023 pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new f14617f09a [Improve][Test] Reduce repeated catalog test times (#6207)
f14617f09a is described below
commit f14617f09a320377d3394b9a78ed3c4028843075
Author: Jia Fan <[email protected]>
AuthorDate: Mon Jan 15 21:10:41 2024 +0800
[Improve][Test] Reduce repeated catalog test times (#6207)
---
.../seatunnel/e2e/connector/elasticsearch/ElasticsearchIT.java | 5 +++--
.../seatunnel/connectors/seatunnel/jdbc/JdbcPostgresIT.java | 5 ++---
.../seatunnel/connectors/seatunnel/jdbc/JdbcSqlServerIT.java | 7 +++----
.../connectors/seatunnel/jdbc/JdbcMySqlCreateTableIT.java | 9 +++------
.../connectors/seatunnel/jdbc/JdbcSqlServerCreateTableIT.java | 9 +++------
.../connectors/seatunnel/jdbc/JdbcOracleLowercaseTableIT.java | 8 +++-----
.../connectors/seatunnel/jdbc/JdbcMySqlSaveModeCatalogIT.java | 8 +++-----
.../apache/seatunnel/e2e/connector/starrocks/StarRocksIT.java | 5 +++--
8 files changed, 23 insertions(+), 33 deletions(-)
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-elasticsearch-e2e/src/test/java/org/apache/seatunnel/e2e/connector/elasticsearch/ElasticsearchIT.java
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-elasticsearch-e2e/src/test/java/org/apache/seatunnel/e2e/connector/elasticsearch/ElasticsearchIT.java
index 98778b01c4..dd810c8225 100644
---
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-elasticsearch-e2e/src/test/java/org/apache/seatunnel/e2e/connector/elasticsearch/ElasticsearchIT.java
+++
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-elasticsearch-e2e/src/test/java/org/apache/seatunnel/e2e/connector/elasticsearch/ElasticsearchIT.java
@@ -34,6 +34,7 @@ import
org.apache.seatunnel.e2e.common.container.TestContainer;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestTemplate;
import org.testcontainers.containers.Container;
import org.testcontainers.containers.output.Slf4jLogConsumer;
@@ -260,8 +261,8 @@ public class ElasticsearchIT extends TestSuiteBase
implements TestResource {
container.close();
}
- @TestTemplate
- public void testCatalog(TestContainer container2) throws IOException,
InterruptedException {
+ @Test
+ public void testCatalog() {
Map<String, Object> configMap = new HashMap<>();
configMap.put("username", "elastic");
configMap.put("password", "elasticsearch");
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-3/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcPostgresIT.java
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-3/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcPostgresIT.java
index 4826b9ce8a..a47aa09d79 100644
---
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-3/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcPostgresIT.java
+++
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-3/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcPostgresIT.java
@@ -444,9 +444,8 @@ public class JdbcPostgresIT extends TestSuiteBase
implements TestResource {
}
}
- @TestTemplate
- public void testCatalogForSaveMode(TestContainer container)
- throws IOException, InterruptedException {
+ @Test
+ public void testCatalogForSaveMode() {
String schema = "public";
String databaseName = POSTGRESQL_CONTAINER.getDatabaseName();
TablePath tablePathPG = TablePath.of(databaseName, "public",
"pg_e2e_source_table");
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-3/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcSqlServerIT.java
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-3/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcSqlServerIT.java
index d871bab6ea..93bcda6acd 100644
---
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-3/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcSqlServerIT.java
+++
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-3/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcSqlServerIT.java
@@ -24,12 +24,11 @@ import
org.apache.seatunnel.common.exception.SeaTunnelRuntimeException;
import
org.apache.seatunnel.connectors.seatunnel.jdbc.catalog.sqlserver.SqlServerCatalog;
import
org.apache.seatunnel.connectors.seatunnel.jdbc.catalog.sqlserver.SqlServerURLParser;
import org.apache.seatunnel.e2e.common.TestSuiteBase;
-import org.apache.seatunnel.e2e.common.container.TestContainer;
import org.apache.commons.lang3.tuple.Pair;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
+import org.junit.jupiter.api.Test;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.MSSQLServerContainer;
import org.testcontainers.containers.output.Slf4jLogConsumer;
@@ -294,8 +293,8 @@ public class JdbcSqlServerIT extends AbstractJdbcIT {
catalog.open();
}
- @TestTemplate
- public void testCatalog(TestContainer container) throws IOException,
InterruptedException {
+ @Test
+ public void testCatalog() {
TablePath tablePathSqlserver = TablePath.of("master", "dbo", "source");
TablePath tablePathSqlserver_Sink = TablePath.of("master", "dbo",
"sink_lw");
SqlServerCatalog sqlServerCatalog = (SqlServerCatalog) catalog;
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-4/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMySqlCreateTableIT.java
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-4/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMySqlCreateTableIT.java
index e5ca784d2e..41dbadb277 100644
---
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-4/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMySqlCreateTableIT.java
+++
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-4/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMySqlCreateTableIT.java
@@ -29,13 +29,12 @@ import org.apache.seatunnel.e2e.common.TestResource;
import org.apache.seatunnel.e2e.common.TestSuiteBase;
import org.apache.seatunnel.e2e.common.container.ContainerExtendedFactory;
import org.apache.seatunnel.e2e.common.container.EngineType;
-import org.apache.seatunnel.e2e.common.container.TestContainer;
import org.apache.seatunnel.e2e.common.junit.DisabledOnContainer;
import org.apache.seatunnel.e2e.common.junit.TestContainerExtension;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.TestTemplate;
+import org.junit.jupiter.api.Test;
import org.testcontainers.containers.Container;
import org.testcontainers.containers.MSSQLServerContainer;
import org.testcontainers.containers.MySQLContainer;
@@ -49,7 +48,6 @@ import org.testcontainers.utility.DockerLoggerFactory;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
-import java.io.IOException;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.ResultSet;
@@ -262,9 +260,8 @@ public class JdbcMySqlCreateTableIT extends TestSuiteBase
implements TestResourc
JdbcUrlUtil.getUrlInfo("jdbc:mysql://localhost:33061/auto?useSSL=false");
static JdbcUrlUtil.UrlInfo pg =
JdbcUrlUtil.getUrlInfo("jdbc:postgresql://localhost:54323/pg");
- @TestTemplate
- public void testAutoCreateTable(TestContainer container)
- throws IOException, InterruptedException {
+ @Test
+ public void testAutoCreateTable() {
TablePath tablePathMySql = TablePath.of("auto", "mysql_auto_create");
TablePath tablePathMySql_Mysql = TablePath.of("auto",
"mysql_auto_create_mysql");
TablePath tablePathSQL = TablePath.of("testauto", "dbo",
"mysql_auto_create_sql");
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-4/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcSqlServerCreateTableIT.java
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-4/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcSqlServerCreateTableIT.java
index 5f051e6444..c0281a9dc5 100644
---
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-4/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcSqlServerCreateTableIT.java
+++
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-4/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcSqlServerCreateTableIT.java
@@ -29,13 +29,12 @@ import org.apache.seatunnel.e2e.common.TestResource;
import org.apache.seatunnel.e2e.common.TestSuiteBase;
import org.apache.seatunnel.e2e.common.container.ContainerExtendedFactory;
import org.apache.seatunnel.e2e.common.container.EngineType;
-import org.apache.seatunnel.e2e.common.container.TestContainer;
import org.apache.seatunnel.e2e.common.junit.DisabledOnContainer;
import org.apache.seatunnel.e2e.common.junit.TestContainerExtension;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.TestTemplate;
+import org.junit.jupiter.api.Test;
import org.testcontainers.containers.Container;
import org.testcontainers.containers.MSSQLServerContainer;
import org.testcontainers.containers.MySQLContainer;
@@ -49,7 +48,6 @@ import org.testcontainers.utility.DockerLoggerFactory;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
-import java.io.IOException;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.ResultSet;
@@ -273,9 +271,8 @@ public class JdbcSqlServerCreateTableIT extends
TestSuiteBase implements TestRes
initializeJdbcTable();
}
- @TestTemplate
- public void testAutoCreateTable(TestContainer container)
- throws IOException, InterruptedException {
+ @Test
+ public void testAutoCreateTable() {
TablePath tablePathSQL = TablePath.of("testauto", "dbo",
"sqlserver_auto_create");
TablePath tablePathSQL_Sql = TablePath.of("testauto", "dbo",
"sqlserver_auto_create_sql");
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-6/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcOracleLowercaseTableIT.java
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-6/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcOracleLowercaseTableIT.java
index 85fb9bfe82..f4f3010b39 100644
---
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-6/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcOracleLowercaseTableIT.java
+++
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-6/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcOracleLowercaseTableIT.java
@@ -22,12 +22,11 @@ import org.apache.seatunnel.api.table.catalog.TablePath;
import org.apache.seatunnel.api.table.type.SeaTunnelRow;
import
org.apache.seatunnel.connectors.seatunnel.jdbc.catalog.oracle.OracleCatalog;
import
org.apache.seatunnel.connectors.seatunnel.jdbc.catalog.oracle.OracleURLParser;
-import org.apache.seatunnel.e2e.common.container.TestContainer;
import org.apache.commons.lang3.tuple.Pair;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
+import org.junit.jupiter.api.Test;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.OracleContainer;
import org.testcontainers.containers.output.Slf4jLogConsumer;
@@ -37,7 +36,6 @@ import org.testcontainers.utility.MountableFile;
import com.google.common.collect.Lists;
-import java.io.IOException;
import java.math.BigDecimal;
import java.sql.Date;
import java.sql.Timestamp;
@@ -220,8 +218,8 @@ public class JdbcOracleLowercaseTableIT extends
AbstractJdbcIT {
catalog.open();
}
- @TestTemplate
- public void testCatalog(TestContainer container) throws IOException,
InterruptedException {
+ @Test
+ public void testCatalog() {
TablePath tablePathOracle = TablePath.of("XE", "TESTUSER",
"E2E_TABLE_SOURCE_LOWER");
OracleCatalog oracleCatalog =
new OracleCatalog(
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-7/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMySqlSaveModeCatalogIT.java
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-7/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMySqlSaveModeCatalogIT.java
index 6ef609184d..468ea442b7 100644
---
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-7/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMySqlSaveModeCatalogIT.java
+++
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-7/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMySqlSaveModeCatalogIT.java
@@ -24,12 +24,11 @@ import
org.apache.seatunnel.connectors.seatunnel.jdbc.catalog.mysql.MySqlCatalog
import org.apache.seatunnel.e2e.common.TestResource;
import org.apache.seatunnel.e2e.common.TestSuiteBase;
import org.apache.seatunnel.e2e.common.container.ContainerExtendedFactory;
-import org.apache.seatunnel.e2e.common.container.TestContainer;
import org.apache.seatunnel.e2e.common.junit.TestContainerExtension;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.TestTemplate;
+import org.junit.jupiter.api.Test;
import org.testcontainers.containers.Container;
import org.testcontainers.containers.MySQLContainer;
import org.testcontainers.containers.output.Slf4jLogConsumer;
@@ -41,7 +40,6 @@ import org.testcontainers.utility.DockerLoggerFactory;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
-import java.io.IOException;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
@@ -152,8 +150,8 @@ public class JdbcMySqlSaveModeCatalogIT extends
TestSuiteBase implements TestRes
static JdbcUrlUtil.UrlInfo MysqlUrlInfo =
JdbcUrlUtil.getUrlInfo("jdbc:mysql://localhost:3308/auto?useSSL=false");
- @TestTemplate
- public void testCatalog(TestContainer container) throws IOException,
InterruptedException {
+ @Test
+ public void testCatalog() {
TablePath tablePathMySql = TablePath.of("auto", "mysql_auto_create");
TablePath tablePathMySql_Sink = TablePath.of("auto",
"mysql_auto_create_sink");
MySqlCatalog mySqlCatalog = new MySqlCatalog("mysql", "root",
MYSQL_PASSWORD, MysqlUrlInfo);
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-starrocks-e2e/src/test/java/org/apache/seatunnel/e2e/connector/starrocks/StarRocksIT.java
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-starrocks-e2e/src/test/java/org/apache/seatunnel/e2e/connector/starrocks/StarRocksIT.java
index 1bd694b102..ff8a934cb4 100644
---
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-starrocks-e2e/src/test/java/org/apache/seatunnel/e2e/connector/starrocks/StarRocksIT.java
+++
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-starrocks-e2e/src/test/java/org/apache/seatunnel/e2e/connector/starrocks/StarRocksIT.java
@@ -31,6 +31,7 @@ import
org.apache.seatunnel.e2e.common.junit.TestContainerExtension;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestTemplate;
import org.testcontainers.containers.Container;
import org.testcontainers.containers.GenericContainer;
@@ -318,8 +319,8 @@ public class StarRocksIT extends TestSuiteBase implements
TestResource {
}
}
- @TestTemplate
- public void testCatalog(TestContainer container) throws IOException,
InterruptedException {
+ @Test
+ public void testCatalog() {
TablePath tablePathStarRocksSource = TablePath.of("test",
"e2e_table_source");
TablePath tablePathStarRocksSink = TablePath.of("test",
"e2e_table_source_2");
StarRocksCatalog starRocksCatalog =
