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 1fe3c2ac972 Refactor DataSourceGeneratedDatabaseConfigurationTest
(#36915)
1fe3c2ac972 is described below
commit 1fe3c2ac97228bb2a13b4546eadd0d55ab040312
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Oct 22 13:10:33 2025 +0800
Refactor DataSourceGeneratedDatabaseConfigurationTest (#36915)
* Refactor DataSourceGeneratedDatabaseConfigurationTest
* Refactor DataSourceGeneratedDatabaseConfigurationTest
---
...taSourceGeneratedDatabaseConfigurationTest.java | 83 ++++++++++------------
1 file changed, 38 insertions(+), 45 deletions(-)
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/config/database/impl/DataSourceGeneratedDatabaseConfigurationTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/config/database/impl/DataSourceGeneratedDatabaseConfigurationTest.java
index 174c5d25164..8a8a2688d39 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/config/database/impl/DataSourceGeneratedDatabaseConfigurationTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/config/database/impl/DataSourceGeneratedDatabaseConfigurationTest.java
@@ -17,15 +17,18 @@
package org.apache.shardingsphere.infra.config.database.impl;
+import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import
org.apache.shardingsphere.infra.datasource.pool.config.ConnectionConfiguration;
import
org.apache.shardingsphere.infra.datasource.pool.config.DataSourceConfiguration;
import
org.apache.shardingsphere.infra.datasource.pool.config.PoolConfiguration;
-import
org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties;
import org.apache.shardingsphere.infra.fixture.FixtureRuleConfiguration;
import
org.apache.shardingsphere.infra.metadata.database.resource.node.StorageNode;
+import
org.apache.shardingsphere.infra.metadata.database.resource.unit.StorageUnit;
import org.apache.shardingsphere.test.infra.fixture.jdbc.MockedDataSource;
import org.junit.jupiter.api.Test;
+import javax.sql.DataSource;
+import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import java.util.Properties;
@@ -40,66 +43,56 @@ class DataSourceGeneratedDatabaseConfigurationTest {
@Test
void assertNewSuccess() {
- DataSourceGeneratedDatabaseConfiguration actual =
createDatabaseConfiguration(createDataSourceConfiguration(MockedDataSource.class.getName()));
- assertDataSource(actual);
- assertDataSources(actual);
- assertRuleConfigurations(actual);
- assertDataSourcePoolProperties(actual);
+ DataSourceGeneratedDatabaseConfiguration actual =
createDatabaseConfiguration(MockedDataSource.class.getName());
+ assertRuleConfigurations(actual.getRuleConfigurations());
+ assertStorageUnits(actual.getStorageUnits().get("foo_db"));
+ assertDataSources((MockedDataSource) actual.getDataSources().get(new
StorageNode("foo_db")));
}
- private void assertDataSource(final
DataSourceGeneratedDatabaseConfiguration actual) {
- assertThat(actual.getStorageUnits().get("foo_db").getDataSource(),
isA(MockedDataSource.class));
- }
-
- private void assertDataSources(final
DataSourceGeneratedDatabaseConfiguration actual) {
- MockedDataSource mockedDataSource = (MockedDataSource)
actual.getDataSources().get(new StorageNode("foo_db"));
- assertThat(mockedDataSource.getUrl(),
is("jdbc:mock://127.0.0.1/foo_db"));
- assertThat(mockedDataSource.getUsername(), is("root"));
- assertThat(mockedDataSource.getPassword(), is(""));
+ private void assertRuleConfigurations(final Collection<RuleConfiguration>
actual) {
+ FixtureRuleConfiguration ruleConfig = (FixtureRuleConfiguration)
actual.iterator().next();
+ assertThat(ruleConfig.getName(), is("foo_rule"));
}
- private void assertRuleConfigurations(final
DataSourceGeneratedDatabaseConfiguration actual) {
- FixtureRuleConfiguration ruleConfig = (FixtureRuleConfiguration)
actual.getRuleConfigurations().iterator().next();
- assertThat(ruleConfig.getName(), is("foo_rule"));
+ private void assertStorageUnits(final StorageUnit actual) {
+ DataSource dataSource = actual.getDataSource();
+ assertThat(dataSource, isA(MockedDataSource.class));
+
assertPoolProperties(actual.getDataSourcePoolProperties().getPoolPropertySynonyms().getStandardProperties());
+
assertConnectionProperties(actual.getDataSourcePoolProperties().getConnectionPropertySynonyms().getStandardProperties());
}
- private void assertDataSourcePoolProperties(final
DataSourceGeneratedDatabaseConfiguration actual) {
- DataSourcePoolProperties props =
actual.getStorageUnits().get("foo_db").getDataSourcePoolProperties();
- assertPoolProperties(props);
- assertConnectionProperties(props);
+ private void assertPoolProperties(final Map<String, Object> actual) {
+ assertThat(actual.size(), is(6));
+ assertThat(actual.get("connectionTimeoutMilliseconds"), is(2000L));
+ assertThat(actual.get("idleTimeoutMilliseconds"), is(1000L));
+ assertThat(actual.get("maxLifetimeMilliseconds"), is(1000L));
+ assertThat(actual.get("maxPoolSize"), is(2));
+ assertThat(actual.get("minPoolSize"), is(1));
+ assertFalse((Boolean) actual.get("readOnly"));
}
- private void assertPoolProperties(final DataSourcePoolProperties actual) {
- Map<String, Object> poolStandardProps =
actual.getPoolPropertySynonyms().getStandardProperties();
- assertThat(poolStandardProps.size(), is(6));
- assertThat(poolStandardProps.get("connectionTimeoutMilliseconds"),
is(2000L));
- assertThat(poolStandardProps.get("idleTimeoutMilliseconds"),
is(1000L));
- assertThat(poolStandardProps.get("maxLifetimeMilliseconds"),
is(1000L));
- assertThat(poolStandardProps.get("maxPoolSize"), is(2));
- assertThat(poolStandardProps.get("minPoolSize"), is(1));
- assertFalse((Boolean) poolStandardProps.get("readOnly"));
+ private void assertConnectionProperties(final Map<String, Object> actual) {
+ assertThat(actual.size(), is(4));
+ assertThat(actual.get("dataSourceClassName"),
is(MockedDataSource.class.getName()));
+ assertThat(actual.get("url"), is("jdbc:mock://127.0.0.1/foo_db"));
+ assertThat(actual.get("username"), is("root"));
+ assertThat(actual.get("password"), is(""));
}
- private void assertConnectionProperties(final DataSourcePoolProperties
actual) {
- Map<String, Object> connStandardProps =
actual.getConnectionPropertySynonyms().getStandardProperties();
- assertThat(connStandardProps.size(), is(4));
- assertThat(connStandardProps.get("dataSourceClassName"),
is(MockedDataSource.class.getName()));
- assertThat(connStandardProps.get("url"),
is("jdbc:mock://127.0.0.1/foo_db"));
- assertThat(connStandardProps.get("username"), is("root"));
- assertThat(connStandardProps.get("password"), is(""));
+ private void assertDataSources(final MockedDataSource actual) {
+ assertThat(actual.getUrl(), is("jdbc:mock://127.0.0.1/foo_db"));
+ assertThat(actual.getUsername(), is("root"));
+ assertThat(actual.getPassword(), is(""));
}
@Test
void assertNewWithException() {
- assertThrows(Exception.class, () ->
createDatabaseConfiguration(createDataSourceConfiguration("non.existent.DataSourceClass")));
+ assertThrows(Exception.class, () ->
createDatabaseConfiguration("non.existent.DataSourceClass"));
}
- private DataSourceGeneratedDatabaseConfiguration
createDatabaseConfiguration(final DataSourceConfiguration dataSourceConfig) {
- return new
DataSourceGeneratedDatabaseConfiguration(Collections.singletonMap("foo_db",
dataSourceConfig), Collections.singleton(new
FixtureRuleConfiguration("foo_rule")));
- }
-
- private DataSourceConfiguration createDataSourceConfiguration(final String
dataSourceClassName) {
- return new DataSourceConfiguration(new
ConnectionConfiguration(dataSourceClassName, "jdbc:mock://127.0.0.1/foo_db",
"root", ""),
+ private DataSourceGeneratedDatabaseConfiguration
createDatabaseConfiguration(final String dataSourceClassName) {
+ DataSourceConfiguration dataSourceConfig = new
DataSourceConfiguration(new ConnectionConfiguration(dataSourceClassName,
"jdbc:mock://127.0.0.1/foo_db", "root", ""),
new PoolConfiguration(2000L, 1000L, 1000L, 2, 1, false, new
Properties()));
+ return new
DataSourceGeneratedDatabaseConfiguration(Collections.singletonMap("foo_db",
dataSourceConfig), Collections.singleton(new
FixtureRuleConfiguration("foo_rule")));
}
}
