[shardingsphere] branch master updated: fix 19252 (#19358)

[zhangliang]

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

zhangliang 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 db2eb24731a fix 19252 (#19358)
db2eb24731a is described below

commit db2eb24731a40818ca27d84af670dba08f3e1d24
Author: Da Xiang Huang <localhos...@foxmail.com>
AuthorDate: Wed Jul 20 10:14:27 2022 +0800

    fix 19252 (#19358)
---
 .../api/ShardingSphereDataSourceFactoryTest.java   | 92 +++++++++++++++++-----
 1 file changed, 73 insertions(+), 19 deletions(-)

diff --git 
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/api/ShardingSphereDataSourceFactoryTest.java
 
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/api/ShardingSphereDataSourceFactoryTest.java
index 0f8d181cc85..5c75cfea41e 100644
--- 
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/api/ShardingSphereDataSourceFactoryTest.java
+++ 
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/api/ShardingSphereDataSourceFactoryTest.java
@@ -35,27 +35,81 @@ import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
 public final class ShardingSphereDataSourceFactoryTest {
-    
+
+    @Test
+    public void assertCreateDataSourceWithModeConfiguration() throws 
SQLException {
+        DataSource dataSource = 
ShardingSphereDataSourceFactory.createDataSource(new 
ModeConfiguration("Standalone", null, false));
+        assertDataSource(dataSource, DefaultDatabase.LOGIC_NAME);
+    }
+
     @Test
-    public void assertCreateDataSourceWithDatabaseName() throws SQLException {
-        DataSource testDataSource0 = 
ShardingSphereDataSourceFactory.createDataSource("test_db", null);
-        assertDataSource(testDataSource0, "test_db");
-        DataSource testDataSource1 = 
ShardingSphereDataSourceFactory.createDataSource(new 
ModeConfiguration("Standalone", null, false));
-        assertDataSource(testDataSource1, DefaultDatabase.LOGIC_NAME);
-        DataSource testDataSource2 = 
ShardingSphereDataSourceFactory.createDataSource("", null);
-        assertDataSource(testDataSource2, DefaultDatabase.LOGIC_NAME);
-        DataSource testDataSource3 = 
ShardingSphereDataSourceFactory.createDataSource(new HashMap<>(), new 
LinkedList<>(), new Properties());
-        assertDataSource(testDataSource3, DefaultDatabase.LOGIC_NAME);
-        DataSource testDataSource4 = 
ShardingSphereDataSourceFactory.createDataSource(new MockedDataSource(), new 
LinkedList<>(), new Properties());
-        assertDataSource(testDataSource4, DefaultDatabase.LOGIC_NAME);
-        DataSource testDataSource5 = 
ShardingSphereDataSourceFactory.createDataSource("test_db5", new 
MockedDataSource(), new LinkedList<>(), new Properties());
-        assertDataSource(testDataSource5, "test_db5");
-        DataSource testDataSource6 = 
ShardingSphereDataSourceFactory.createDataSource("test_db6", new HashMap<>(), 
new LinkedList<>(), new Properties());
-        assertDataSource(testDataSource6, "test_db6");
-        DataSource testDataSource7 = 
ShardingSphereDataSourceFactory.createDataSource("test_db7", new 
ModeConfiguration("Standalone", null, false), new HashMap<>(), null, null);
-        assertDataSource(testDataSource7, "test_db7");
+    public void assertCreateDataSourceWithDatabaseNameAndModeConfiguration() 
throws SQLException {
+        DataSource dataSource = 
ShardingSphereDataSourceFactory.createDataSource("test_db", new 
ModeConfiguration("Standalone", null, false), new HashMap<>(), null, null);
+        assertDataSource(dataSource, "test_db");
     }
-    
+
+    @Test
+    public void 
assertCreateDataSourceWithAllParametersForMultipleDataSourcesWithDefaultDatabaseName()
+            throws SQLException {
+        DataSource dataSource =
+                ShardingSphereDataSourceFactory.createDataSource(new 
ModeConfiguration("Standalone", null, false),
+                        new HashMap<>(), new LinkedList<>(), new Properties());
+        assertDataSource(dataSource, DefaultDatabase.LOGIC_NAME);
+    }
+
+    @Test
+    public void 
assertCreateDataSourceWithAllParametersForMultipleDataSources() throws 
SQLException {
+        DataSource dataSource =
+                ShardingSphereDataSourceFactory.createDataSource("test_db", 
new ModeConfiguration("Standalone", null, false),
+                        new HashMap<>(), new LinkedList<>(), new Properties());
+        assertDataSource(dataSource, "test_db");
+    }
+
+    @Test
+    public void 
assertCreateDataSourceWithAllParametersForSingleDataSourceWithDefaultDatabaseName()
+            throws SQLException {
+        DataSource dataSource =
+                ShardingSphereDataSourceFactory.createDataSource(new 
ModeConfiguration("Standalone", null, false),
+                        new MockedDataSource(), new LinkedList<>(), new 
Properties());
+        assertDataSource(dataSource, DefaultDatabase.LOGIC_NAME);
+    }
+
+    @Test
+    public void assertCreateDataSourceWithAllParametersForSingleDataSource() 
throws SQLException {
+        DataSource dataSource =
+                ShardingSphereDataSourceFactory.createDataSource("test_db", 
new ModeConfiguration("Standalone", null, false),
+                        new MockedDataSource(), new LinkedList<>(), new 
Properties());
+        assertDataSource(dataSource, "test_db");
+    }
+
+    @Test
+    public void 
assertCreateDataSourceWithDefaultModeConfigurationForMultipleDataSources() 
throws SQLException {
+        DataSource dataSource = 
ShardingSphereDataSourceFactory.createDataSource(null);
+        assertDataSource(dataSource, DefaultDatabase.LOGIC_NAME);
+    }
+
+    @Test
+    public void 
assertCreateDataSourceWithDatabaseNameAndDefaultModeConfigurationForMultipleDataSources()
+            throws SQLException {
+        DataSource dataSource = 
ShardingSphereDataSourceFactory.createDataSource("test_db", null);
+        assertDataSource(dataSource, "test_db");
+    }
+
+    @Test
+    public void 
assertCreateDataSourceWithDefaultModeConfigurationForSingleDataSource() throws 
SQLException {
+        DataSource dataSource =
+                
ShardingSphereDataSourceFactory.createDataSource((ModeConfiguration) null, new 
MockedDataSource(), new LinkedList<>(), new Properties());
+        assertDataSource(dataSource, DefaultDatabase.LOGIC_NAME);
+    }
+
+    @Test
+    public void 
assertCreateDataSourceWithDatabaseNameAndDefaultModeConfigurationForSingleDataSource()
+            throws SQLException {
+        DataSource dataSource =
+                ShardingSphereDataSourceFactory.createDataSource("test_db", 
null, new MockedDataSource(), new LinkedList<>(), new Properties());
+        assertDataSource(dataSource, "test_db");
+    }
+
     @SneakyThrows(ReflectiveOperationException.class)
     private void assertDataSource(final DataSource actualDataSource, final 
String expectedDataSourceName) {
         Field field = 
ShardingSphereDataSource.class.getDeclaredField("databaseName");