This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng 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 5367ec1af93 Revise #19495 (#19499)
5367ec1af93 is described below
commit 5367ec1af933e468afcae9c2f3dc97875c1be7d2
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jul 24 11:47:27 2022 +0800
Revise #19495 (#19499)
---
...ovidedShardingRuleConfigurationCheckerTest.java | 122 ++++++++++-----------
.../ShardingRuleConfigurationCheckerTest.java | 120 +++++++++-----------
2 files changed, 109 insertions(+), 133 deletions(-)
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/checker/AlgorithmProvidedShardingRuleConfigurationCheckerTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/checker/AlgorithmProvidedShardingRuleConfigurationCheckerTest.java
index 6a47e524d95..9813618549c 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/checker/AlgorithmProvidedShardingRuleConfigurationCheckerTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/checker/AlgorithmProvidedShardingRuleConfigurationCheckerTest.java
@@ -33,86 +33,76 @@ import org.junit.Test;
import java.util.Collections;
import java.util.Optional;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
public final class AlgorithmProvidedShardingRuleConfigurationCheckerTest {
-
+
@Test
- public void assertCheckPass() {
- AlgorithmProvidedShardingRuleConfiguration configuration =
createConfiguration();
- ShardingAuditStrategyConfiguration shardingAuditStrategyConfiguration
= createShardingAuditStrategyConfiguration();
- ShardingStrategyConfiguration shardingStrategyConfiguration =
createShardingStrategyConfiguration();
- configuration.setTables(Collections.singleton(
-
createShardingTableRuleConfiguration(configuration.getDefaultKeyGenerateStrategy(),
shardingAuditStrategyConfiguration, shardingStrategyConfiguration)));
- configuration.setAutoTables(Collections.singleton(
-
createShardingAutoTableRuleConfiguration(configuration.getDefaultKeyGenerateStrategy(),
shardingAuditStrategyConfiguration, shardingStrategyConfiguration)));
- getChecker(configuration).check("foo_db", configuration);
+ public void assertCheckSuccess() {
+ AlgorithmProvidedShardingRuleConfiguration ruleConfig =
createRuleConfiguration();
+ ShardingAuditStrategyConfiguration shardingAuditStrategyConfig = new
ShardingAuditStrategyConfiguration(Collections.singletonList("foo_audit"),
false);
+ ShardingStrategyConfiguration shardingStrategyConfig =
createShardingStrategyConfiguration();
+
ruleConfig.setTables(Collections.singleton(createShardingTableRuleConfiguration(shardingStrategyConfig,
shardingAuditStrategyConfig, ruleConfig.getDefaultKeyGenerateStrategy())));
+
ruleConfig.setAutoTables(Collections.singleton(createShardingAutoTableRuleConfiguration(shardingStrategyConfig,
shardingAuditStrategyConfig, ruleConfig.getDefaultKeyGenerateStrategy())));
+ getChecker(ruleConfig).check("foo_db", ruleConfig);
}
-
+
@Test(expected = IllegalStateException.class)
- public void assertCheckTableConfigurationInitFail() {
- AlgorithmProvidedShardingRuleConfiguration configuration =
createConfiguration();
- getChecker(configuration).check("foo_db", configuration);
+ public void assertCheckTableConfigurationInitFailed() {
+ AlgorithmProvidedShardingRuleConfiguration ruleConfig =
createRuleConfiguration();
+ getChecker(ruleConfig).check("foo_db", ruleConfig);
}
-
+
@Test(expected = IllegalStateException.class)
- public void assertCheckTableConfigurationFail() {
- AlgorithmProvidedShardingRuleConfiguration configuration =
createConfiguration();
-
configuration.setTables(Collections.singletonList(createShardingTableRuleConfiguration(null,
null, null)));
-
configuration.setAutoTables(Collections.singleton(createShardingAutoTableRuleConfiguration(null,
null, null)));
- getChecker(configuration).check("foo_db", configuration);
+ public void assertCheckTableConfigurationFailed() {
+ AlgorithmProvidedShardingRuleConfiguration ruleConfig =
createRuleConfiguration();
+
ruleConfig.setTables(Collections.singleton(createShardingTableRuleConfiguration(null,
null, null)));
+
ruleConfig.setAutoTables(Collections.singleton(createShardingAutoTableRuleConfiguration(null,
null, null)));
+ getChecker(ruleConfig).check("foo_db", ruleConfig);
}
-
- private AlgorithmProvidedShardingRuleConfiguration createConfiguration() {
- AlgorithmProvidedShardingRuleConfiguration configuration = new
AlgorithmProvidedShardingRuleConfiguration();
-
- KeyGenerateStrategyConfiguration keyGenerateStrategyConfiguration =
new KeyGenerateStrategyConfiguration("foo_column",
- "foo_db");
-
configuration.setDefaultKeyGenerateStrategy(keyGenerateStrategyConfiguration);
- configuration.getKeyGenerators().put("foo_db",
mock(KeyGenerateAlgorithm.class));
- configuration.getAuditors().put("foo_audit",
mock(ShardingAuditAlgorithm.class));
- configuration.getShardingAlgorithms().put("foo_algorithm",
mock(ShardingAlgorithm.class));
- return configuration;
+
+ private AlgorithmProvidedShardingRuleConfiguration
createRuleConfiguration() {
+ AlgorithmProvidedShardingRuleConfiguration result = new
AlgorithmProvidedShardingRuleConfiguration();
+ result.getShardingAlgorithms().put("foo_algorithm",
mock(ShardingAlgorithm.class));
+ result.getAuditors().put("foo_audit",
mock(ShardingAuditAlgorithm.class));
+ result.getKeyGenerators().put("foo_keygen",
mock(KeyGenerateAlgorithm.class));
+ result.setDefaultKeyGenerateStrategy(new
KeyGenerateStrategyConfiguration("foo_col", "foo_keygen"));
+ return result;
}
-
- private ShardingAuditStrategyConfiguration
createShardingAuditStrategyConfiguration() {
- ShardingAuditStrategyConfiguration shardingAuditStrategyConfiguration
= new
ShardingAuditStrategyConfiguration(Collections.singletonList("foo_audit"),
false);
- return shardingAuditStrategyConfiguration;
- }
-
+
private ShardingStrategyConfiguration
createShardingStrategyConfiguration() {
- ShardingStrategyConfiguration shardingStrategyConfiguration =
mock(ShardingStrategyConfiguration.class);
-
when(shardingStrategyConfiguration.getShardingAlgorithmName()).thenReturn("foo_algorithm");
- return shardingStrategyConfiguration;
+ ShardingStrategyConfiguration result =
mock(ShardingStrategyConfiguration.class);
+ when(result.getShardingAlgorithmName()).thenReturn("foo_algorithm");
+ return result;
}
-
- private ShardingTableRuleConfiguration
createShardingTableRuleConfiguration(final KeyGenerateStrategyConfiguration
keyGenerateStrategyConfiguration,
-
final ShardingAuditStrategyConfiguration shardingAuditStrategyConfiguration,
-
final ShardingStrategyConfiguration shardingStrategyConfiguration) {
- ShardingTableRuleConfiguration shardingTableRuleConfiguration = new
ShardingTableRuleConfiguration("foo_ltb");
-
shardingTableRuleConfiguration.setKeyGenerateStrategy(keyGenerateStrategyConfiguration
== null ? mock(KeyGenerateStrategyConfiguration.class) :
keyGenerateStrategyConfiguration);
-
shardingTableRuleConfiguration.setAuditStrategy(shardingAuditStrategyConfiguration
== null ? mock(ShardingAuditStrategyConfiguration.class) :
shardingAuditStrategyConfiguration);
-
shardingTableRuleConfiguration.setDatabaseShardingStrategy(shardingStrategyConfiguration
== null ? mock(ShardingStrategyConfiguration.class) :
shardingStrategyConfiguration);
-
shardingTableRuleConfiguration.setTableShardingStrategy(shardingStrategyConfiguration
== null ? mock(ShardingStrategyConfiguration.class) :
shardingStrategyConfiguration);
- return shardingTableRuleConfiguration;
+
+ private ShardingTableRuleConfiguration
createShardingTableRuleConfiguration(final ShardingStrategyConfiguration
shardingStrategyConfig,
+
final ShardingAuditStrategyConfiguration shardingAuditStrategyConfig,
+
final KeyGenerateStrategyConfiguration keyGenerateStrategyConfig) {
+ ShardingTableRuleConfiguration result = new
ShardingTableRuleConfiguration("foo_tbl");
+ result.setDatabaseShardingStrategy(null == shardingStrategyConfig ?
mock(ShardingStrategyConfiguration.class) : shardingStrategyConfig);
+ result.setTableShardingStrategy(null == shardingStrategyConfig ?
mock(ShardingStrategyConfiguration.class) : shardingStrategyConfig);
+ result.setAuditStrategy(null == shardingAuditStrategyConfig ?
mock(ShardingAuditStrategyConfiguration.class) : shardingAuditStrategyConfig);
+ result.setKeyGenerateStrategy(null == keyGenerateStrategyConfig ?
mock(KeyGenerateStrategyConfiguration.class) : keyGenerateStrategyConfig);
+ return result;
}
-
- private ShardingAutoTableRuleConfiguration
createShardingAutoTableRuleConfiguration(final KeyGenerateStrategyConfiguration
keyGenerateStrategyConfiguration,
-
final ShardingAuditStrategyConfiguration
shardingAuditStrategyConfiguration,
-
final ShardingStrategyConfiguration shardingStrategyConfiguration) {
- ShardingAutoTableRuleConfiguration shardingAutoTableRuleConfiguration
= mock(ShardingAutoTableRuleConfiguration.class);
- when(shardingAutoTableRuleConfiguration.getKeyGenerateStrategy())
- .thenReturn(keyGenerateStrategyConfiguration == null ?
mock(KeyGenerateStrategyConfiguration.class) :
keyGenerateStrategyConfiguration);
- when(shardingAutoTableRuleConfiguration.getAuditStrategy())
- .thenReturn(shardingAuditStrategyConfiguration == null ?
mock(ShardingAuditStrategyConfiguration.class) :
shardingAuditStrategyConfiguration);
- when(shardingAutoTableRuleConfiguration.getShardingStrategy())
- .thenReturn(shardingStrategyConfiguration == null ?
mock(ShardingStrategyConfiguration.class) : shardingStrategyConfiguration);
- return shardingAutoTableRuleConfiguration;
+
+ private ShardingAutoTableRuleConfiguration
createShardingAutoTableRuleConfiguration(final ShardingStrategyConfiguration
shardingStrategyConfig,
+
final ShardingAuditStrategyConfiguration shardingAuditStrategyConfig,
+
final KeyGenerateStrategyConfiguration keyGenerateStrategyConfig) {
+ ShardingAutoTableRuleConfiguration result =
mock(ShardingAutoTableRuleConfiguration.class);
+ when(result.getShardingStrategy()).thenReturn(null ==
shardingStrategyConfig ? mock(ShardingStrategyConfiguration.class) :
shardingStrategyConfig);
+ when(result.getAuditStrategy()).thenReturn(null ==
shardingAuditStrategyConfig ? mock(ShardingAuditStrategyConfiguration.class) :
shardingAuditStrategyConfig);
+ when(result.getKeyGenerateStrategy()).thenReturn(null ==
keyGenerateStrategyConfig ? mock(KeyGenerateStrategyConfiguration.class) :
keyGenerateStrategyConfig);
+ return result;
}
-
- private RuleConfigurationChecker getChecker(final
AlgorithmProvidedShardingRuleConfiguration configuration) {
- Optional<RuleConfigurationChecker> checkerOptional =
RuleConfigurationCheckerFactory.findInstance(configuration);
- return checkerOptional.get();
+
+ @SuppressWarnings({"rawtypes", "unchecked"})
+ private
RuleConfigurationChecker<AlgorithmProvidedShardingRuleConfiguration>
getChecker(final AlgorithmProvidedShardingRuleConfiguration ruleConfig) {
+ Optional<RuleConfigurationChecker> result =
RuleConfigurationCheckerFactory.findInstance(ruleConfig);
+ assertTrue(result.isPresent());
+ return result.get();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/checker/ShardingRuleConfigurationCheckerTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/checker/ShardingRuleConfigurationCheckerTest.java
index d499a5e86c9..0162ac07192 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/checker/ShardingRuleConfigurationCheckerTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/checker/ShardingRuleConfigurationCheckerTest.java
@@ -31,90 +31,76 @@ import org.junit.Test;
import java.util.Collections;
import java.util.Optional;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
public final class ShardingRuleConfigurationCheckerTest {
-
- @SuppressWarnings({"rawtypes", "unchecked"})
+
@Test
- public void assertCheckPass() {
- ShardingRuleConfiguration configuration = createConfiguration();
- ShardingAuditStrategyConfiguration shardingAuditStrategyConfiguration
- = createShardingAuditStrategyConfiguration();
- ShardingStrategyConfiguration shardingStrategyConfiguration =
createShardingStrategyConfiguration();
- configuration.setTables(Collections.singleton(
-
createShardingTableRuleConfiguration(configuration.getDefaultKeyGenerateStrategy(),
shardingAuditStrategyConfiguration, shardingStrategyConfiguration)));
- configuration.setAutoTables(Collections.singleton(
-
createShardingAutoTableRuleConfiguration(configuration.getDefaultKeyGenerateStrategy(),
shardingAuditStrategyConfiguration, shardingStrategyConfiguration)));
-
- RuleConfigurationChecker checker = getChecker(configuration);
- checker.check("foo_db", configuration);
+ public void assertCheckSuccess() {
+ ShardingRuleConfiguration ruleConfig = createRuleConfiguration();
+ ShardingAuditStrategyConfiguration shardingAuditStrategyConfig = new
ShardingAuditStrategyConfiguration(Collections.singletonList("foo_audit"),
false);
+ ShardingStrategyConfiguration shardingStrategyConfig =
createShardingStrategyConfiguration();
+
ruleConfig.setTables(Collections.singleton(createShardingTableRuleConfiguration(shardingStrategyConfig,
shardingAuditStrategyConfig, ruleConfig.getDefaultKeyGenerateStrategy())));
+
ruleConfig.setAutoTables(Collections.singleton(createShardingAutoTableRuleConfiguration(shardingStrategyConfig,
shardingAuditStrategyConfig, ruleConfig.getDefaultKeyGenerateStrategy())));
+ getChecker(ruleConfig).check("foo_db", ruleConfig);
}
-
+
@Test(expected = IllegalStateException.class)
- public void assertCheckTableConfigurationInitFail() {
- ShardingRuleConfiguration configuration = createConfiguration();
- getChecker(configuration).check("foo_db", configuration);
+ public void assertCheckTableConfigurationInitFailed() {
+ ShardingRuleConfiguration ruleConfig = createRuleConfiguration();
+ getChecker(ruleConfig).check("foo_db", ruleConfig);
}
-
+
@Test(expected = IllegalStateException.class)
- public void assertCheckTableConfigurationFail() {
- ShardingRuleConfiguration configuration = createConfiguration();
+ public void assertCheckTableConfigurationFailed() {
+ ShardingRuleConfiguration configuration = createRuleConfiguration();
configuration.setTables(Collections.singletonList(createShardingTableRuleConfiguration(null,
null, null)));
configuration.setAutoTables(Collections.singleton(createShardingAutoTableRuleConfiguration(null,
null, null)));
getChecker(configuration).check("foo_db", configuration);
}
-
- private ShardingRuleConfiguration createConfiguration() {
- ShardingRuleConfiguration configuration = new
ShardingRuleConfiguration();
-
- KeyGenerateStrategyConfiguration keyGenerateStrategyConfiguration =
new KeyGenerateStrategyConfiguration("foo_column",
- "foo_key");
-
configuration.setDefaultKeyGenerateStrategy(keyGenerateStrategyConfiguration);
- configuration.getKeyGenerators().put("foo_key",
mock(ShardingSphereAlgorithmConfiguration.class));
- configuration.getAuditors().put("foo_audit",
mock(ShardingSphereAlgorithmConfiguration.class));
- configuration.getShardingAlgorithms().put("foo_algorithm",
mock(ShardingSphereAlgorithmConfiguration.class));
- return configuration;
+
+ private ShardingRuleConfiguration createRuleConfiguration() {
+ ShardingRuleConfiguration result = new ShardingRuleConfiguration();
+ result.getShardingAlgorithms().put("foo_algorithm",
mock(ShardingSphereAlgorithmConfiguration.class));
+ result.getAuditors().put("foo_audit",
mock(ShardingSphereAlgorithmConfiguration.class));
+ result.getKeyGenerators().put("foo_keygen",
mock(ShardingSphereAlgorithmConfiguration.class));
+ result.setDefaultKeyGenerateStrategy(new
KeyGenerateStrategyConfiguration("foo_col", "foo_keygen"));
+ return result;
}
-
- private ShardingAuditStrategyConfiguration
createShardingAuditStrategyConfiguration() {
- ShardingAuditStrategyConfiguration shardingAuditStrategyConfiguration
= new
ShardingAuditStrategyConfiguration(Collections.singletonList("foo_audit"),
false);
- return shardingAuditStrategyConfiguration;
- }
-
+
private ShardingStrategyConfiguration
createShardingStrategyConfiguration() {
- ShardingStrategyConfiguration shardingStrategyConfiguration =
mock(ShardingStrategyConfiguration.class);
-
when(shardingStrategyConfiguration.getShardingAlgorithmName()).thenReturn("foo_algorithm");
- return shardingStrategyConfiguration;
+ ShardingStrategyConfiguration result =
mock(ShardingStrategyConfiguration.class);
+ when(result.getShardingAlgorithmName()).thenReturn("foo_algorithm");
+ return result;
}
-
- private ShardingTableRuleConfiguration
createShardingTableRuleConfiguration(final KeyGenerateStrategyConfiguration
keyGenerateStrategyConfiguration,
-
final ShardingAuditStrategyConfiguration shardingAuditStrategyConfiguration,
-
final ShardingStrategyConfiguration shardingStrategyConfiguration) {
- ShardingTableRuleConfiguration shardingTableRuleConfiguration = new
ShardingTableRuleConfiguration("foo_ltb");
-
shardingTableRuleConfiguration.setKeyGenerateStrategy(keyGenerateStrategyConfiguration
== null ? mock(KeyGenerateStrategyConfiguration.class) :
keyGenerateStrategyConfiguration);
-
shardingTableRuleConfiguration.setAuditStrategy(shardingAuditStrategyConfiguration
== null ? mock(ShardingAuditStrategyConfiguration.class) :
shardingAuditStrategyConfiguration);
-
shardingTableRuleConfiguration.setDatabaseShardingStrategy(shardingStrategyConfiguration
== null ? mock(ShardingStrategyConfiguration.class) :
shardingStrategyConfiguration);
-
shardingTableRuleConfiguration.setTableShardingStrategy(shardingStrategyConfiguration
== null ? mock(ShardingStrategyConfiguration.class) :
shardingStrategyConfiguration);
- return shardingTableRuleConfiguration;
+
+ private ShardingTableRuleConfiguration
createShardingTableRuleConfiguration(final ShardingStrategyConfiguration
shardingStrategyConfig,
+
final ShardingAuditStrategyConfiguration shardingAuditStrategyConfig,
+
final KeyGenerateStrategyConfiguration keyGenerateStrategyConfig) {
+ ShardingTableRuleConfiguration result = new
ShardingTableRuleConfiguration("foo_tbl");
+ result.setDatabaseShardingStrategy(null == shardingStrategyConfig ?
mock(ShardingStrategyConfiguration.class) : shardingStrategyConfig);
+ result.setTableShardingStrategy(null == shardingStrategyConfig ?
mock(ShardingStrategyConfiguration.class) : shardingStrategyConfig);
+ result.setAuditStrategy(null == shardingAuditStrategyConfig ?
mock(ShardingAuditStrategyConfiguration.class) : shardingAuditStrategyConfig);
+ result.setKeyGenerateStrategy(null == keyGenerateStrategyConfig ?
mock(KeyGenerateStrategyConfiguration.class) : keyGenerateStrategyConfig);
+ return result;
}
-
- private ShardingAutoTableRuleConfiguration
createShardingAutoTableRuleConfiguration(final KeyGenerateStrategyConfiguration
keyGenerateStrategyConfiguration,
-
final ShardingAuditStrategyConfiguration
shardingAuditStrategyConfiguration,
-
final ShardingStrategyConfiguration shardingStrategyConfiguration) {
- ShardingAutoTableRuleConfiguration shardingAutoTableRuleConfiguration
= mock(ShardingAutoTableRuleConfiguration.class);
- when(shardingAutoTableRuleConfiguration.getKeyGenerateStrategy())
- .thenReturn(keyGenerateStrategyConfiguration == null ?
mock(KeyGenerateStrategyConfiguration.class) :
keyGenerateStrategyConfiguration);
- when(shardingAutoTableRuleConfiguration.getAuditStrategy())
- .thenReturn(shardingAuditStrategyConfiguration == null ?
mock(ShardingAuditStrategyConfiguration.class) :
shardingAuditStrategyConfiguration);
- when(shardingAutoTableRuleConfiguration.getShardingStrategy())
- .thenReturn(shardingStrategyConfiguration == null ?
mock(ShardingStrategyConfiguration.class) : shardingStrategyConfiguration);
- return shardingAutoTableRuleConfiguration;
+
+ private ShardingAutoTableRuleConfiguration
createShardingAutoTableRuleConfiguration(final ShardingStrategyConfiguration
shardingStrategyConfig,
+
final ShardingAuditStrategyConfiguration shardingAuditStrategyConfig,
+
final KeyGenerateStrategyConfiguration keyGenerateStrategyConfig) {
+ ShardingAutoTableRuleConfiguration result =
mock(ShardingAutoTableRuleConfiguration.class);
+ when(result.getShardingStrategy()).thenReturn(null ==
shardingStrategyConfig ? mock(ShardingStrategyConfiguration.class) :
shardingStrategyConfig);
+ when(result.getAuditStrategy()).thenReturn(null ==
shardingAuditStrategyConfig ? mock(ShardingAuditStrategyConfiguration.class) :
shardingAuditStrategyConfig);
+ when(result.getKeyGenerateStrategy()).thenReturn(null ==
keyGenerateStrategyConfig ? mock(KeyGenerateStrategyConfiguration.class) :
keyGenerateStrategyConfig);
+ return result;
}
-
- private RuleConfigurationChecker getChecker(final
ShardingRuleConfiguration configuration) {
- Optional<RuleConfigurationChecker> checkerOptional =
RuleConfigurationCheckerFactory.findInstance(configuration);
- return checkerOptional.get();
+
+ @SuppressWarnings({"unchecked", "rawtypes"})
+ private RuleConfigurationChecker<ShardingRuleConfiguration>
getChecker(final ShardingRuleConfiguration ruleConfig) {
+ Optional<RuleConfigurationChecker> result =
RuleConfigurationCheckerFactory.findInstance(ruleConfig);
+ assertTrue(result.isPresent());
+ return result.get();
}
}
