[shardingsphere] branch master updated: Refactor ShardingSphereDatabaseTest (#18888)

[duanzhengqiang]

This is an automated email from the ASF dual-hosted git repository.

duanzhengqiang 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 1b4b5ef99e6 Refactor ShardingSphereDatabaseTest (#18888)
1b4b5ef99e6 is described below

commit 1b4b5ef99e6a19c0f214618e5f935dd96c5a19fa
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Wed Jul 6 14:12:15 2022 +0800

    Refactor ShardingSphereDatabaseTest (#18888)
---
 .../database/ShardingSphereDatabaseTest.java       | 25 +++++++++++-----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git 
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabaseTest.java
 
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabaseTest.java
index c48aa11efdb..f7b20a163a8 100644
--- 
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabaseTest.java
+++ 
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabaseTest.java
@@ -17,11 +17,6 @@
 
 package org.apache.shardingsphere.infra.metadata.database;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import java.util.Collection;
-import java.util.Collections;
 import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
 import org.apache.shardingsphere.infra.database.type.DatabaseType;
 import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
@@ -35,11 +30,16 @@ import 
org.apache.shardingsphere.infra.rule.ShardingSphereRule;
 import org.apache.shardingsphere.test.mock.MockedDataSource;
 import org.junit.Test;
 
-public final class ShardingSphereDatabaseTest {
+import java.util.Collection;
+import java.util.Collections;
 
-    private final ModeConfiguration modeConfig = new 
ModeConfiguration("Memory", null, false);
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
 
-    private final LockContext lockContext = mock(LockContext.class);
+public final class ShardingSphereDatabaseTest {
+    
+    private final ModeConfiguration modeConfig = new 
ModeConfiguration("Memory", null, false);
     
     @Test
     public void assertIsComplete() {
@@ -61,16 +61,15 @@ public final class ShardingSphereDatabaseTest {
         ShardingSphereRuleMetaData ruleMetaData = new 
ShardingSphereRuleMetaData(Collections.singleton(mock(ShardingSphereRule.class)));
         assertFalse(new ShardingSphereDatabase("foo_db", 
mock(DatabaseType.class), resource, ruleMetaData, 
Collections.emptyMap()).isComplete());
     }
-
+    
     @Test
     public void assertReloadRules() {
         ShardingSphereResource resource = new 
ShardingSphereResource(Collections.singletonMap("ds", new MockedDataSource()));
         ShardingSphereRuleMetaData ruleMetaData = new 
ShardingSphereRuleMetaData(Collections.emptyList());
-        InstanceContext context = new InstanceContext(new 
ComputeNodeInstance(mock(InstanceMetaData.class)), new 
WorkerIdGeneratorFixture(Long.MIN_VALUE), modeConfig, lockContext);
-        ShardingSphereDatabase sphereDatabase = new 
ShardingSphereDatabase("foo_db", mock(DatabaseType.class), resource, 
ruleMetaData, Collections.emptyMap());
-        Collection<ShardingSphereRule> rules = 
sphereDatabase.getRuleMetaData().getRules();
+        ShardingSphereDatabase database = new ShardingSphereDatabase("foo_db", 
mock(DatabaseType.class), resource, ruleMetaData, Collections.emptyMap());
+        Collection<ShardingSphereRule> rules = 
database.getRuleMetaData().getRules();
         assertTrue(rules.isEmpty());
-        sphereDatabase.reloadRules(context);
+        database.reloadRules(new InstanceContext(new 
ComputeNodeInstance(mock(InstanceMetaData.class)), new 
WorkerIdGeneratorFixture(Long.MIN_VALUE), modeConfig, mock(LockContext.class)));
         assertFalse(rules.isEmpty());
     }
 }