(shardingsphere) branch master updated: Refactor ShardingParameterRewritersRegistryTest and EncryptParameterRewritersRegistryTest (#33618)

[zhangliang]

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

zhangliang 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 a6bc09bc339 Refactor ShardingParameterRewritersRegistryTest and 
EncryptParameterRewritersRegistryTest (#33618)
a6bc09bc339 is described below

commit a6bc09bc3391ce07547e6caa37b1b9fc95293a85
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Tue Nov 12 01:11:55 2024 +0800

    Refactor ShardingParameterRewritersRegistryTest and 
EncryptParameterRewritersRegistryTest (#33618)
---
 .../rewrite/parameter/EncryptParameterRewritersRegistryTest.java | 9 +--------
 .../parameter/ShardingParameterRewritersRegistryTest.java        | 5 -----
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git 
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewritersRegistryTest.java
 
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewritersRegistryTest.java
index 9854425abd3..3fd62697982 100644
--- 
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewritersRegistryTest.java
+++ 
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewritersRegistryTest.java
@@ -23,7 +23,6 @@ import 
org.apache.shardingsphere.encrypt.rewrite.parameter.rewriter.EncryptInser
 import 
org.apache.shardingsphere.encrypt.rewrite.parameter.rewriter.EncryptInsertValueParameterRewriter;
 import 
org.apache.shardingsphere.encrypt.rewrite.parameter.rewriter.EncryptPredicateParameterRewriter;
 import org.apache.shardingsphere.encrypt.rule.EncryptRule;
-import 
org.apache.shardingsphere.infra.binder.context.statement.dml.SelectStatementContext;
 import org.apache.shardingsphere.infra.database.core.DefaultDatabase;
 import 
org.apache.shardingsphere.infra.rewrite.parameter.rewriter.ParameterRewriter;
 import org.junit.jupiter.api.Test;
@@ -35,19 +34,13 @@ import java.util.List;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 class EncryptParameterRewritersRegistryTest {
     
     @Test
     void assertGetParameterRewriters() {
-        EncryptRule rule = mock(EncryptRule.class, RETURNS_DEEP_STUBS);
-        when(rule.findEncryptTable("foo_tbl").isPresent()).thenReturn(true);
-        SelectStatementContext sqlStatementContext = 
mock(SelectStatementContext.class, RETURNS_DEEP_STUBS);
-        
when(sqlStatementContext.getTablesContext().getTableNames()).thenReturn(Collections.singleton("foo_tbl"));
-        List<ParameterRewriter> actual = new ArrayList<>(new 
EncryptParameterRewritersRegistry(rule, DefaultDatabase.LOGIC_NAME, 
Collections.emptyList()).getParameterRewriters());
+        List<ParameterRewriter> actual = new ArrayList<>(new 
EncryptParameterRewritersRegistry(mock(EncryptRule.class), 
DefaultDatabase.LOGIC_NAME, Collections.emptyList()).getParameterRewriters());
         assertThat(actual.size(), is(5));
         assertThat(actual.get(0), 
instanceOf(EncryptAssignmentParameterRewriter.class));
         assertThat(actual.get(1), 
instanceOf(EncryptPredicateParameterRewriter.class));
diff --git 
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingParameterRewritersRegistryTest.java
 
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingParameterRewritersRegistryTest.java
index 2805707be23..210fb968c1e 100644
--- 
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingParameterRewritersRegistryTest.java
+++ 
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingParameterRewritersRegistryTest.java
@@ -17,7 +17,6 @@
 
 package org.apache.shardingsphere.sharding.rewrite.parameter;
 
-import 
org.apache.shardingsphere.infra.binder.context.statement.dml.SelectStatementContext;
 import 
org.apache.shardingsphere.infra.rewrite.parameter.rewriter.ParameterRewriter;
 import 
org.apache.shardingsphere.infra.rewrite.parameter.rewriter.keygen.GeneratedKeyInsertValueParameterRewriter;
 import org.apache.shardingsphere.infra.route.context.RouteContext;
@@ -30,16 +29,12 @@ import java.util.List;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 class ShardingParameterRewritersRegistryTest {
     
     @Test
     void assertGetParameterRewriters() {
-        SelectStatementContext statementContext = 
mock(SelectStatementContext.class, RETURNS_DEEP_STUBS);
-        
when(statementContext.getPaginationContext().isHasPagination()).thenReturn(true);
         List<ParameterRewriter> actual = new ArrayList<>(new 
ShardingParameterRewritersRegistry(mock(RouteContext.class)).getParameterRewriters());
         assertThat(actual.size(), is(2));
         assertThat(actual.get(0), 
instanceOf(GeneratedKeyInsertValueParameterRewriter.class));