Refactor ReadwriteSplittingDataSourceMapperRuleAttributeTest (#33540)

apache · Nov 4, 2024 · 894f236 · 894f236
1 parent 5dedd28
commit 894f236
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/...eadwritesplitting/rule/attribute/ReadwriteSplittingDataSourceMapperRuleAttributeTest.java b/...eadwritesplitting/rule/attribute/ReadwriteSplittingDataSourceMapperRuleAttributeTest.java
@@ -33,13 +33,14 @@ class ReadwriteSplittingDataSourceMapperRuleAttributeTest {
 
     @Test
     void assertGetDataSourceMapper() {
-        Map<String, Collection<String>> actual = new ReadwriteSplittingDataSourceMapperRuleAttribute(Collections.singleton(createDataSourceGroupRule())).getDataSourceMapper();
+        Map<String, Collection<String>> actual = createRuleAttribute().getDataSourceMapper();
         Map<String, Collection<String>> expected = Collections.singletonMap("readwrite", Arrays.asList("write_ds", "read_ds_0", "read_ds_1"));
         assertThat(actual, is(expected));
     }
 
-    private ReadwriteSplittingDataSourceGroupRule createDataSourceGroupRule() {
-        return new ReadwriteSplittingDataSourceGroupRule(
+    private ReadwriteSplittingDataSourceMapperRuleAttribute createRuleAttribute() {
+        ReadwriteSplittingDataSourceGroupRule dataSourceGroupRule = new ReadwriteSplittingDataSourceGroupRule(
                 new ReadwriteSplittingDataSourceGroupRuleConfiguration("readwrite", "write_ds", Arrays.asList("read_ds_0", "read_ds_1"), "random"), null, null);
+        return new ReadwriteSplittingDataSourceMapperRuleAttribute(Collections.singleton(dataSourceGroupRule));
     }
 }
diff --git a/.../apache/shardingsphere/shadow/rule/attribute/ShadowDataSourceMapperRuleAttributeTest.java b/.../apache/shardingsphere/shadow/rule/attribute/ShadowDataSourceMapperRuleAttributeTest.java
@@ -21,6 +21,7 @@
 import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 
@@ -31,8 +32,13 @@ class ShadowDataSourceMapperRuleAttributeTest {
 
     @Test
     void assertGetDataSourceMapper() {
+        Map<String, Collection<String>> actual = createRuleAttribute().getDataSourceMapper();
+        Map<String, Collection<String>> expected = Collections.singletonMap("foo_ds", Arrays.asList("prod_ds", "shadow_ds"));
+        assertThat(actual, is(expected));
+    }
+
+    ShadowDataSourceMapperRuleAttribute createRuleAttribute() {
         Map<String, ShadowDataSourceRule> dataSourceRules = Collections.singletonMap("foo_ds", new ShadowDataSourceRule("prod_ds", "shadow_ds"));
-        ShadowDataSourceMapperRuleAttribute attribute = new ShadowDataSourceMapperRuleAttribute(dataSourceRules);
-        assertThat(attribute.getDataSourceMapper(), is(Collections.singletonMap("foo_ds", Arrays.asList("prod_ds", "shadow_ds"))));
+        return new ShadowDataSourceMapperRuleAttribute(dataSourceRules);
     }
 }