This is an automated email from the ASF dual-hosted git repository.
tyrantlucifer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new 56f3cdb27 [Improve][e2e][JDBC] Add localPort for AbstractJdbcIT (#3596)
56f3cdb27 is described below
commit 56f3cdb276dd3417dffc177ce5c673d0d20c1dad
Author: TaoZex <[email protected]>
AuthorDate: Wed Nov 30 11:03:05 2022 +0800
[Improve][e2e][JDBC] Add localPort for AbstractJdbcIT (#3596)
---
.../apache/seatunnel/connectors/seatunnel/jdbc/AbstractJdbcIT.java | 4 ++--
.../java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcCase.java | 1 +
.../apache/seatunnel/connectors/seatunnel/jdbc/JdbcGbse8adbIT.java | 2 +-
.../apache/seatunnel/connectors/seatunnel/jdbc/JdbcOracledbIT.java | 2 +-
.../apache/seatunnel/connectors/seatunnel/jdbc/JdbcStarRocksdbIT.java | 2 +-
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/AbstractJdbcIT.java
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/AbstractJdbcIT.java
index 724d013f9..99ec3b58e 100644
---
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/AbstractJdbcIT.java
+++
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/AbstractJdbcIT.java
@@ -85,7 +85,7 @@ public abstract class AbstractJdbcIT extends TestSuiteBase
implements TestResour
.withEnv(jdbcCase.getContainerEnv())
.withLogConsumer(new Slf4jLogConsumer(log));
dbServer.setPortBindings(Lists.newArrayList(
- String.format("%s:%s", jdbcCase.getPort(), jdbcCase.getPort())));
+ String.format("%s:%s", jdbcCase.getLocalPort(),
jdbcCase.getPort())));
Startables.deepStart(Stream.of(dbServer)).join();
given().ignoreExceptions()
@@ -108,7 +108,7 @@ public abstract class AbstractJdbcIT extends TestSuiteBase
implements TestResour
}
private void batchInsertData() {
- try (Connection connection =
initializeJdbcConnection(String.format(jdbcCase.getJdbcTemplate(),
jdbcCase.getPort(), jdbcCase.getDataBase()))) {
+ try (Connection connection =
initializeJdbcConnection(String.format(jdbcCase.getJdbcTemplate(),
jdbcCase.getLocalPort(), jdbcCase.getDataBase()))) {
connection.setAutoCommit(false);
try (PreparedStatement preparedStatement =
connection.prepareStatement(jdbcCase.getInitDataSql())) {
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcCase.java
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcCase.java
index d4659a9b3..e7c7b5cad 100644
---
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcCase.java
+++
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcCase.java
@@ -34,6 +34,7 @@ public class JdbcCase {
private String userName;
private String password;
private int port;
+ private int localPort;
private String dataBase;
private String sourceTable;
private String sinkTable;
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcGbse8adbIT.java
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcGbse8adbIT.java
index 00efd4f1b..7240e23cb 100644
---
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcGbse8adbIT.java
+++
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcGbse8adbIT.java
@@ -81,7 +81,7 @@ public class JdbcGbse8adbIT extends AbstractJdbcIT {
Map<String, String> containerEnv = new HashMap<>();
String jdbcUrl = String.format(URL, PORT, DATABASE);
return
JdbcCase.builder().dockerImage(DOCKER_IMAGE).networkAliases(NETWORK_ALIASES).containerEnv(containerEnv).driverClass(DRIVER_CLASS)
-
.host(HOST).port(PORT).jdbcTemplate(URL).jdbcUrl(jdbcUrl).userName(USERNAME).password(PASSWORD).dataBase(DATABASE)
+
.host(HOST).port(PORT).localPort(PORT).jdbcTemplate(URL).jdbcUrl(jdbcUrl).userName(USERNAME).password(PASSWORD).dataBase(DATABASE)
.sourceTable(SOURCE_TABLE).driverJar(DRIVER_JAR)
.ddlSource(DDL_SOURCE).initDataSql(INIT_DATA_SQL).configFile(CONFIG_FILE).seaTunnelRow(initTestData()).build();
}
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcOracledbIT.java
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcOracledbIT.java
index 036415f69..32d9b039d 100644
---
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcOracledbIT.java
+++
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcOracledbIT.java
@@ -110,7 +110,7 @@ public class JdbcOracledbIT extends AbstractJdbcIT {
containerEnv.put("APP_USER_PASSWORD", PASSWORD);
String jdbcUrl = String.format(URL, PORT, DATABASE);
return
JdbcCase.builder().dockerImage(DOCKER_IMAGE).networkAliases(NETWORK_ALIASES).containerEnv(containerEnv).driverClass(DRIVER_CLASS)
-
.host(HOST).port(PORT).jdbcTemplate(URL).jdbcUrl(jdbcUrl).userName(USERNAME).password(PASSWORD).dataBase(DATABASE)
+
.host(HOST).port(PORT).localPort(PORT).jdbcTemplate(URL).jdbcUrl(jdbcUrl).userName(USERNAME).password(PASSWORD).dataBase(DATABASE)
.sourceTable(SOURCE_TABLE).sinkTable(SINK_TABLE).driverJar(DRIVER_JAR)
.ddlSource(DDL_SOURCE).ddlSink(DDL_SINK).initDataSql(INIT_DATA_SQL).configFile(CONFIG_FILE).seaTunnelRow(initTestData()).build();
}
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcStarRocksdbIT.java
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcStarRocksdbIT.java
index aec72d6ce..8b4ca7815 100644
---
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcStarRocksdbIT.java
+++
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcStarRocksdbIT.java
@@ -118,7 +118,7 @@ public class JdbcStarRocksdbIT extends AbstractJdbcIT {
Map<String, String> containerEnv = new HashMap<>();
String jdbcUrl = String.format(URL, SR_PORT);
return
JdbcCase.builder().dockerImage(DOCKER_IMAGE).networkAliases(NETWORK_ALIASES).containerEnv(containerEnv).driverClass(DRIVER_CLASS)
-
.host(HOST).jdbcTemplate(URL).dataBase(DATABASE).port(SR_PORT).jdbcUrl(jdbcUrl).userName(USERNAME).password(PASSWORD).dataBase(DATABASE)
+
.host(HOST).jdbcTemplate(URL).dataBase(DATABASE).port(SR_PORT).localPort(SR_PORT).jdbcUrl(jdbcUrl).userName(USERNAME).password(PASSWORD).dataBase(DATABASE)
.sourceTable(SOURCE_TABLE).sinkTable(SINK_TABLE).driverJar(SR_DRIVER_JAR)
.ddlSource(DDL_SOURCE).ddlSink(DDL_SINK).initDataSql(INIT_DATA_SQL).configFile(CONFIG_FILE).seaTunnelRow(initTestData()).build();
}
