You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2022/07/23 05:35:15 UTC
[shardingsphere] branch master updated: Refactor ShardingRuleAlgorithmProviderConfigurationYamlSwapperTest (#19486)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 85094eaa238 Refactor ShardingRuleAlgorithmProviderConfigurationYamlSwapperTest (#19486)
85094eaa238 is described below
commit 85094eaa2382e87f85cd628bf773504d730321fb
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Jul 23 13:35:10 2022 +0800
Refactor ShardingRuleAlgorithmProviderConfigurationYamlSwapperTest (#19486)
---
...orithmProviderConfigurationYamlSwapperTest.java | 77 ++++++++--------------
1 file changed, 28 insertions(+), 49 deletions(-)
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleAlgorithmProviderConfigurationYamlSwapperTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleAlgorithmProviderConfigurationYamlSwapperTest.java
index 5bc93b2dd8c..9733596c8f6 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleAlgorithmProviderConfigurationYamlSwapperTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleAlgorithmProviderConfigurationYamlSwapperTest.java
@@ -24,70 +24,49 @@ import org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleC
import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration;
import org.apache.shardingsphere.sharding.yaml.config.YamlShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.yaml.config.rule.YamlTableRuleConfiguration;
-import org.junit.Before;
import org.junit.Test;
import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertNotNull;
+import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
public final class ShardingRuleAlgorithmProviderConfigurationYamlSwapperTest {
-
- private AlgorithmProvidedShardingRuleConfiguration ruleConfig;
-
- @Before
- public void setUp() {
- ruleConfig = mock(AlgorithmProvidedShardingRuleConfiguration.class);
- }
-
+
@Test
public void assertSwapToYamlConfiguration() {
- YamlShardingRuleConfiguration actualResult = getSwapper().swapToYamlConfiguration(createAlgorithmProvidedShardingRuleConfiguration());
- assertNotNull(actualResult);
- assertThat(actualResult.getDefaultShardingColumn(), equalTo("foo_column"));
- assertThat(actualResult.getScalingName(), equalTo("foo_scale_name"));
+ YamlShardingRuleConfiguration actual = getSwapper().swapToYamlConfiguration(createAlgorithmProvidedShardingRuleConfiguration());
+ assertThat(actual.getDefaultShardingColumn(), is("foo_column"));
+ assertThat(actual.getScalingName(), is("foo_scale_name"));
}
-
+
+ private AlgorithmProvidedShardingRuleConfiguration createAlgorithmProvidedShardingRuleConfiguration() {
+ AlgorithmProvidedShardingRuleConfiguration result = new AlgorithmProvidedShardingRuleConfiguration();
+ result.getTables().add(new ShardingTableRuleConfiguration("foo_db"));
+ result.getAutoTables().add(new ShardingAutoTableRuleConfiguration("foo_db"));
+ result.getBindingTableGroups().add("foo_bind_tb");
+ result.setDefaultShardingColumn("foo_column");
+ result.setScalingName("foo_scale_name");
+ return result;
+ }
+
@Test
public void assertSwapToObject() {
- AlgorithmProvidedShardingRuleConfiguration algorithmProvidedShardingRuleConfiguration = getSwapper().swapToObject(createYamlShardingRuleConfiguration());
- assertThat(algorithmProvidedShardingRuleConfiguration.getDefaultShardingColumn(), equalTo("foo_column"));
+ assertThat(getSwapper().swapToObject(createYamlShardingRuleConfiguration()).getDefaultShardingColumn(), is("foo_column"));
}
-
- @Test
- public void assertGetRuleTagName() {
- assertThat(getSwapper().getRuleTagName(), equalTo("SHARDING"));
+
+ private YamlShardingRuleConfiguration createYamlShardingRuleConfiguration() {
+ YamlShardingRuleConfiguration result = new YamlShardingRuleConfiguration();
+ YamlTableRuleConfiguration yamlTableRuleConfig = new YamlTableRuleConfiguration();
+ yamlTableRuleConfig.setLogicTable("foo_tbl");
+ result.getTables().put("foo_key", yamlTableRuleConfig);
+ result.setDefaultShardingColumn("foo_column");
+ return result;
}
-
+
private ShardingRuleAlgorithmProviderConfigurationYamlSwapper getSwapper() {
- return (ShardingRuleAlgorithmProviderConfigurationYamlSwapper) YamlRuleConfigurationSwapperFactory.getInstanceMapByRuleConfigurations(Collections.singletonList(ruleConfig)).get(ruleConfig);
- }
-
- private AlgorithmProvidedShardingRuleConfiguration createAlgorithmProvidedShardingRuleConfiguration() {
- AlgorithmProvidedShardingRuleConfiguration algorithmProvidedShardingRuleConfiguration = new AlgorithmProvidedShardingRuleConfiguration();
- ShardingTableRuleConfiguration shardingTableRuleConfiguration = new ShardingTableRuleConfiguration("foo_db");
- algorithmProvidedShardingRuleConfiguration.setTables(Collections.singletonList(shardingTableRuleConfiguration));
- ShardingAutoTableRuleConfiguration shardingAutoTableRuleConfiguration = new ShardingAutoTableRuleConfiguration("foo_db");
- algorithmProvidedShardingRuleConfiguration.setAutoTables(Collections.singletonList(shardingAutoTableRuleConfiguration));
- algorithmProvidedShardingRuleConfiguration.setBindingTableGroups(Collections.singletonList("foo_bind_tb"));
- algorithmProvidedShardingRuleConfiguration.setDefaultShardingColumn("foo_column");
- algorithmProvidedShardingRuleConfiguration.setScalingName("foo_scale_name");
- return algorithmProvidedShardingRuleConfiguration;
- }
-
- private YamlShardingRuleConfiguration createYamlShardingRuleConfiguration() {
- YamlShardingRuleConfiguration yamlShardingRuleConfiguration = new YamlShardingRuleConfiguration();
- Map<String, YamlTableRuleConfiguration> yamlTableRuleConfigurationMap = new HashMap<>();
- YamlTableRuleConfiguration yamlTableRuleConfiguration = new YamlTableRuleConfiguration();
- yamlTableRuleConfiguration.setLogicTable("foo_tbl");
- yamlTableRuleConfigurationMap.put("foo_key", yamlTableRuleConfiguration);
- yamlShardingRuleConfiguration.setTables(yamlTableRuleConfigurationMap);
- yamlShardingRuleConfiguration.setDefaultShardingColumn("foo_column");
- return yamlShardingRuleConfiguration;
+ AlgorithmProvidedShardingRuleConfiguration ruleConfig = mock(AlgorithmProvidedShardingRuleConfiguration.class);
+ return (ShardingRuleAlgorithmProviderConfigurationYamlSwapper) YamlRuleConfigurationSwapperFactory.getInstanceMapByRuleConfigurations(Collections.singleton(ruleConfig)).get(ruleConfig);
}
}