[shardingsphere] branch master updated: Fix windows and mac IT test error when missing docker env (#15383)

[panjuan]

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

panjuan 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 77f928a  Fix windows and mac IT test error when missing docker env 
(#15383)
77f928a is described below

commit 77f928ac6bf1f5d86e25c1f902f705d644802ed0
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sat Feb 12 20:57:53 2022 +0800

    Fix windows and mac IT test error when missing docker env (#15383)
---
 .../test/integration/framework/container/atomic/AtomicContainer.java    | 2 +-
 .../framework/container/atomic/storage/StorageContainer.java            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/AtomicContainer.java
 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/AtomicContainer.java
index 578f9bf..8ca40ce 100644
--- 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/AtomicContainer.java
+++ 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/AtomicContainer.java
@@ -33,9 +33,9 @@ import java.util.stream.Collectors;
  * Atomic container.
  */
 @Slf4j
+@Getter
 public abstract class AtomicContainer extends 
GenericContainer<AtomicContainer> {
     
-    @Getter
     private final String name;
     
     private final boolean isFakedContainer;
diff --git 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/storage/StorageContainer.java
 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/storage/StorageContainer.java
index 4fb8230..a7c683f 100644
--- 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/storage/StorageContainer.java
+++ 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/storage/StorageContainer.java
@@ -81,7 +81,7 @@ public abstract class StorageContainer extends 
AtomicContainer {
     private DataSource createDataSource(final String dataSourceName) {
         HikariConfig config = new HikariConfig();
         
config.setDriverClassName(DataSourceEnvironment.getDriverClassName(databaseType));
-        config.setJdbcUrl(DataSourceEnvironment.getURL(databaseType, 
getHost(), getPort(), dataSourceName));
+        config.setJdbcUrl(DataSourceEnvironment.getURL(databaseType, 
isFakedContainer() ? null : getHost(), getPort(), dataSourceName));
         config.setUsername(getUsername());
         config.setPassword(getPassword());
         config.setMaximumPoolSize(4);