[shardingsphere] branch master updated: Add TODO for AbstractDriverTest (#24867)

[yx9o]

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

yx9o 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 d72069e38a3 Add TODO for AbstractDriverTest (#24867)
d72069e38a3 is described below

commit d72069e38a3bc7db954a6b1f076201eeae1cac6e
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Tue Mar 28 00:06:02 2023 +0800

    Add TODO for AbstractDriverTest (#24867)
    
    * Add TODO for AbstractDriverTest
    
    * Refactor AbstractHBaseQueryResultSetTest
---
 .../hbase/result/query/AbstractHBaseQueryResultSetTest.java |  2 +-
 .../shardingsphere/test/e2e/driver/AbstractDriverTest.java  | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git 
a/proxy/backend/type/hbase/src/test/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/AbstractHBaseQueryResultSetTest.java
 
b/proxy/backend/type/hbase/src/test/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/AbstractHBaseQueryResultSetTest.java
index 02f04b6fbd3..42a4271e919 100644
--- 
a/proxy/backend/type/hbase/src/test/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/AbstractHBaseQueryResultSetTest.java
+++ 
b/proxy/backend/type/hbase/src/test/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/AbstractHBaseQueryResultSetTest.java
@@ -49,7 +49,7 @@ import static org.mockito.Mockito.when;
 @ExtendWith(MockitoExtension.class)
 @MockitoSettings(strictness = Strictness.LENIENT)
 @Getter
-public abstract class AbstractHBaseQueryResultSetTest {
+abstract class AbstractHBaseQueryResultSetTest {
     
     @Mock
     private Admin admin;
diff --git 
a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/AbstractDriverTest.java
 
b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/AbstractDriverTest.java
index 9ae8cddf2fe..e470a73d1cc 100644
--- 
a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/AbstractDriverTest.java
+++ 
b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/AbstractDriverTest.java
@@ -31,24 +31,21 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
+// TODO merge in to sql-e2e
 public abstract class AbstractDriverTest {
     
     private static final List<String> ACTUAL_DATA_SOURCE_NAMES = 
Arrays.asList("jdbc_0", "jdbc_1", "single_jdbc", "shadow_jdbc_0", 
"shadow_jdbc_1", "encrypt", "test_primary_ds", "test_replica_ds");
     
-    private static final Map<String, DataSource> ACTUAL_DATA_SOURCES = new 
HashMap<>();
+    private static final Map<String, DataSource> ACTUAL_DATA_SOURCES = new 
HashMap<>(ACTUAL_DATA_SOURCE_NAMES.size(), 1);
     
     @BeforeAll
-    public static synchronized void initializeDataSource() throws SQLException 
{
+    static synchronized void initializeDataSource() throws SQLException {
         for (String each : ACTUAL_DATA_SOURCE_NAMES) {
-            createDataSources(each);
+            ACTUAL_DATA_SOURCES.put(each, buildDataSource(each));
+            initializeSchema(each);
         }
     }
     
-    private static void createDataSources(final String dataSourceName) throws 
SQLException {
-        ACTUAL_DATA_SOURCES.put(dataSourceName, 
buildDataSource(dataSourceName));
-        initializeSchema(dataSourceName);
-    }
-    
     private static void initializeSchema(final String dataSourceName) throws 
SQLException {
         try (Connection connection = 
ACTUAL_DATA_SOURCES.get(dataSourceName).getConnection()) {
             if ("encrypt".equals(dataSourceName)) {