(shardingsphere) branch master updated: Refactor RegisterStorageUnitExecutorTest (#29872)

[sunnianjun]

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

sunnianjun 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 ca1a735dbe7 Refactor RegisterStorageUnitExecutorTest (#29872)
ca1a735dbe7 is described below

commit ca1a735dbe7d5a72e3dad63b4a7585827594f62c
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sat Jan 27 17:55:54 2024 +0800

    Refactor RegisterStorageUnitExecutorTest (#29872)
---
 .../distsql/rdl/resource/RegisterStorageUnitExecutorTest.java       | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git 
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/RegisterStorageUnitExecutorTest.java
 
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/RegisterStorageUnitExecutorTest.java
index 720ea57bb9e..c1dda0637fd 100644
--- 
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/RegisterStorageUnitExecutorTest.java
+++ 
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/RegisterStorageUnitExecutorTest.java
@@ -29,10 +29,8 @@ import 
org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData;
 import 
org.apache.shardingsphere.infra.rule.identifier.type.DataSourceContainedRule;
 import org.apache.shardingsphere.mode.manager.ContextManager;
 import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
-import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
 import 
org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.resource.type.RegisterStorageUnitExecutor;
 import org.apache.shardingsphere.test.mock.AutoMockExtension;
-import org.apache.shardingsphere.test.mock.StaticMockSettings;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -53,7 +51,6 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 @ExtendWith(AutoMockExtension.class)
-@StaticMockSettings(ProxyContext.class)
 @MockitoSettings(strictness = Strictness.LENIENT)
 class RegisterStorageUnitExecutorTest {
     
@@ -99,9 +96,8 @@ class RegisterStorageUnitExecutorTest {
         DataSourceContainedRule rule = mock(DataSourceContainedRule.class);
         
when(rule.getDataSourceMapper()).thenReturn(Collections.singletonMap("ds_0", 
Collections.emptyList()));
         
when(database.getRuleMetaData().findRules(DataSourceContainedRule.class)).thenReturn(Collections.singleton(rule));
-        
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
         executor.setDatabase(database);
-        assertThrows(InvalidStorageUnitsException.class, () -> 
executor.execute(createRegisterStorageUnitStatement(), 
mock(ContextManager.class)));
+        assertThrows(InvalidStorageUnitsException.class, () -> 
executor.execute(createRegisterStorageUnitStatement(), contextManager));
     }
     
     private RegisterStorageUnitStatement createRegisterStorageUnitStatement() {