This is an automated email from the ASF dual-hosted git repository.
wuweijie 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 9f6d0bee8fb Refactor YamlMaskDataNodeRuleConfigurationSwapperTest
(#30592)
9f6d0bee8fb is described below
commit 9f6d0bee8fb25ba43ed6ad4323749c036da3a2e5
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Mar 21 23:23:24 2024 +0800
Refactor YamlMaskDataNodeRuleConfigurationSwapperTest (#30592)
---
.../mask/rule/builder/MaskRuleBuilderTest.java | 4 +-
...mlMaskDataNodeRuleConfigurationSwapperTest.java | 44 +++++++++++-----------
...YamlMaskColumnRuleConfigurationSwapperTest.java | 8 +---
3 files changed, 25 insertions(+), 31 deletions(-)
diff --git
a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/rule/builder/MaskRuleBuilderTest.java
b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/rule/builder/MaskRuleBuilderTest.java
index 997e3b46024..a17f2bf5496 100644
---
a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/rule/builder/MaskRuleBuilderTest.java
+++
b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/rule/builder/MaskRuleBuilderTest.java
@@ -33,11 +33,11 @@ import static org.mockito.Mockito.mock;
class MaskRuleBuilderTest {
- @SuppressWarnings({"rawtypes", "unchecked"})
+ @SuppressWarnings("unchecked")
@Test
void assertBuild() {
MaskRuleConfiguration ruleConfig = mock(MaskRuleConfiguration.class);
- DatabaseRuleBuilder builder =
OrderedSPILoader.getServices(DatabaseRuleBuilder.class,
Collections.singleton(ruleConfig)).get(ruleConfig);
+ DatabaseRuleBuilder<MaskRuleConfiguration> builder =
OrderedSPILoader.getServices(DatabaseRuleBuilder.class,
Collections.singleton(ruleConfig)).get(ruleConfig);
assertThat(builder.build(ruleConfig, "", new MySQLDatabaseType(),
Collections.emptyMap(), Collections.emptyList(), mock(InstanceContext.class)),
instanceOf(MaskRule.class));
}
}
diff --git
a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/yaml/swapper/YamlMaskDataNodeRuleConfigurationSwapperTest.java
b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/yaml/swapper/YamlMaskDataNodeRuleConfigurationSwapperTest.java
index d37658ba060..1dacb0371d9 100644
---
a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/yaml/swapper/YamlMaskDataNodeRuleConfigurationSwapperTest.java
+++
b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/yaml/swapper/YamlMaskDataNodeRuleConfigurationSwapperTest.java
@@ -28,43 +28,40 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedList;
+import java.util.Optional;
import java.util.Properties;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
class YamlMaskDataNodeRuleConfigurationSwapperTest {
- private final YamlMaskDataNodeRuleConfigurationSwapper swapper = new
YamlMaskDataNodeRuleConfigurationSwapper();
-
@Test
- void assertSwapEmptyConfigToDataNodes() {
- MaskRuleConfiguration config = new
MaskRuleConfiguration(Collections.emptyList(), Collections.emptyMap());
- Collection<YamlDataNode> result = swapper.swapToDataNodes(config);
- assertThat(result.size(), is(0));
+ void assertSwapEmptyConfigurationToDataNodes() {
+ assertTrue(new
YamlMaskDataNodeRuleConfigurationSwapper().swapToDataNodes(new
MaskRuleConfiguration(Collections.emptyList(),
Collections.emptyMap())).isEmpty());
}
@Test
- void assertSwapFullConfigToDataNodes() {
+ void assertSwapFullConfigurationToDataNodes() {
MaskRuleConfiguration config = createMaximumMaskRule();
- Collection<YamlDataNode> result = swapper.swapToDataNodes(config);
- assertThat(result.size(), is(2));
- Iterator<YamlDataNode> iterator = result.iterator();
+ Collection<YamlDataNode> actual = new
YamlMaskDataNodeRuleConfigurationSwapper().swapToDataNodes(config);
+ assertThat(actual.size(), is(2));
+ Iterator<YamlDataNode> iterator = actual.iterator();
assertThat(iterator.next().getKey(), is("mask_algorithms/FIXTURE"));
assertThat(iterator.next().getKey(), is("tables/foo"));
}
private MaskRuleConfiguration createMaximumMaskRule() {
- Collection<MaskTableRuleConfiguration> tables = new LinkedList<>();
- tables.add(new MaskTableRuleConfiguration("foo",
Collections.singleton(new MaskColumnRuleConfiguration("foo_column",
"FIXTURE"))));
+ Collection<MaskTableRuleConfiguration> tables = Collections.singleton(
+ new MaskTableRuleConfiguration("foo",
Collections.singleton(new MaskColumnRuleConfiguration("foo_column",
"FIXTURE"))));
return new MaskRuleConfiguration(tables,
Collections.singletonMap("FIXTURE", new AlgorithmConfiguration("FIXTURE", new
Properties())));
}
@Test
void assertSwapToObjectEmpty() {
- Collection<YamlDataNode> config = new LinkedList<>();
- assertFalse(swapper.swapToObject(config).isPresent());
+ assertFalse(new
YamlMaskDataNodeRuleConfigurationSwapper().swapToObject(new
LinkedList<>()).isPresent());
}
@Test
@@ -76,14 +73,15 @@ class YamlMaskDataNodeRuleConfigurationSwapperTest {
+ " maskAlgorithm: FIXTURE\n"
+ "name: foo\n"));
config.add(new
YamlDataNode("/metadata/foo_db/rules/mask/mask_algorithms/FIXTURE/versions/0",
"type: FIXTURE\n"));
- MaskRuleConfiguration result = swapper.swapToObject(config).get();
- assertThat(result.getTables().size(), is(1));
- assertThat(result.getTables().iterator().next().getName(), is("foo"));
- assertThat(result.getTables().iterator().next().getColumns().size(),
is(1));
-
assertThat(result.getTables().iterator().next().getColumns().iterator().next().getLogicColumn(),
is("foo_column"));
-
assertThat(result.getTables().iterator().next().getColumns().iterator().next().getMaskAlgorithm(),
is("FIXTURE"));
- assertThat(result.getMaskAlgorithms().size(), is(1));
- assertThat(result.getMaskAlgorithms().get("FIXTURE").getType(),
is("FIXTURE"));
-
assertThat(result.getMaskAlgorithms().get("FIXTURE").getProps().size(), is(0));
+ Optional<MaskRuleConfiguration> actual = new
YamlMaskDataNodeRuleConfigurationSwapper().swapToObject(config);
+ assertTrue(actual.isPresent());
+ assertThat(actual.get().getTables().size(), is(1));
+ assertThat(actual.get().getTables().iterator().next().getName(),
is("foo"));
+
assertThat(actual.get().getTables().iterator().next().getColumns().size(),
is(1));
+
assertThat(actual.get().getTables().iterator().next().getColumns().iterator().next().getLogicColumn(),
is("foo_column"));
+
assertThat(actual.get().getTables().iterator().next().getColumns().iterator().next().getMaskAlgorithm(),
is("FIXTURE"));
+ assertThat(actual.get().getMaskAlgorithms().size(), is(1));
+ assertThat(actual.get().getMaskAlgorithms().get("FIXTURE").getType(),
is("FIXTURE"));
+
assertThat(actual.get().getMaskAlgorithms().get("FIXTURE").getProps().size(),
is(0));
}
}
diff --git
a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/yaml/swapper/rule/YamlMaskColumnRuleConfigurationSwapperTest.java
b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/yaml/swapper/rule/YamlMaskColumnRuleConfigurationSwapperTest.java
index 4a3aa030d4a..34a46e75b13 100644
---
a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/yaml/swapper/rule/YamlMaskColumnRuleConfigurationSwapperTest.java
+++
b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/yaml/swapper/rule/YamlMaskColumnRuleConfigurationSwapperTest.java
@@ -28,21 +28,17 @@ class YamlMaskColumnRuleConfigurationSwapperTest {
@Test
void assertSwapToYamlConfiguration() {
- YamlMaskColumnRuleConfigurationSwapper swapper = new
YamlMaskColumnRuleConfigurationSwapper();
- MaskColumnRuleConfiguration encryptColumnRuleConfig =
- new MaskColumnRuleConfiguration("logicColumn", "md5_mask");
- YamlMaskColumnRuleConfiguration actual =
swapper.swapToYamlConfiguration(encryptColumnRuleConfig);
+ YamlMaskColumnRuleConfiguration actual = new
YamlMaskColumnRuleConfigurationSwapper().swapToYamlConfiguration(new
MaskColumnRuleConfiguration("logicColumn", "md5_mask"));
assertThat(actual.getLogicColumn(), is("logicColumn"));
assertThat(actual.getMaskAlgorithm(), is("md5_mask"));
}
@Test
void assertSwapToObject() {
- YamlMaskColumnRuleConfigurationSwapper swapper = new
YamlMaskColumnRuleConfigurationSwapper();
YamlMaskColumnRuleConfiguration yamlMaskColumnRuleConfig = new
YamlMaskColumnRuleConfiguration();
yamlMaskColumnRuleConfig.setLogicColumn("logicColumn");
yamlMaskColumnRuleConfig.setMaskAlgorithm("md5_mask");
- MaskColumnRuleConfiguration actual =
swapper.swapToObject(yamlMaskColumnRuleConfig);
+ MaskColumnRuleConfiguration actual = new
YamlMaskColumnRuleConfigurationSwapper().swapToObject(yamlMaskColumnRuleConfig);
assertThat(actual.getLogicColumn(), is("logicColumn"));
assertThat(actual.getMaskAlgorithm(), is("md5_mask"));
}
