This is an automated email from the ASF dual-hosted git repository.
terrymanu 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 f966b1c08c3 Use import static org.mockito.Mockito.when (#39490)
f966b1c08c3 is described below
commit f966b1c08c3265a7e20dfc452b9672633fadb4ae
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Aug 16 23:36:31 2026 +0800
Use import static org.mockito.Mockito.when (#39490)
---
.../type/ExplainStatementConverterTest.java | 6 ++++--
.../FederationMetaDataRefreshEngineTest.java | 4 ++--
.../FirebirdPrepareStatementCommandExecutorTest.java | 20 ++++++++++----------
3 files changed, 16 insertions(+), 14 deletions(-)
diff --git
a/kernel/sql-federation/compiler/src/test/java/org/apache/shardingsphere/sqlfederation/compiler/sql/ast/converter/statement/type/ExplainStatementConverterTest.java
b/kernel/sql-federation/compiler/src/test/java/org/apache/shardingsphere/sqlfederation/compiler/sql/ast/converter/statement/type/ExplainStatementConverterTest.java
index 50056eea4cc..d35f8bfa54e 100644
---
a/kernel/sql-federation/compiler/src/test/java/org/apache/shardingsphere/sqlfederation/compiler/sql/ast/converter/statement/type/ExplainStatementConverterTest.java
+++
b/kernel/sql-federation/compiler/src/test/java/org/apache/shardingsphere/sqlfederation/compiler/sql/ast/converter/statement/type/ExplainStatementConverterTest.java
@@ -46,6 +46,8 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.isA;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.withSettings;
class ExplainStatementConverterTest {
@@ -81,8 +83,8 @@ class ExplainStatementConverterTest {
@Test
void assertConvertUnsupportedSQLStatementThrowsException() {
- DCLStatement mockStatement = mock(DCLStatement.class,
Mockito.withSettings().defaultAnswer(Mockito.CALLS_REAL_METHODS));
- Mockito.when(mockStatement.getDatabaseType()).thenReturn(databaseType);
+ DCLStatement mockStatement = mock(DCLStatement.class,
withSettings().defaultAnswer(Mockito.CALLS_REAL_METHODS));
+ when(mockStatement.getDatabaseType()).thenReturn(databaseType);
ExplainStatement explainStatement = new ExplainStatement(databaseType,
mockStatement);
assertThrows(IllegalStateException.class, () -> new
ExplainStatementConverter().convert(explainStatement));
}
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/federation/FederationMetaDataRefreshEngineTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/federation/FederationMetaDataRefreshEngineTest.java
index eae626ce302..913039636ea 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/federation/FederationMetaDataRefreshEngineTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/federation/FederationMetaDataRefreshEngineTest.java
@@ -32,7 +32,6 @@ import
org.apache.shardingsphere.test.infra.framework.extension.mock.StaticMockS
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.Mockito;
import java.util.Collections;
import java.util.Optional;
@@ -40,6 +39,7 @@ import java.util.Optional;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -121,6 +121,6 @@ class FederationMetaDataRefreshEngineTest {
FederationMetaDataRefreshEngine engine = new
FederationMetaDataRefreshEngine(sqlStatementContext);
engine.refresh(metaDataManagerPersistService, database);
engine.refresh(metaDataManagerPersistService, database);
- verify(refresher,
Mockito.times(2)).refresh(metaDataManagerPersistService, databaseType,
database, "foo_schema", sqlStatement);
+ verify(refresher, times(2)).refresh(metaDataManagerPersistService,
databaseType, database, "foo_schema", sqlStatement);
}
}
diff --git
a/proxy/frontend/dialect/firebird/src/test/java/org/apache/shardingsphere/proxy/frontend/firebird/command/query/statement/prepare/FirebirdPrepareStatementCommandExecutorTest.java
b/proxy/frontend/dialect/firebird/src/test/java/org/apache/shardingsphere/proxy/frontend/firebird/command/query/statement/prepare/FirebirdPrepareStatementCommandExecutorTest.java
index 3afc0419604..4a721c557e0 100644
---
a/proxy/frontend/dialect/firebird/src/test/java/org/apache/shardingsphere/proxy/frontend/firebird/command/query/statement/prepare/FirebirdPrepareStatementCommandExecutorTest.java
+++
b/proxy/frontend/dialect/firebird/src/test/java/org/apache/shardingsphere/proxy/frontend/firebird/command/query/statement/prepare/FirebirdPrepareStatementCommandExecutorTest.java
@@ -41,16 +41,16 @@ import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSp
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
import
org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereStatistics;
import org.apache.shardingsphere.infra.metadata.user.Grantee;
-import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.infra.session.connection.ConnectionContext;
+import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.parser.config.SQLParserRuleConfiguration;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
-import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import
org.apache.shardingsphere.proxy.backend.connector.ProxyDatabaseConnectionManager;
+import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
+import org.apache.shardingsphere.proxy.backend.handler.ProxyBackendHandler;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import
org.apache.shardingsphere.proxy.backend.session.ServerPreparedStatementRegistry;
-import org.apache.shardingsphere.proxy.backend.handler.ProxyBackendHandler;
import
org.apache.shardingsphere.proxy.frontend.firebird.command.query.FirebirdServerPreparedStatement;
import
org.apache.shardingsphere.proxy.frontend.firebird.command.query.statement.FirebirdStatementResourceCleaner;
import
org.apache.shardingsphere.proxy.frontend.firebird.command.query.statement.fetch.FirebirdFetchStatementCache;
@@ -58,13 +58,12 @@ import
org.apache.shardingsphere.sql.parser.engine.api.CacheOption;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.ddl.database.DropDatabaseStatement;
import
org.apache.shardingsphere.test.infra.framework.extension.mock.AutoMockExtension;
import
org.apache.shardingsphere.test.infra.framework.extension.mock.StaticMockSettings;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.AfterEach;
+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.Mockito;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
@@ -74,10 +73,11 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Properties;
-import static org.hamcrest.Matchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.isA;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -195,7 +195,7 @@ class FirebirdPrepareStatementCommandExecutorTest {
FirebirdGenericResponsePacket responsePacket =
(FirebirdGenericResponsePacket) actual.iterator().next();
FirebirdPrepareStatementReturnPacket returnPacket =
(FirebirdPrepareStatementReturnPacket) responsePacket.getData();
assertThat(returnPacket.getDescribeSelect().size(), is(1));
- FirebirdPacketPayload payload = mock(FirebirdPacketPayload.class,
Mockito.RETURNS_DEEP_STUBS);
+ FirebirdPacketPayload payload = mock(FirebirdPacketPayload.class,
RETURNS_DEEP_STUBS);
FirebirdReturnColumnPacket columnPacket =
returnPacket.getDescribeSelect().get(0);
columnPacket.write(payload);
verify(payload).writeInt4LE(FirebirdBinaryColumnType.INT64.getValue()
+ 1);
@@ -205,7 +205,7 @@ class FirebirdPrepareStatementCommandExecutorTest {
void
assertDescribeBlobColumnRegisteredInBlobInfoRegistryReturnsBlobTypeAndSubtype()
throws Exception {
FirebirdBlobInfoRegistry.refreshTable("foo_db", "foo_tbl",
Collections.singletonMap("id", 7));
FirebirdReturnColumnPacket columnPacket = describeSingleColumn("SELECT
id FROM foo_tbl");
- FirebirdPacketPayload payload = mock(FirebirdPacketPayload.class,
Mockito.RETURNS_DEEP_STUBS);
+ FirebirdPacketPayload payload = mock(FirebirdPacketPayload.class,
RETURNS_DEEP_STUBS);
columnPacket.write(payload);
verify(payload).writeInt4LE(FirebirdBinaryColumnType.BLOB.getValue() +
1);
verify(payload).writeInt4LE(7);
@@ -214,7 +214,7 @@ class FirebirdPrepareStatementCommandExecutorTest {
@Test
void
assertDescribeBlobTypeColumnWithoutRegistryEntryReturnsBlobTypeAndDefaultSubtype()
throws Exception {
FirebirdReturnColumnPacket columnPacket = describeSingleColumn("SELECT
content FROM foo_tbl");
- FirebirdPacketPayload payload = mock(FirebirdPacketPayload.class,
Mockito.RETURNS_DEEP_STUBS);
+ FirebirdPacketPayload payload = mock(FirebirdPacketPayload.class,
RETURNS_DEEP_STUBS);
columnPacket.write(payload);
verify(payload).writeInt4LE(FirebirdBinaryColumnType.BLOB.getValue() +
1);
verify(payload).writeInt4LE(FirebirdBinaryColumnType.BLOB.getSubtype());
@@ -237,7 +237,7 @@ class FirebirdPrepareStatementCommandExecutorTest {
FirebirdPrepareStatementReturnPacket returnPacket =
(FirebirdPrepareStatementReturnPacket) responsePacket.getData();
assertThat(returnPacket.getType(),
is(FirebirdSQLInfoReturnValue.SELECT));
assertThat(returnPacket.getDescribeSelect().size(), is(1));
- FirebirdPacketPayload payload = mock(FirebirdPacketPayload.class,
Mockito.RETURNS_DEEP_STUBS);
+ FirebirdPacketPayload payload = mock(FirebirdPacketPayload.class,
RETURNS_DEEP_STUBS);
FirebirdReturnColumnPacket columnPacket =
returnPacket.getDescribeSelect().get(0);
columnPacket.write(payload);
verify(payload).writeInt4LE(FirebirdBinaryColumnType.LONG.getValue() +
1);
