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 eb52764d061 Refactor YamlShadowDataSourceConfigurationSwapperTest and
YamlShadowTableConfigurationSwapperTest (#19951)
eb52764d061 is described below
commit eb52764d061661ac477bcc4abebf4ce0f8f442b9
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Aug 8 01:36:35 2022 +0800
Refactor YamlShadowDataSourceConfigurationSwapperTest and
YamlShadowTableConfigurationSwapperTest (#19951)
* Refactor YamlShadowDataSourceConfigurationSwapperTest
* Refactor YamlShadowTableConfigurationSwapperTest
---
.../table/YamlShadowTableConfigurationSwapper.java | 2 +-
...amlShadowDataSourceConfigurationSwapperTest.java} | 20 +++++++++-----------
.../YamlShadowTableConfigurationSwapperTest.java | 16 ++++++++--------
...hardingAutoTableRuleConfigurationSwapperTest.java | 2 +-
4 files changed, 19 insertions(+), 21 deletions(-)
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/yaml/swapper/table/YamlShadowTableConfigurationSwapper.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/yaml/swapper/table/YamlShadowTableConfigurationSwapper.java
index 5f5b2aad4d3..981713f7ef5 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/yaml/swapper/table/YamlShadowTableConfigurationSwapper.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/yaml/swapper/table/YamlShadowTableConfigurationSwapper.java
@@ -26,7 +26,7 @@ import java.util.LinkedList;
/**
* YAML shadow table configuration swapper.
*/
-public class YamlShadowTableConfigurationSwapper implements
YamlConfigurationSwapper<YamlShadowTableConfiguration,
ShadowTableConfiguration> {
+public final class YamlShadowTableConfigurationSwapper implements
YamlConfigurationSwapper<YamlShadowTableConfiguration,
ShadowTableConfiguration> {
@Override
public YamlShadowTableConfiguration swapToYamlConfiguration(final
ShadowTableConfiguration data) {
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/datasource/YamlShadowDataSourcePropertiesSwapperTest.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/datasource/YamlShadowDataSourceConfigurationSwapperTest.java
similarity index 59%
rename from
shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/datasource/YamlShadowDataSourcePropertiesSwapperTest.java
rename to
shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/datasource/YamlShadowDataSourceConfigurationSwapperTest.java
index 5cfaf069959..6653b64a0d0 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/datasource/YamlShadowDataSourcePropertiesSwapperTest.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/datasource/YamlShadowDataSourceConfigurationSwapperTest.java
@@ -24,25 +24,23 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-public final class YamlShadowDataSourcePropertiesSwapperTest {
+public final class YamlShadowDataSourceConfigurationSwapperTest {
@Test
public void assertSwapToYamlConfiguration() {
- ShadowDataSourceConfiguration shadowDataSourceConfig = new
ShadowDataSourceConfiguration("ds", "ds-shadow");
- YamlShadowDataSourceConfigurationSwapper swapper = new
YamlShadowDataSourceConfigurationSwapper();
- YamlShadowDataSourceConfiguration yamlConfig =
swapper.swapToYamlConfiguration(shadowDataSourceConfig);
- assertThat(shadowDataSourceConfig.getSourceDataSourceName(),
is(yamlConfig.getSourceDataSourceName()));
- assertThat(shadowDataSourceConfig.getShadowDataSourceName(),
is(yamlConfig.getShadowDataSourceName()));
+ ShadowDataSourceConfiguration shadowDataSourceConfig = new
ShadowDataSourceConfiguration("ds", "shadow_ds");
+ YamlShadowDataSourceConfiguration actual = new
YamlShadowDataSourceConfigurationSwapper().swapToYamlConfiguration(shadowDataSourceConfig);
+ assertThat(actual.getSourceDataSourceName(), is("ds"));
+ assertThat(actual.getShadowDataSourceName(), is("shadow_ds"));
}
@Test
public void assertSwapToObject() {
YamlShadowDataSourceConfiguration yamlConfig = new
YamlShadowDataSourceConfiguration();
- yamlConfig.setShadowDataSourceName("ds-shadow");
yamlConfig.setSourceDataSourceName("ds");
- YamlShadowDataSourceConfigurationSwapper swapper = new
YamlShadowDataSourceConfigurationSwapper();
- ShadowDataSourceConfiguration dataSourceConfig =
swapper.swapToObject(yamlConfig);
- assertThat(yamlConfig.getSourceDataSourceName(),
is(dataSourceConfig.getSourceDataSourceName()));
- assertThat(yamlConfig.getShadowDataSourceName(),
is(dataSourceConfig.getShadowDataSourceName()));
+ yamlConfig.setShadowDataSourceName("shadow_ds");
+ ShadowDataSourceConfiguration actual = new
YamlShadowDataSourceConfigurationSwapper().swapToObject(yamlConfig);
+ assertThat(actual.getSourceDataSourceName(), is("ds"));
+ assertThat(actual.getShadowDataSourceName(), is("shadow_ds"));
}
}
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/table/YamlShadowTableConfigurationSwapperTest.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/table/YamlShadowTableConfigurationSwapperTest.java
index 04dc6cbb1ea..e1d7ee0f0dd 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/table/YamlShadowTableConfigurationSwapperTest.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/table/YamlShadowTableConfigurationSwapperTest.java
@@ -31,19 +31,19 @@ public final class YamlShadowTableConfigurationSwapperTest {
@Test
public void assertSwapToYamlConfiguration() {
- ShadowTableConfiguration shadowTableConfig = new
ShadowTableConfiguration(Collections.singletonList("shadow-data-source"),
Arrays.asList("t_order", "t_user"));
- YamlShadowTableConfiguration yamlShadowTableConfig = new
YamlShadowTableConfigurationSwapper().swapToYamlConfiguration(shadowTableConfig);
- assertThat(yamlShadowTableConfig.getShadowAlgorithmNames(),
is(shadowTableConfig.getShadowAlgorithmNames()));
- assertThat(yamlShadowTableConfig.getDataSourceNames(),
is(shadowTableConfig.getDataSourceNames()));
+ YamlShadowTableConfiguration actual = new
YamlShadowTableConfigurationSwapper().swapToYamlConfiguration(
+ new
ShadowTableConfiguration(Collections.singleton("shadow-data-source"),
Arrays.asList("user-id-match-algorithm", "note-algorithm")));
+ assertThat(actual.getDataSourceNames(),
is(Collections.singleton("shadow-data-source")));
+ assertThat(actual.getShadowAlgorithmNames(),
is(Arrays.asList("user-id-match-algorithm", "note-algorithm")));
}
@Test
public void assertSwapToObject() {
YamlShadowTableConfiguration yamlConfig = new
YamlShadowTableConfiguration();
-
yamlConfig.setDataSourceNames(Collections.singletonList("shadow-data-source"));
+
yamlConfig.setDataSourceNames(Collections.singleton("shadow-data-source"));
yamlConfig.setShadowAlgorithmNames(Arrays.asList("user-id-match-algorithm",
"note-algorithm"));
- ShadowTableConfiguration shadowTableConfig = new
YamlShadowTableConfigurationSwapper().swapToObject(yamlConfig);
- assertThat(shadowTableConfig.getDataSourceNames(),
is(yamlConfig.getDataSourceNames()));
- assertThat(shadowTableConfig.getShadowAlgorithmNames(),
is(yamlConfig.getShadowAlgorithmNames()));
+ ShadowTableConfiguration actual = new
YamlShadowTableConfigurationSwapper().swapToObject(yamlConfig);
+ assertThat(actual.getDataSourceNames(),
is(Collections.singleton("shadow-data-source")));
+ assertThat(actual.getShadowAlgorithmNames(),
is(Arrays.asList("user-id-match-algorithm", "note-algorithm")));
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/rule/YamlShardingAutoTableRuleConfigurationSwapperTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/rule/YamlShardingAutoTableRuleConfigurationSwapperTest.java
index d5ed5e6011f..caa8a22a6e8 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/rule/YamlShardingAutoTableRuleConfigurationSwapperTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/rule/YamlShardingAutoTableRuleConfigurationSwapperTest.java
@@ -92,7 +92,7 @@ public final class
YamlShardingAutoTableRuleConfigurationSwapperTest {
public void assertSwapToObjectWithoutLogicTable() {
new
YamlShardingAutoTableRuleConfigurationSwapper(Collections.emptyMap(),
Collections.emptyMap()).swapToObject(new
YamlShardingAutoTableRuleConfiguration());
}
-
+
@Test
public void assertSwapToObject() {
YamlShardingStrategyConfiguration yamlShardingStrategyConfiguration =
new YamlShardingStrategyConfiguration();
