(shardingsphere) branch master updated: Remove useless mock on DriverDatabaseConnectionManagerTest (#31926)

[zh...@apache.org]

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 589e8226a35 Remove useless mock on DriverDatabaseConnectionManagerTest (#31926)
589e8226a35 is described below

commit 589e8226a355da110b90fad5452540398f29f812
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Jun 30 13:51:45 2024 +0800

    Remove useless mock on DriverDatabaseConnectionManagerTest (#31926)
    
    * Code format for MetaDataContextsFactory
    
    * Remove useless mock on DriverDatabaseConnectionManagerTest
    
    * Refactor AbstractResultSetAdapter
---
 .../jdbc/adapter/AbstractResultSetAdapter.java     | 22 +++++++++++-----------
 .../DriverDatabaseConnectionManagerTest.java       | 13 +------------
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractResultSetAdapter.java b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractResultSetAdapter.java
index 3e46f73beb9..0f682d217a0 100644
--- a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractResultSetAdapter.java
+++ b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractResultSetAdapter.java
@@ -76,17 +76,6 @@ public abstract class AbstractResultSetAdapter extends AbstractUnsupportedOperat
         return resultSets.get(0).findColumn(columnLabel);
     }
     
-    @Override
-    public final void close() throws SQLException {
-        closed = true;
-        forceExecuteTemplate.execute(resultSets, ResultSet::close);
-    }
-    
-    @Override
-    public final boolean isClosed() {
-        return closed;
-    }
-    
     @Override
     public final void setFetchDirection(final int direction) throws SQLException {
         forceExecuteTemplate.execute(resultSets, resultSet -> resultSet.setFetchDirection(direction));
@@ -126,4 +115,15 @@ public abstract class AbstractResultSetAdapter extends AbstractUnsupportedOperat
     public final void clearWarnings() throws SQLException {
         forceExecuteTemplate.execute(resultSets, ResultSet::clearWarnings);
     }
+    
+    @Override
+    public final boolean isClosed() {
+        return closed;
+    }
+    
+    @Override
+    public final void close() throws SQLException {
+        closed = true;
+        forceExecuteTemplate.execute(resultSets, ResultSet::close);
+    }
 }
diff --git a/jdbc/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/DriverDatabaseConnectionManagerTest.java b/jdbc/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/DriverDatabaseConnectionManagerTest.java
index 68e6707a0b3..3c7af60607e 100644
--- a/jdbc/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/DriverDatabaseConnectionManagerTest.java
+++ b/jdbc/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/DriverDatabaseConnectionManagerTest.java
@@ -18,9 +18,7 @@
 package org.apache.shardingsphere.driver.jdbc.core.connection;
 
 import com.zaxxer.hikari.HikariDataSource;
-import org.apache.shardingsphere.authority.rule.AuthorityRule;
 import org.apache.shardingsphere.infra.database.core.DefaultDatabase;
-import org.apache.shardingsphere.infra.datasource.pool.creator.DataSourcePoolCreator;
 import org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties;
 import org.apache.shardingsphere.infra.executor.sql.execute.engine.ConnectionMode;
 import org.apache.shardingsphere.infra.instance.metadata.InstanceType;
@@ -30,14 +28,9 @@ import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData;
 import org.apache.shardingsphere.metadata.persist.MetaDataPersistService;
 import org.apache.shardingsphere.mode.manager.ContextManager;
 import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
-import org.apache.shardingsphere.test.mock.AutoMockExtension;
-import org.apache.shardingsphere.test.mock.StaticMockSettings;
 import org.apache.shardingsphere.transaction.rule.TransactionRule;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoSettings;
-import org.mockito.quality.Strictness;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
@@ -58,9 +51,6 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@ExtendWith(AutoMockExtension.class)
-@StaticMockSettings(DataSourcePoolCreator.class)
-@MockitoSettings(strictness = Strictness.LENIENT)
 class DriverDatabaseConnectionManagerTest {
     
     private DriverDatabaseConnectionManager databaseConnectionManager;
@@ -76,8 +66,7 @@ class DriverDatabaseConnectionManagerTest {
         when(result.getStorageUnits(DefaultDatabase.LOGIC_NAME)).thenReturn(storageUnits);
         MetaDataPersistService persistService = mockMetaDataPersistService();
         when(result.getPersistServiceFacade().getMetaDataPersistService()).thenReturn(persistService);
-        when(result.getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(
-                new RuleMetaData(Arrays.asList(mock(AuthorityRule.class, RETURNS_DEEP_STUBS), mock(TransactionRule.class, RETURNS_DEEP_STUBS))));
+        when(result.getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(new RuleMetaData(Collections.singleton(mock(TransactionRule.class, RETURNS_DEEP_STUBS))));
         when(result.getComputeNodeInstanceContext().getAllClusterInstances(InstanceType.PROXY, Arrays.asList("OLTP", "OLAP"))).thenReturn(
                 Collections.singletonMap("foo_id", new ProxyInstanceMetaData("foo_id", "127.0.0.1@3307", "foo_version")));
         return result;