This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 64f8cbf Refactor container package for IT (#9822)
64f8cbf is described below
commit 64f8cbfe036e0b5bd76b5d7aeef3131ecac05432
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Mar 25 20:37:08 2021 +0800
Refactor container package for IT (#9822)
* Refactor container package for IT
* Remove useless log
---
.../junit/annotation/ShardingSphereITStorageType.java | 6 +++---
.../test/integration/junit/compose/ContainerCompose.java | 12 ++++++------
.../{ => adapter}/ShardingSphereAdapterContainer.java | 5 ++---
.../{ => adapter/impl}/ShardingSphereJDBCContainer.java | 5 ++++-
.../{ => adapter/impl}/ShardingSphereProxyContainer.java | 3 ++-
.../{ => storage}/ShardingSphereStorageContainer.java | 3 ++-
.../junit/container/{ => storage/impl}/H2Container.java | 3 ++-
.../junit/container/{ => storage/impl}/MySQLContainer.java | 3 ++-
.../container/{ => storage/impl}/NativeStorageContainer.java | 4 +++-
.../container/{ => storage/impl}/PostgreSQLContainer.java | 3 ++-
.../test/integration/engine/it/BaseITCase.java | 4 ++--
11 files changed, 30 insertions(+), 21 deletions(-)
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/annotation/ShardingSphereITStorageType.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/annotation/ShardingSphereITStorageType.java
index 4aefd2e..cc8ce54 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/annotation/ShardingSphereITStorageType.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/annotation/ShardingSphereITStorageType.java
@@ -18,9 +18,9 @@
package org.apache.shardingsphere.test.integration.junit.annotation;
import lombok.Getter;
-import org.apache.shardingsphere.test.integration.junit.container.H2Container;
-import
org.apache.shardingsphere.test.integration.junit.container.MySQLContainer;
-import
org.apache.shardingsphere.test.integration.junit.container.ShardingSphereStorageContainer;
+import
org.apache.shardingsphere.test.integration.junit.container.storage.impl.H2Container;
+import
org.apache.shardingsphere.test.integration.junit.container.storage.impl.MySQLContainer;
+import
org.apache.shardingsphere.test.integration.junit.container.storage.ShardingSphereStorageContainer;
/**
* ShardingSphere IT storage type.
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/compose/ContainerCompose.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/compose/ContainerCompose.java
index f690f0b..89e6ecb 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/compose/ContainerCompose.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/compose/ContainerCompose.java
@@ -26,13 +26,13 @@ import lombok.extern.slf4j.Slf4j;
import
org.apache.shardingsphere.test.integration.junit.annotation.ContainerInitializer;
import org.apache.shardingsphere.test.integration.junit.annotation.OnContainer;
import
org.apache.shardingsphere.test.integration.junit.annotation.ShardingSphereITInject;
-import org.apache.shardingsphere.test.integration.junit.container.H2Container;
-import
org.apache.shardingsphere.test.integration.junit.container.MySQLContainer;
-import
org.apache.shardingsphere.test.integration.junit.container.ShardingSphereAdapterContainer;
+import
org.apache.shardingsphere.test.integration.junit.container.storage.impl.H2Container;
+import
org.apache.shardingsphere.test.integration.junit.container.storage.impl.MySQLContainer;
+import
org.apache.shardingsphere.test.integration.junit.container.adapter.ShardingSphereAdapterContainer;
import
org.apache.shardingsphere.test.integration.junit.container.ShardingSphereContainer;
-import
org.apache.shardingsphere.test.integration.junit.container.ShardingSphereJDBCContainer;
-import
org.apache.shardingsphere.test.integration.junit.container.ShardingSphereProxyContainer;
-import
org.apache.shardingsphere.test.integration.junit.container.ShardingSphereStorageContainer;
+import
org.apache.shardingsphere.test.integration.junit.container.adapter.impl.ShardingSphereJDBCContainer;
+import
org.apache.shardingsphere.test.integration.junit.container.adapter.impl.ShardingSphereProxyContainer;
+import
org.apache.shardingsphere.test.integration.junit.container.storage.ShardingSphereStorageContainer;
import org.apache.shardingsphere.test.integration.junit.logging.ContainerLogs;
import
org.apache.shardingsphere.test.integration.junit.runner.TestCaseBeanContext;
import
org.apache.shardingsphere.test.integration.junit.runner.TestCaseDescription;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/ShardingSphereAdapterContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/adapter/ShardingSphereAdapterContainer.java
similarity index 95%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/ShardingSphereAdapterContainer.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/adapter/ShardingSphereAdapterContainer.java
index bf041e4..230b1b0 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/ShardingSphereAdapterContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/adapter/ShardingSphereAdapterContainer.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.junit.container;
+package org.apache.shardingsphere.test.integration.junit.container.adapter;
import lombok.Getter;
import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.test.integration.junit.annotation.XmlResource;
+import
org.apache.shardingsphere.test.integration.junit.container.ShardingSphereContainer;
import
org.apache.shardingsphere.test.integration.junit.processor.AuthenticationProcessor;
import
org.apache.shardingsphere.test.integration.junit.processor.AuthenticationProcessor.Authentication;
@@ -29,7 +29,6 @@ import javax.sql.DataSource;
/**
* ShardingSphere adapter container.
*/
-@Slf4j
public abstract class ShardingSphereAdapterContainer extends
ShardingSphereContainer {
@Getter
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/ShardingSphereJDBCContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/adapter/impl/ShardingSphereJDBCContainer.java
similarity index 90%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/ShardingSphereJDBCContainer.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/adapter/impl/ShardingSphereJDBCContainer.java
index ee6ec59..3dfce72 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/ShardingSphereJDBCContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/adapter/impl/ShardingSphereJDBCContainer.java
@@ -15,12 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.junit.container;
+package
org.apache.shardingsphere.test.integration.junit.container.adapter.impl;
import lombok.NonNull;
import lombok.extern.slf4j.Slf4j;
import
org.apache.shardingsphere.driver.api.yaml.YamlShardingSphereDataSourceFactory;
import org.apache.shardingsphere.test.integration.env.EnvironmentPath;
+import
org.apache.shardingsphere.test.integration.junit.container.ShardingSphereContainer;
+import
org.apache.shardingsphere.test.integration.junit.container.adapter.ShardingSphereAdapterContainer;
+import
org.apache.shardingsphere.test.integration.junit.container.storage.ShardingSphereStorageContainer;
import org.testcontainers.containers.wait.strategy.WaitStrategy;
import org.testcontainers.lifecycle.Startable;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/ShardingSphereProxyContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/adapter/impl/ShardingSphereProxyContainer.java
similarity index 97%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/ShardingSphereProxyContainer.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/adapter/impl/ShardingSphereProxyContainer.java
index 1674a70..d54bf39 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/ShardingSphereProxyContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/adapter/impl/ShardingSphereProxyContainer.java
@@ -15,11 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.junit.container;
+package
org.apache.shardingsphere.test.integration.junit.container.adapter.impl;
import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource;
import lombok.extern.slf4j.Slf4j;
+import
org.apache.shardingsphere.test.integration.junit.container.adapter.ShardingSphereAdapterContainer;
import org.testcontainers.containers.BindMode;
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
import org.testcontainers.utility.MountableFile;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/ShardingSphereStorageContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/storage/ShardingSphereStorageContainer.java
similarity index 97%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/ShardingSphereStorageContainer.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/storage/ShardingSphereStorageContainer.java
index bbcb639..a630c9b 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/ShardingSphereStorageContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/storage/ShardingSphereStorageContainer.java
@@ -15,13 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.junit.container;
+package org.apache.shardingsphere.test.integration.junit.container.storage;
import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource;
import lombok.Getter;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.test.integration.junit.annotation.XmlResource;
+import
org.apache.shardingsphere.test.integration.junit.container.ShardingSphereContainer;
import
org.apache.shardingsphere.test.integration.junit.processor.DatabaseProcessor;
import org.testcontainers.containers.BindMode;
import org.testcontainers.shaded.com.google.common.collect.ImmutableMap;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/H2Container.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/storage/impl/H2Container.java
similarity index 94%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/H2Container.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/storage/impl/H2Container.java
index 5335b93..247219a 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/H2Container.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/storage/impl/H2Container.java
@@ -15,11 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.junit.container;
+package
org.apache.shardingsphere.test.integration.junit.container.storage.impl;
import lombok.SneakyThrows;
import org.apache.shardingsphere.infra.database.type.dialect.H2DatabaseType;
import
org.apache.shardingsphere.test.integration.env.datasource.builder.ActualDataSourceBuilder;
+import
org.apache.shardingsphere.test.integration.junit.container.storage.ShardingSphereStorageContainer;
import javax.sql.DataSource;
import java.util.Map;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/MySQLContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/storage/impl/MySQLContainer.java
similarity index 94%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/MySQLContainer.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/storage/impl/MySQLContainer.java
index a86799a..8fffaff 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/MySQLContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/storage/impl/MySQLContainer.java
@@ -15,11 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.junit.container;
+package
org.apache.shardingsphere.test.integration.junit.container.storage.impl;
import com.google.common.collect.Lists;
import lombok.SneakyThrows;
import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
+import
org.apache.shardingsphere.test.integration.junit.container.storage.ShardingSphereStorageContainer;
import java.util.Optional;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/NativeStorageContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/storage/impl/NativeStorageContainer.java
similarity index 91%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/NativeStorageContainer.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/storage/impl/NativeStorageContainer.java
index d9490c2..06f803d 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/NativeStorageContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/storage/impl/NativeStorageContainer.java
@@ -15,7 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.junit.container;
+package
org.apache.shardingsphere.test.integration.junit.container.storage.impl;
+
+import
org.apache.shardingsphere.test.integration.junit.container.storage.ShardingSphereStorageContainer;
/**
* Native storage container.
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/PostgreSQLContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/storage/impl/PostgreSQLContainer.java
similarity index 93%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/PostgreSQLContainer.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/storage/impl/PostgreSQLContainer.java
index cf39a37..7251c45 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/PostgreSQLContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/storage/impl/PostgreSQLContainer.java
@@ -15,9 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.junit.container;
+package
org.apache.shardingsphere.test.integration.junit.container.storage.impl;
import
org.apache.shardingsphere.infra.database.type.dialect.PostgreSQLDatabaseType;
+import
org.apache.shardingsphere.test.integration.junit.container.storage.ShardingSphereStorageContainer;
/**
* PostgreSQL container.
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/BaseITCase.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/BaseITCase.java
index df39560..6dad791 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/BaseITCase.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/BaseITCase.java
@@ -31,8 +31,8 @@ import
org.apache.shardingsphere.test.integration.junit.annotation.ContainerInit
import
org.apache.shardingsphere.test.integration.junit.annotation.ContainerType;
import org.apache.shardingsphere.test.integration.junit.annotation.OnContainer;
import
org.apache.shardingsphere.test.integration.junit.annotation.ShardingSphereITInject;
-import
org.apache.shardingsphere.test.integration.junit.container.ShardingSphereAdapterContainer;
-import
org.apache.shardingsphere.test.integration.junit.container.ShardingSphereStorageContainer;
+import
org.apache.shardingsphere.test.integration.junit.container.adapter.ShardingSphereAdapterContainer;
+import
org.apache.shardingsphere.test.integration.junit.container.storage.ShardingSphereStorageContainer;
import
org.apache.shardingsphere.test.integration.junit.runner.ShardingSphereRunner;
import
org.apache.shardingsphere.test.integration.junit.runner.TestCaseDescription;
import org.junit.After;
