Keep DistSQLExecutor's test case consistent (#29892)

* Rename DropReadwriteSplittingRuleExecutor * Keep DistSQLExecutor's test case consistent
apache · Jan 28, 2024 · 2f1b09b · 2f1b09b
1 parent f32b968
commit 2f1b09b
Show file tree

Hide file tree

Showing 38 changed files with 80 additions and 85 deletions.
diff --git a/...oadcastTableRuleStatementUpdaterTest.java → ...CreateBroadcastTableRuleExecutorTest.java b/...oadcastTableRuleStatementUpdaterTest.java → ...CreateBroadcastTableRuleExecutorTest.java
@@ -35,7 +35,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-class CreateBroadcastTableRuleStatementUpdaterTest {
+class CreateBroadcastTableRuleExecutorTest {
 
     private final CreateBroadcastTableRuleExecutor executor = new CreateBroadcastTableRuleExecutor();
 

diff --git a/...oadcastTableRuleStatementUpdaterTest.java → ...e/DropBroadcastTableRuleExecutorTest.java b/...oadcastTableRuleStatementUpdaterTest.java → ...e/DropBroadcastTableRuleExecutorTest.java
@@ -33,7 +33,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-class DropBroadcastTableRuleStatementUpdaterTest {
+class DropBroadcastTableRuleExecutorTest {
 
     private final DropBroadcastTableRuleExecutor executor = new DropBroadcastTableRuleExecutor();
 

diff --git a/...AlterEncryptRuleStatementUpdaterTest.java → .../update/AlterEncryptRuleExecutorTest.java b/...AlterEncryptRuleStatementUpdaterTest.java → .../update/AlterEncryptRuleExecutorTest.java
@@ -46,7 +46,7 @@
 import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
 
-class AlterEncryptRuleStatementUpdaterTest {
+class AlterEncryptRuleExecutorTest {
 
     private final AlterEncryptRuleExecutor executor = new AlterEncryptRuleExecutor();
 

diff --git a/...reateEncryptRuleStatementUpdaterTest.java → ...update/CreateEncryptRuleExecutorTest.java b/...reateEncryptRuleStatementUpdaterTest.java → ...update/CreateEncryptRuleExecutorTest.java
@@ -47,7 +47,7 @@
 import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
 
-class CreateEncryptRuleStatementUpdaterTest {
+class CreateEncryptRuleExecutorTest {
 
     private final CreateEncryptRuleExecutor executor = new CreateEncryptRuleExecutor();
 

diff --git a/.../DropEncryptRuleStatementUpdaterTest.java → ...r/update/DropEncryptRuleExecutorTest.java b/.../DropEncryptRuleStatementUpdaterTest.java → ...r/update/DropEncryptRuleExecutorTest.java
@@ -43,7 +43,7 @@
 import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
 
-class DropEncryptRuleStatementUpdaterTest {
+class DropEncryptRuleExecutorTest {
 
     private final DropEncryptRuleExecutor executor = new DropEncryptRuleExecutor();
 

diff --git a/...te/AlterMaskRuleStatementUpdaterTest.java → ...ler/update/AlterMaskRuleExecutorTest.java b/...te/AlterMaskRuleStatementUpdaterTest.java → ...ler/update/AlterMaskRuleExecutorTest.java
@@ -41,7 +41,7 @@
 import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
 
-class AlterMaskRuleStatementUpdaterTest {
+class AlterMaskRuleExecutorTest {
 
     private final AlterMaskRuleExecutor executor = new AlterMaskRuleExecutor();
 

diff --git a/...e/CreateMaskRuleStatementUpdaterTest.java → ...er/update/CreateMaskRuleExecutorTest.java b/...e/CreateMaskRuleStatementUpdaterTest.java → ...er/update/CreateMaskRuleExecutorTest.java
@@ -42,7 +42,7 @@
 import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
 
-class CreateMaskRuleStatementUpdaterTest {
+class CreateMaskRuleExecutorTest {
 
     private final CreateMaskRuleExecutor executor = new CreateMaskRuleExecutor();
 

diff --git a/...ate/DropMaskRuleStatementUpdaterTest.java → ...dler/update/DropMaskRuleExecutorTest.java b/...ate/DropMaskRuleStatementUpdaterTest.java → ...dler/update/DropMaskRuleExecutorTest.java
@@ -38,7 +38,7 @@
 import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
 
-class DropMaskRuleStatementUpdaterTest {
+class DropMaskRuleExecutorTest {
 
     private final DropMaskRuleExecutor executor = new DropMaskRuleExecutor();
 

diff --git a/...iteSplittingRuleStatementUpdaterTest.java → ...erReadwriteSplittingRuleExecutorTest.java b/...iteSplittingRuleStatementUpdaterTest.java → ...erReadwriteSplittingRuleExecutorTest.java
@@ -48,7 +48,7 @@
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
-class AlterReadwriteSplittingRuleStatementUpdaterTest {
+class AlterReadwriteSplittingRuleExecutorTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private ShardingSphereDatabase database;

diff --git a/...iteSplittingRuleStatementUpdaterTest.java → ...teReadwriteSplittingRuleExecutorTest.java b/...iteSplittingRuleStatementUpdaterTest.java → ...teReadwriteSplittingRuleExecutorTest.java
@@ -54,7 +54,7 @@
 
 @ExtendWith(AutoMockExtension.class)
 @StaticMockSettings(TypedSPILoader.class)
-class CreateReadwriteSplittingRuleStatementUpdaterTest {
+class CreateReadwriteSplittingRuleExecutorTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private ShardingSphereDatabase database;

diff --git a/...iteSplittingRuleStatementUpdaterTest.java → ...opReadwriteSplittingRuleExecutorTest.java b/...iteSplittingRuleStatementUpdaterTest.java → ...opReadwriteSplittingRuleExecutorTest.java
@@ -51,7 +51,7 @@
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
-class DropReadwriteSplittingRuleStatementUpdaterTest {
+class DropReadwriteSplittingRuleExecutorTest {
 
     private final DropReadwriteSplittingRuleExecutor executor = new DropReadwriteSplittingRuleExecutor();
 

diff --git a/...tShadowAlgorithmStatementUpdaterTest.java → ...erDefaultShadowAlgorithmExecutorTest.java b/...tShadowAlgorithmStatementUpdaterTest.java → ...erDefaultShadowAlgorithmExecutorTest.java
@@ -45,7 +45,7 @@
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
-class AlterDefaultShadowAlgorithmStatementUpdaterTest {
+class AlterDefaultShadowAlgorithmExecutorTest {
 
     private final AlterDefaultShadowAlgorithmExecutor executor = new AlterDefaultShadowAlgorithmExecutor();
 

diff --git a/.../AlterShadowRuleStatementUpdaterTest.java → ...l/update/AlterShadowRuleExecutorTest.java b/.../AlterShadowRuleStatementUpdaterTest.java → ...l/update/AlterShadowRuleExecutorTest.java
@@ -55,16 +55,16 @@
 
 @ExtendWith(MockitoExtension.class)
 @MockitoSettings(strictness = Strictness.LENIENT)
-class AlterShadowRuleStatementUpdaterTest {
+class AlterShadowRuleExecutorTest {
+
+    private final AlterShadowRuleExecutor executor = new AlterShadowRuleExecutor();
 
     @Mock
     private ResourceMetaData resourceMetaData;
 
     @Mock
     private ShadowRuleConfiguration currentConfig;
 
-    private final AlterShadowRuleExecutor executor = new AlterShadowRuleExecutor();
-
     @BeforeEach
     void setUp() {
         Collection<ShadowDataSourceConfiguration> shadowDataSource = new LinkedList<>();

diff --git a/...tShadowAlgorithmStatementUpdaterTest.java → ...teDefaultShadowAlgorithmExecutorTest.java b/...tShadowAlgorithmStatementUpdaterTest.java → ...teDefaultShadowAlgorithmExecutorTest.java
@@ -38,7 +38,7 @@
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
-class CreateDefaultShadowAlgorithmStatementUpdaterTest {
+class CreateDefaultShadowAlgorithmExecutorTest {
 
     private final CreateDefaultShadowAlgorithmExecutor executor = new CreateDefaultShadowAlgorithmExecutor();
 

diff --git a/...CreateShadowRuleStatementUpdaterTest.java → .../update/CreateShadowRuleExecutorTest.java b/...CreateShadowRuleStatementUpdaterTest.java → .../update/CreateShadowRuleExecutorTest.java
@@ -52,7 +52,9 @@
 
 @ExtendWith(MockitoExtension.class)
 @MockitoSettings(strictness = Strictness.LENIENT)
-class CreateShadowRuleStatementUpdaterTest {
+class CreateShadowRuleExecutorTest {
+
+    private final CreateShadowRuleExecutor executor = new CreateShadowRuleExecutor();
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private ShardingSphereDatabase database;
@@ -63,8 +65,6 @@ class CreateShadowRuleStatementUpdaterTest {
     @Mock
     private ShadowRuleConfiguration currentConfig;
 
-    private final CreateShadowRuleExecutor executor = new CreateShadowRuleExecutor();
-
     @BeforeEach
     void setUp() {
         when(database.getResourceMetaData()).thenReturn(resourceMetaData);

diff --git a/...tShadowAlgorithmStatementUpdaterTest.java → ...opDefaultShadowAlgorithmExecutorTest.java b/...tShadowAlgorithmStatementUpdaterTest.java → ...opDefaultShadowAlgorithmExecutorTest.java
@@ -36,7 +36,7 @@
 import static org.mockito.Mockito.mock;
 
 @ExtendWith(MockitoExtension.class)
-class DropDefaultShadowAlgorithmStatementUpdaterTest {
+class DropDefaultShadowAlgorithmExecutorTest {
 
     private final DropDefaultShadowAlgorithmExecutor executor = new DropDefaultShadowAlgorithmExecutor();
 

diff --git a/...pShadowAlgorithmStatementUpdaterTest.java → ...date/DropShadowAlgorithmExecutorTest.java b/...pShadowAlgorithmStatementUpdaterTest.java → ...date/DropShadowAlgorithmExecutorTest.java
@@ -33,7 +33,7 @@
 import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
 
-class DropShadowAlgorithmStatementUpdaterTest {
+class DropShadowAlgorithmExecutorTest {
 
     private final DropShadowAlgorithmExecutor executor = new DropShadowAlgorithmExecutor();
 

diff --git a/...e/DropShadowRuleStatementUpdaterTest.java → ...ql/update/DropShadowRuleExecutorTest.java b/...e/DropShadowRuleStatementUpdaterTest.java → ...ql/update/DropShadowRuleExecutorTest.java
@@ -40,7 +40,7 @@
 import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
 
-class DropShadowRuleStatementUpdaterTest {
+class DropShadowRuleExecutorTest {
 
     private final DropShadowRuleExecutor executor = new DropShadowRuleExecutor();
 

diff --git a/...ShardingStrategyStatementUpdaterTest.java → ...rDefaultShardingStrategyExecutorTest.java b/...ShardingStrategyStatementUpdaterTest.java → ...rDefaultShardingStrategyExecutorTest.java
@@ -41,7 +41,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-class AlterDefaultShardingStrategyStatementUpdaterTest {
+class AlterDefaultShardingStrategyExecutorTest {
 
     private final AlterDefaultShardingStrategyExecutor executor = new AlterDefaultShardingStrategyExecutor();
 

diff --git a/...bleReferenceRuleStatementUpdaterTest.java → ...ardingTableReferenceRuleExecutorTest.java b/...bleReferenceRuleStatementUpdaterTest.java → ...ardingTableReferenceRuleExecutorTest.java
@@ -36,7 +36,7 @@
 import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
 
-class AlterShardingTableReferenceRuleStatementUpdaterTest {
+class AlterShardingTableReferenceRuleExecutorTest {
 
     private final AlterShardingTableReferenceRuleExecutor executor = new AlterShardingTableReferenceRuleExecutor();
 

diff --git a/...hardingTableRuleStatementUpdaterTest.java → ...e/AlterShardingTableRuleExecutorTest.java b/...hardingTableRuleStatementUpdaterTest.java → ...e/AlterShardingTableRuleExecutorTest.java
@@ -53,14 +53,14 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-class AlterShardingTableRuleStatementUpdaterTest {
+class AlterShardingTableRuleExecutorTest {
+
+    private final AlterShardingTableRuleExecutor executor = new AlterShardingTableRuleExecutor();
 
     private final ShardingRuleConfiguration currentRuleConfig = createCurrentShardingRuleConfiguration();
 
     private final ResourceMetaData resourceMetaData = new ResourceMetaData(createDataSource());
 
-    private final AlterShardingTableRuleExecutor executor = new AlterShardingTableRuleExecutor();
-
     @BeforeEach
     void setUp() {
         ShardingSphereDatabase database = mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);

diff --git a/...ShardingStrategyStatementUpdaterTest.java → ...eDefaultShardingStrategyExecutorTest.java b/...ShardingStrategyStatementUpdaterTest.java → ...eDefaultShardingStrategyExecutorTest.java
@@ -41,7 +41,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-class CreateDefaultShardingStrategyStatementUpdaterTest {
+class CreateDefaultShardingStrategyExecutorTest {
 
     private final CreateDefaultShardingStrategyExecutor executor = new CreateDefaultShardingStrategyExecutor();
 

diff --git a/...bleReferenceRuleStatementUpdaterTest.java → ...ardingTableReferenceRuleExecutorTest.java b/...bleReferenceRuleStatementUpdaterTest.java → ...ardingTableReferenceRuleExecutorTest.java
@@ -39,7 +39,7 @@
 import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
 
-class CreateShardingTableReferenceRuleStatementUpdaterTest {
+class CreateShardingTableReferenceRuleExecutorTest {
 
     private final CreateShardingTableReferenceRuleExecutor executor = new CreateShardingTableReferenceRuleExecutor();
 

diff --git a/...hardingTableRuleStatementUpdaterTest.java → .../CreateShardingTableRuleExecutorTest.java b/...hardingTableRuleStatementUpdaterTest.java → .../CreateShardingTableRuleExecutorTest.java
@@ -68,12 +68,12 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-class CreateShardingTableRuleStatementUpdaterTest {
-
-    private final ShardingRuleConfiguration currentRuleConfig = createCurrentShardingRuleConfiguration();
+class CreateShardingTableRuleExecutorTest {
 
     private final CreateShardingTableRuleExecutor executor = new CreateShardingTableRuleExecutor();
 
+    private final ShardingRuleConfiguration currentRuleConfig = createCurrentShardingRuleConfiguration();
+
     @BeforeEach
     void before() {
         ShardingSphereDatabase database = mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);

diff --git a/...ShardingStrategyStatementUpdaterTest.java → ...pDefaultShardingStrategyExecutorTest.java b/...ShardingStrategyStatementUpdaterTest.java → ...pDefaultShardingStrategyExecutorTest.java
@@ -40,7 +40,7 @@
 import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
 
-class DropDefaultShardingStrategyStatementUpdaterTest {
+class DropDefaultShardingStrategyExecutorTest {
 
     private final DropDefaultShardingStrategyExecutor executor = new DropDefaultShardingStrategyExecutor();
 

diff --git a/...hardingAlgorithmStatementUpdaterTest.java → ...te/DropShardingAlgorithmExecutorTest.java b/...hardingAlgorithmStatementUpdaterTest.java → ...te/DropShardingAlgorithmExecutorTest.java
@@ -27,10 +27,9 @@
 import org.apache.shardingsphere.sharding.api.config.strategy.sharding.StandardShardingStrategyConfiguration;
 import org.apache.shardingsphere.sharding.distsql.handler.update.DropShardingAlgorithmExecutor;
 import org.apache.shardingsphere.sharding.distsql.statement.DropShardingAlgorithmStatement;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import java.util.Collections;
@@ -41,49 +40,47 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
 
 @ExtendWith(MockitoExtension.class)
-class DropShardingAlgorithmStatementUpdaterTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private ShardingSphereDatabase database;
+class DropShardingAlgorithmExecutorTest {
 
     private final DropShardingAlgorithmExecutor executor = new DropShardingAlgorithmExecutor();
 
+    @BeforeEach
+    void setUp() {
+        executor.setDatabase(mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS));
+    }
+
     @Test
     void assertCheckSQLStatementWithoutCurrentRule() throws RuleDefinitionViolationException {
-        executor.setDatabase(database);
         assertThrows(MissingRequiredAlgorithmException.class, () -> executor.checkBeforeUpdate(new DropShardingAlgorithmStatement(false, Collections.emptyList()), null));
     }
 
     @Test
     void assertCheckSQLStatementWithoutCurrentRuleWithIfExists() throws RuleDefinitionViolationException {
         DropShardingAlgorithmStatement dropShardingAlgorithmStatement = new DropShardingAlgorithmStatement(true, Collections.emptyList());
-        executor.setDatabase(database);
         executor.checkBeforeUpdate(dropShardingAlgorithmStatement, null);
     }
 
     @Test
     void assertCheckSQLStatementWithoutExistedAlgorithm() throws RuleDefinitionViolationException {
-        executor.setDatabase(database);
         assertThrows(MissingRequiredAlgorithmException.class, () -> executor.checkBeforeUpdate(createSQLStatement("t_order"), new ShardingRuleConfiguration()));
     }
 
     @Test
     void assertCheckSQLStatementWithoutExistedAlgorithmWithIfExists() throws RuleDefinitionViolationException {
-        executor.setDatabase(database);
         executor.checkBeforeUpdate(createSQLStatementWithIfExists("t_order"), new ShardingRuleConfiguration());
     }
 
     @Test
     void assertCheckSQLStatementWithBindingTableRule() throws RuleDefinitionViolationException {
-        executor.setDatabase(database);
         assertThrows(AlgorithmInUsedException.class, () -> executor.checkBeforeUpdate(createSQLStatement("t_order_tb_inline"), createCurrentRuleConfiguration()));
     }
 
     @Test
     void assertCheckSQLStatementWithBindingTableRuleWithIfExists() throws RuleDefinitionViolationException {
-        executor.setDatabase(database);
         assertThrows(AlgorithmInUsedException.class, () -> executor.checkBeforeUpdate(createSQLStatementWithIfExists("t_order_tb_inline"), createCurrentRuleConfiguration()));
     }
 

diff --git a/...pShardingAuditorStatementUpdaterTest.java → ...date/DropShardingAuditorExecutorTest.java b/...pShardingAuditorStatementUpdaterTest.java → ...date/DropShardingAuditorExecutorTest.java
@@ -39,7 +39,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-class DropShardingAuditorStatementUpdaterTest {
+class DropShardingAuditorExecutorTest {
 
     private final DropShardingAuditorExecutor executor = new DropShardingAuditorExecutor();
 

diff --git a/...dingKeyGeneratorStatementUpdaterTest.java → ...DropShardingKeyGeneratorExecutorTest.java b/...dingKeyGeneratorStatementUpdaterTest.java → ...DropShardingKeyGeneratorExecutorTest.java
@@ -37,7 +37,7 @@
 import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
 
-class DropShardingKeyGeneratorStatementUpdaterTest {
+class DropShardingKeyGeneratorExecutorTest {
 
     private final DropShardingKeyGeneratorExecutor executor = new DropShardingKeyGeneratorExecutor();
 

diff --git a/...bleReferenceRuleStatementUpdaterTest.java → ...opShardingTableReferenceExecutorTest.java b/...bleReferenceRuleStatementUpdaterTest.java → ...opShardingTableReferenceExecutorTest.java
@@ -39,7 +39,7 @@
 import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
 
-class DropShardingTableReferenceRuleStatementUpdaterTest {
+class DropShardingTableReferenceExecutorTest {
 
     private final DropShardingTableReferenceExecutor executor = new DropShardingTableReferenceExecutor();
 

diff --git a/...hardingTableRuleStatementUpdaterTest.java → ...te/DropShardingTableRuleExecutorTest.java b/...hardingTableRuleStatementUpdaterTest.java → ...te/DropShardingTableRuleExecutorTest.java
@@ -50,7 +50,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 
-class DropShardingTableRuleStatementUpdaterTest {
+class DropShardingTableRuleExecutorTest {
 
     private final DropShardingTableRuleExecutor executor = new DropShardingTableRuleExecutor();