This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 63283d590d3 Refactor ShardingSphereDataSourceFactoryTest (#19373)
63283d590d3 is described below
commit 63283d590d3d35a7578e80e1071df07d64a6186e
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Jul 20 10:27:13 2022 +0800
Refactor ShardingSphereDataSourceFactoryTest (#19373)
---
.../api/ShardingSphereDataSourceFactoryTest.java | 78 ++++++++--------------
1 file changed, 29 insertions(+), 49 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 5c75cfea41e..0d8dae9ebd6 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,81 +35,61 @@ 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);
+ assertDataSource(ShardingSphereDataSourceFactory.createDataSource(new
ModeConfiguration("Standalone", null, false)), DefaultDatabase.LOGIC_NAME);
}
-
+
@Test
public void assertCreateDataSourceWithDatabaseNameAndModeConfiguration()
throws SQLException {
- DataSource dataSource =
ShardingSphereDataSourceFactory.createDataSource("test_db", new
ModeConfiguration("Standalone", null, false), new HashMap<>(), null, null);
- assertDataSource(dataSource, "test_db");
+
assertDataSource(ShardingSphereDataSourceFactory.createDataSource("test_db",
new ModeConfiguration("Standalone", null, false), new HashMap<>(), null, null),
"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);
+ public void
assertCreateDataSourceWithAllParametersForMultipleDataSourcesWithDefaultDatabaseName()
throws SQLException {
+ assertDataSource(ShardingSphereDataSourceFactory.createDataSource(
+ new ModeConfiguration("Standalone", null, false), new
HashMap<>(), new LinkedList<>(), new Properties()), 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");
+ assertDataSource(ShardingSphereDataSourceFactory.createDataSource(
+ "test_db", new ModeConfiguration("Standalone", null, false),
new HashMap<>(), new LinkedList<>(), new Properties()), "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);
+ public void
assertCreateDataSourceWithAllParametersForSingleDataSourceWithDefaultDatabaseName()
throws SQLException {
+ assertDataSource(ShardingSphereDataSourceFactory.createDataSource(
+ new ModeConfiguration("Standalone", null, false), new
MockedDataSource(), new LinkedList<>(), new Properties()),
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");
+
assertDataSource(ShardingSphereDataSourceFactory.createDataSource("test_db",
+ new ModeConfiguration("Standalone", null, false), new
MockedDataSource(), new LinkedList<>(), new Properties()), "test_db");
}
-
+
@Test
public void
assertCreateDataSourceWithDefaultModeConfigurationForMultipleDataSources()
throws SQLException {
- DataSource dataSource =
ShardingSphereDataSourceFactory.createDataSource(null);
- assertDataSource(dataSource, DefaultDatabase.LOGIC_NAME);
+
assertDataSource(ShardingSphereDataSourceFactory.createDataSource(null),
DefaultDatabase.LOGIC_NAME);
}
-
+
@Test
- public void
assertCreateDataSourceWithDatabaseNameAndDefaultModeConfigurationForMultipleDataSources()
- throws SQLException {
- DataSource dataSource =
ShardingSphereDataSourceFactory.createDataSource("test_db", null);
- assertDataSource(dataSource, "test_db");
+ public void
assertCreateDataSourceWithDatabaseNameAndDefaultModeConfigurationForMultipleDataSources()
throws SQLException {
+
assertDataSource(ShardingSphereDataSourceFactory.createDataSource("test_db",
null), "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);
+
assertDataSource(ShardingSphereDataSourceFactory.createDataSource((ModeConfiguration)
null, new MockedDataSource(), new LinkedList<>(), new Properties()),
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");
+ public void
assertCreateDataSourceWithDatabaseNameAndDefaultModeConfigurationForSingleDataSource()
throws SQLException {
+
assertDataSource(ShardingSphereDataSourceFactory.createDataSource("test_db",
null, new MockedDataSource(), new LinkedList<>(), new Properties()), "test_db");
}
-
+
@SneakyThrows(ReflectiveOperationException.class)
private void assertDataSource(final DataSource actualDataSource, final
String expectedDataSourceName) {
Field field =
ShardingSphereDataSource.class.getDeclaredField("databaseName");
