This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 0ec15c73823 Refactor ShardingSphereDataSourceFactoryTest (#19253)
0ec15c73823 is described below
commit 0ec15c738232b025024834ecc2f8b5c559f58909
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Jul 15 23:55:07 2022 +0800
Refactor ShardingSphereDataSourceFactoryTest (#19253)
* Refactor YamlShardingSphereDataSourceFactoryTest
* Refactor ShardingSphereDataSourceFactoryTest
* Refactor ShardingSphereDataSourceFactory
* Refactor ShardingSphereDataSourceFactory
---
.../api/ShardingSphereDataSourceFactory.java | 42 +++++++++++-----------
.../api/ShardingSphereDataSourceFactoryTest.java | 35 +++++++-----------
2 files changed, 34 insertions(+), 43 deletions(-)
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/api/ShardingSphereDataSourceFactory.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/api/ShardingSphereDataSourceFactory.java
index a35d414f07a..525b07b2182 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/api/ShardingSphereDataSourceFactory.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/api/ShardingSphereDataSourceFactory.java
@@ -42,30 +42,29 @@ public final class ShardingSphereDataSourceFactory {
/**
* Create ShardingSphere data source.
*
- * @param databaseName database name
* @param modeConfig mode configuration
* @return ShardingSphere data source
* @throws SQLException SQL exception
*/
- public static DataSource createDataSource(final String databaseName, final
ModeConfiguration modeConfig) throws SQLException {
- return new ShardingSphereDataSource(getDatabaseName(databaseName),
modeConfig);
+ public static DataSource createDataSource(final ModeConfiguration
modeConfig) throws SQLException {
+ return createDataSource(DefaultDatabase.LOGIC_NAME, modeConfig);
}
/**
* Create ShardingSphere data source.
*
+ * @param databaseName database name
* @param modeConfig mode configuration
* @return ShardingSphere data source
* @throws SQLException SQL exception
*/
- public static DataSource createDataSource(final ModeConfiguration
modeConfig) throws SQLException {
- return createDataSource(DefaultDatabase.LOGIC_NAME, modeConfig);
+ public static DataSource createDataSource(final String databaseName, final
ModeConfiguration modeConfig) throws SQLException {
+ return new ShardingSphereDataSource(getDatabaseName(databaseName),
modeConfig);
}
/**
* Create ShardingSphere data source.
*
- * @param databaseName database name
* @param modeConfig mode configuration
* @param dataSourceMap data source map
* @param configs rule configurations
@@ -73,14 +72,15 @@ public final class ShardingSphereDataSourceFactory {
* @return ShardingSphere data source
* @throws SQLException SQL exception
*/
- public static DataSource createDataSource(final String databaseName, final
ModeConfiguration modeConfig,
+ public static DataSource createDataSource(final ModeConfiguration
modeConfig,
final Map<String, DataSource>
dataSourceMap, final Collection<RuleConfiguration> configs, final Properties
props) throws SQLException {
- return new ShardingSphereDataSource(getDatabaseName(databaseName),
modeConfig, dataSourceMap, null == configs ? new LinkedList<>() : configs,
props);
+ return createDataSource(DefaultDatabase.LOGIC_NAME, modeConfig,
dataSourceMap, configs, props);
}
/**
* Create ShardingSphere data source.
*
+ * @param databaseName database name
* @param modeConfig mode configuration
* @param dataSourceMap data source map
* @param configs rule configurations
@@ -88,9 +88,9 @@ public final class ShardingSphereDataSourceFactory {
* @return ShardingSphere data source
* @throws SQLException SQL exception
*/
- public static DataSource createDataSource(final ModeConfiguration
modeConfig,
+ public static DataSource createDataSource(final String databaseName, final
ModeConfiguration modeConfig,
final Map<String, DataSource>
dataSourceMap, final Collection<RuleConfiguration> configs, final Properties
props) throws SQLException {
- return createDataSource(DefaultDatabase.LOGIC_NAME, modeConfig,
dataSourceMap, configs, props);
+ return new ShardingSphereDataSource(getDatabaseName(databaseName),
modeConfig, dataSourceMap, null == configs ? new LinkedList<>() : configs,
props);
}
/**
@@ -127,56 +127,56 @@ public final class ShardingSphereDataSourceFactory {
/**
* Create ShardingSphere data source.
*
- * @param databaseName database name
* @param dataSourceMap data source map
* @param configs rule configurations
* @param props properties for data source
* @return ShardingSphere data source
* @throws SQLException SQL exception
*/
- public static DataSource createDataSource(final String databaseName,
- final Map<String, DataSource>
dataSourceMap, final Collection<RuleConfiguration> configs, final Properties
props) throws SQLException {
- return createDataSource(databaseName, null, dataSourceMap, configs,
props);
+ public static DataSource createDataSource(final Map<String, DataSource>
dataSourceMap, final Collection<RuleConfiguration> configs, final Properties
props) throws SQLException {
+ return createDataSource((ModeConfiguration) null, dataSourceMap,
configs, props);
}
/**
* Create ShardingSphere data source.
*
+ * @param databaseName database name
* @param dataSourceMap data source map
* @param configs rule configurations
* @param props properties for data source
* @return ShardingSphere data source
* @throws SQLException SQL exception
*/
- public static DataSource createDataSource(final Map<String, DataSource>
dataSourceMap, final Collection<RuleConfiguration> configs, final Properties
props) throws SQLException {
- return createDataSource((ModeConfiguration) null, dataSourceMap,
configs, props);
+ public static DataSource createDataSource(final String databaseName,
+ final Map<String, DataSource>
dataSourceMap, final Collection<RuleConfiguration> configs, final Properties
props) throws SQLException {
+ return createDataSource(databaseName, null, dataSourceMap, configs,
props);
}
/**
* Create ShardingSphere data source.
*
- * @param databaseName database name
* @param dataSource data source
* @param configs rule configurations
* @param props properties for data source
* @return ShardingSphere data source
* @throws SQLException SQL exception
*/
- public static DataSource createDataSource(final String databaseName, final
DataSource dataSource, final Collection<RuleConfiguration> configs, final
Properties props) throws SQLException {
- return createDataSource(databaseName, null, dataSource, configs,
props);
+ public static DataSource createDataSource(final DataSource dataSource,
final Collection<RuleConfiguration> configs, final Properties props) throws
SQLException {
+ return createDataSource((ModeConfiguration) null, dataSource, configs,
props);
}
/**
* Create ShardingSphere data source.
*
+ * @param databaseName database name
* @param dataSource data source
* @param configs rule configurations
* @param props properties for data source
* @return ShardingSphere data source
* @throws SQLException SQL exception
*/
- public static DataSource createDataSource(final DataSource dataSource,
final Collection<RuleConfiguration> configs, final Properties props) throws
SQLException {
- return createDataSource((ModeConfiguration) null, dataSource, configs,
props);
+ public static DataSource createDataSource(final String databaseName, final
DataSource dataSource, final Collection<RuleConfiguration> configs, final
Properties props) throws SQLException {
+ return createDataSource(databaseName, null, dataSource, configs,
props);
}
private static String getDatabaseName(final String databaseName) {
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 b8400a69b68..0f8d181cc85 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
@@ -33,42 +33,33 @@ import java.util.Properties;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
public final class ShardingSphereDataSourceFactoryTest {
- private final ModeConfiguration modeConfig = new
ModeConfiguration("Standalone", null, false);
-
@Test
public void assertCreateDataSourceWithDatabaseName() throws SQLException {
- DataSource testDataSource =
ShardingSphereDataSourceFactory.createDataSource("test_db", null);
- assertTrue(testDataSource instanceof ShardingSphereDataSource);
- assertThat(getDatabaseName(testDataSource), is("test_db"));
- DataSource testDataSource1 =
ShardingSphereDataSourceFactory.createDataSource(modeConfig);
- assertTrue(testDataSource1 instanceof ShardingSphereDataSource);
- assertThat(getDatabaseName(testDataSource1),
is(DefaultDatabase.LOGIC_NAME));
+ 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);
- assertTrue(testDataSource2 instanceof ShardingSphereDataSource);
- assertThat(getDatabaseName(testDataSource2),
is(DefaultDatabase.LOGIC_NAME));
+ assertDataSource(testDataSource2, DefaultDatabase.LOGIC_NAME);
DataSource testDataSource3 =
ShardingSphereDataSourceFactory.createDataSource(new HashMap<>(), new
LinkedList<>(), new Properties());
- assertThat(getDatabaseName(testDataSource3),
is(DefaultDatabase.LOGIC_NAME));
+ assertDataSource(testDataSource3, DefaultDatabase.LOGIC_NAME);
DataSource testDataSource4 =
ShardingSphereDataSourceFactory.createDataSource(new MockedDataSource(), new
LinkedList<>(), new Properties());
- assertThat(getDatabaseName(testDataSource4),
is(DefaultDatabase.LOGIC_NAME));
+ assertDataSource(testDataSource4, DefaultDatabase.LOGIC_NAME);
DataSource testDataSource5 =
ShardingSphereDataSourceFactory.createDataSource("test_db5", new
MockedDataSource(), new LinkedList<>(), new Properties());
- assertTrue(testDataSource5 instanceof ShardingSphereDataSource);
- assertThat(getDatabaseName(testDataSource5), is("test_db5"));
+ assertDataSource(testDataSource5, "test_db5");
DataSource testDataSource6 =
ShardingSphereDataSourceFactory.createDataSource("test_db6", new HashMap<>(),
new LinkedList<>(), new Properties());
- assertTrue(testDataSource6 instanceof ShardingSphereDataSource);
- assertThat(getDatabaseName(testDataSource6), is("test_db6"));
- DataSource testDataSource7 =
ShardingSphereDataSourceFactory.createDataSource("test_db6", modeConfig, new
HashMap<>(), null, null);
- assertTrue(testDataSource7 instanceof ShardingSphereDataSource);
- assertThat(getDatabaseName(testDataSource7), is("test_db6"));
+ assertDataSource(testDataSource6, "test_db6");
+ DataSource testDataSource7 =
ShardingSphereDataSourceFactory.createDataSource("test_db7", new
ModeConfiguration("Standalone", null, false), new HashMap<>(), null, null);
+ assertDataSource(testDataSource7, "test_db7");
}
@SneakyThrows(ReflectiveOperationException.class)
- private static String getDatabaseName(final DataSource dataSource) {
+ private void assertDataSource(final DataSource actualDataSource, final
String expectedDataSourceName) {
Field field =
ShardingSphereDataSource.class.getDeclaredField("databaseName");
field.setAccessible(true);
- return (String) field.get(dataSource);
+ assertThat((String) field.get(actualDataSource),
is(expectedDataSourceName));
}
}
