[shardingsphere] branch master updated: Refactor MetaDataPersistServiceTest (#23310)

[jianglongtao]

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 13d75900274 Refactor MetaDataPersistServiceTest (#23310)
13d75900274 is described below

commit 13d75900274b8f202d2d6711f5369a9031abbb6c
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Wed Jan 4 00:40:16 2023 +0800

    Refactor MetaDataPersistServiceTest (#23310)
---
 .../persist/MetaDataPersistServiceTest.java        | 32 ++++++++--------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git 
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
 
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
index f5ae7b7cbbd..d1d6013210d 100644
--- 
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
+++ 
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
@@ -93,8 +93,8 @@ public final class MetaDataPersistServiceTest {
     @Test
     public void assertConditionalPersistConfigurations() {
         Map<String, DataSource> dataSourceMap = createDataSourceMap();
-        Collection<RuleConfiguration> ruleConfigs = createRuleConfigurations();
-        Collection<RuleConfiguration> globalRuleConfigs = 
createGlobalRuleConfigurations();
+        Collection<RuleConfiguration> ruleConfigs = Collections.emptyList();
+        Collection<RuleConfiguration> globalRuleConfigs = 
Collections.emptyList();
         Properties props = PropertiesBuilder.build(new 
Property(ConfigurationPropertyKey.SQL_SHOW.getKey(), Boolean.FALSE.toString()));
         
metaDataPersistService.persistConfigurations(Collections.singletonMap("foo_db", 
new DataSourceProvidedDatabaseConfiguration(dataSourceMap, ruleConfigs)), 
globalRuleConfigs, props);
         verify(dataSourceService).conditionalPersist("foo_db", 
createDataSourcePropertiesMap(dataSourceMap));
@@ -108,6 +108,16 @@ public final class MetaDataPersistServiceTest {
                 Collectors.toMap(Entry::getKey, entry -> 
DataSourcePropertiesCreator.create(entry.getValue()), (oldValue, currentValue) 
-> oldValue, LinkedHashMap::new));
     }
     
+    @SuppressWarnings("unchecked")
+    @Test
+    public void assertGetEffectiveDataSources() {
+        Map<String, DataSource> dataSourceMap = createDataSourceMap();
+        Collection<RuleConfiguration> ruleConfigs = new 
YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(YamlEngine.unmarshal(readYAML(SCHEMA_RULE_YAML),
 Collection.class));
+        Map<String, DatabaseConfiguration> databaseConfigs = 
Collections.singletonMap("foo_db", new 
DataSourceProvidedDatabaseConfiguration(dataSourceMap, ruleConfigs));
+        Map<String, DataSource> resultEffectiveDataSources = 
metaDataPersistService.getEffectiveDataSources("foo_db", databaseConfigs);
+        assertTrue(resultEffectiveDataSources.isEmpty());
+    }
+    
     private Map<String, DataSource> createDataSourceMap() {
         Map<String, DataSource> result = new LinkedHashMap<>(2, 1);
         result.put("ds_0", createDataSource("ds_0"));
@@ -124,26 +134,8 @@ public final class MetaDataPersistServiceTest {
         return result;
     }
     
-    @SuppressWarnings("unchecked")
-    private Collection<RuleConfiguration> createRuleConfigurations() {
-        return new 
YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(YamlEngine.unmarshal(readYAML(SCHEMA_RULE_YAML),
 Collection.class));
-    }
-    
-    private Collection<RuleConfiguration> createGlobalRuleConfigurations() {
-        return Collections.emptyList();
-    }
-    
     @SneakyThrows({IOException.class, URISyntaxException.class})
     private String readYAML(final String yamlFile) {
         return 
Files.readAllLines(Paths.get(ClassLoader.getSystemResource(yamlFile).toURI())).stream().map(each
 -> each + System.lineSeparator()).collect(Collectors.joining());
     }
-    
-    @Test
-    public void assertGetEffectiveDataSources() {
-        Map<String, DataSource> dataSourceMap = createDataSourceMap();
-        Collection<RuleConfiguration> ruleConfigs = createRuleConfigurations();
-        Map<String, DatabaseConfiguration> databaseConfigs = 
Collections.singletonMap("foo_db", new 
DataSourceProvidedDatabaseConfiguration(dataSourceMap, ruleConfigs));
-        Map<String, DataSource> resultEffectiveDataSources = 
metaDataPersistService.getEffectiveDataSources("foo_db", databaseConfigs);
-        assertTrue(resultEffectiveDataSources.isEmpty());
-    }
 }