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 ce2934fa79b Remove useless static from test classes. (#24676)
ce2934fa79b is described below
commit ce2934fa79b313731490b824574fdf96ceb0317c
Author: Raigor <[email protected]>
AuthorDate: Sun Mar 19 14:13:07 2023 +0800
Remove useless static from test classes. (#24676)
---
.../prometheus/PrometheusPluginLifecycleServiceTest.java | 2 +-
.../handler/database/CreateDatabaseBackendHandlerTest.java | 2 +-
.../handler/database/DropDatabaseBackendHandlerTest.java | 2 +-
...dwriteSplittingStorageUnitStatusStatementUpdaterTest.java | 2 +-
.../transaction/TransactionBackendHandlerFactoryTest.java | 2 +-
.../handler/transaction/TransactionBackendHandlerTest.java | 2 +-
.../MySQLStatementMemoryStrictlyFetchSizeSetterTest.java | 2 +-
.../OpenGaussStatementMemoryStrictlyFetchSizeSetterTest.java | 2 +-
...PostgreSQLStatementMemoryStrictlyFetchSizeSetterTest.java | 2 +-
.../handler/admin/executor/SelectDatabaseExecutorTest.java | 2 +-
.../proxy/frontend/command/CommandExecutorTaskTest.java | 12 ++----------
.../frontend/connection/ConnectionLimitContextTest.java | 2 +-
.../protocol/FrontDatabaseProtocolTypeFactoryTest.java | 2 +-
.../query/text/query/MySQLMultiStatementsHandlerTest.java | 2 +-
14 files changed, 15 insertions(+), 23 deletions(-)
diff --git
a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/PrometheusPluginLifecycleServiceTest.java
b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/PrometheusPluginLifecycleServiceTest.java
index 23dd40211a8..a1bf4bac167 100644
---
a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/PrometheusPluginLifecycleServiceTest.java
+++
b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/PrometheusPluginLifecycleServiceTest.java
@@ -67,7 +67,7 @@ public final class PrometheusPluginLifecycleServiceTest {
}
}
- private static ContextManager mockContextManager() {
+ private ContextManager mockContextManager() {
MetaDataContexts metaDataContexts = new
MetaDataContexts(mock(MetaDataPersistService.class), new
ShardingSphereMetaData());
InstanceContext instanceContext = new InstanceContext(
new ComputeNodeInstance(mock(InstanceMetaData.class)), new
StandaloneWorkerIdGenerator(), new ModeConfiguration("Standalone", null),
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/CreateDatabaseBackendHandlerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/CreateDatabaseBackendHandlerTest.java
index 9fb05d37c0e..f775bb403cd 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/CreateDatabaseBackendHandlerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/CreateDatabaseBackendHandlerTest.java
@@ -81,7 +81,7 @@ public final class CreateDatabaseBackendHandlerTest {
assertThat(handler.execute(), instanceOf(UpdateResponseHeader.class));
}
- private static ContextManager mockContextManager() {
+ private ContextManager mockContextManager() {
ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
MetaDataContexts metaDataContexts = mock(MetaDataContexts.class,
RETURNS_DEEP_STUBS);
when(metaDataContexts.getMetaData().getDatabases()).thenReturn(Collections.singletonMap("foo_db",
mock(ShardingSphereDatabase.class)));
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DropDatabaseBackendHandlerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DropDatabaseBackendHandlerTest.java
index b202d5bb792..82f15a41774 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DropDatabaseBackendHandlerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DropDatabaseBackendHandlerTest.java
@@ -72,7 +72,7 @@ public final class DropDatabaseBackendHandlerTest {
handler = new DropDatabaseBackendHandler(sqlStatement,
connectionSession);
}
- private static ContextManager mockContextManager() {
+ private ContextManager mockContextManager() {
Map<String, ShardingSphereDatabase> databases = new HashMap<>(2, 1);
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
when(database.getRuleMetaData().getRules()).thenReturn(Collections.emptyList());
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterReadwriteSplittingStorageUnitStatusStatementUpdaterTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterReadwriteSplittingStorageUnitStatusStatementUpdaterTest.java
index 7f27daab06e..cb0ce0decfe 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterReadwriteSplittingStorageUnitStatusStatementUpdaterTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterReadwriteSplittingStorageUnitStatusStatementUpdaterTest.java
@@ -65,7 +65,7 @@ public final class
AlterReadwriteSplittingStorageUnitStatusStatementUpdaterTest
() -> updater.executeUpdate("foo_db", new
AlterReadwriteSplittingStorageUnitStatusStatement(new DatabaseSegment(1, 1, new
IdentifierValue("foo_db")), "group", "read_ds", "ENABLE")));
}
- private static ContextManager mockContextManager() {
+ private ContextManager mockContextManager() {
ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
when(result.getInstanceContext().isCluster()).thenReturn(true);
return result;
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandlerFactoryTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandlerFactoryTest.java
index a3a99d831eb..09e4d51b840 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandlerFactoryTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandlerFactoryTest.java
@@ -93,7 +93,7 @@ public final class TransactionBackendHandlerFactoryTest {
assertFieldOfInstance(getBackendTransactionManager(transactionBackendHandler),
"connection", is(backendConnection));
}
- private static ContextManager mockContextManager() {
+ private ContextManager mockContextManager() {
ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
when(result.getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(new
ShardingSphereRuleMetaData(Collections.singleton(mock(TransactionRule.class))));
return result;
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandlerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandlerTest.java
index 96eda4550e3..2aea0bddd55 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandlerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandlerTest.java
@@ -56,7 +56,7 @@ public final class TransactionBackendHandlerTest {
assertThat(new TransactionBackendHandler(mock(TCLStatement.class),
TransactionOperationType.BEGIN, connectionSession).execute(),
instanceOf(UpdateResponseHeader.class));
}
- private static ContextManager mockContextManager() {
+ private ContextManager mockContextManager() {
ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
when(result.getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(new
ShardingSphereRuleMetaData(Collections.singleton(mock(TransactionRule.class))));
return result;
diff --git
a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/connector/jdbc/statement/MySQLStatementMemoryStrictlyFetchSizeSetterTest.java
b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/connector/jdbc/statement/MySQLStatementMemoryStrictlyFetchSizeSetterTest.java
index c2b6fa7508c..55332215026 100644
---
a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/connector/jdbc/statement/MySQLStatementMemoryStrictlyFetchSizeSetterTest.java
+++
b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/connector/jdbc/statement/MySQLStatementMemoryStrictlyFetchSizeSetterTest.java
@@ -46,7 +46,7 @@ public final class
MySQLStatementMemoryStrictlyFetchSizeSetterTest {
verify(statement).setFetchSize(Integer.MIN_VALUE);
}
- private static ContextManager mockContextManager() {
+ private ContextManager mockContextManager() {
ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
when(result.getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_BACKEND_QUERY_FETCH_SIZE)).thenReturn(-1);
return result;
diff --git
a/proxy/backend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/backend/opengauss/connector/jdbc/statement/OpenGaussStatementMemoryStrictlyFetchSizeSetterTest.java
b/proxy/backend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/backend/opengauss/connector/jdbc/statement/OpenGaussStatementMemoryStrictlyFetchSizeSetterTest.java
index ed089fd8d5e..4d14c3eaa5c 100644
---
a/proxy/backend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/backend/opengauss/connector/jdbc/statement/OpenGaussStatementMemoryStrictlyFetchSizeSetterTest.java
+++
b/proxy/backend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/backend/opengauss/connector/jdbc/statement/OpenGaussStatementMemoryStrictlyFetchSizeSetterTest.java
@@ -46,7 +46,7 @@ public final class
OpenGaussStatementMemoryStrictlyFetchSizeSetterTest {
verify(statement).setFetchSize(1);
}
- private static ContextManager mockContextManager() {
+ private ContextManager mockContextManager() {
ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
when(result.getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_BACKEND_QUERY_FETCH_SIZE)).thenReturn(-1);
return result;
diff --git
a/proxy/backend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/connector/jdbc/statement/PostgreSQLStatementMemoryStrictlyFetchSizeSetterTest.java
b/proxy/backend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/connector/jdbc/statement/PostgreSQLStatementMemoryStrictlyFetchSizeSetterTest.java
index 5a761d6e7af..fadce0001be 100644
---
a/proxy/backend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/connector/jdbc/statement/PostgreSQLStatementMemoryStrictlyFetchSizeSetterTest.java
+++
b/proxy/backend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/connector/jdbc/statement/PostgreSQLStatementMemoryStrictlyFetchSizeSetterTest.java
@@ -46,7 +46,7 @@ public final class
PostgreSQLStatementMemoryStrictlyFetchSizeSetterTest {
verify(statement).setFetchSize(1);
}
- private static ContextManager mockContextManager() {
+ private ContextManager mockContextManager() {
ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
when(result.getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_BACKEND_QUERY_FETCH_SIZE)).thenReturn(-1);
return result;
diff --git
a/proxy/backend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/SelectDatabaseExecutorTest.java
b/proxy/backend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/SelectDatabaseExecutorTest.java
index 4b3ecddefe2..6f3a3e7d010 100644
---
a/proxy/backend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/SelectDatabaseExecutorTest.java
+++
b/proxy/backend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/SelectDatabaseExecutorTest.java
@@ -136,7 +136,7 @@ public final class SelectDatabaseExecutorTest {
assertThat(executor.getQueryResultMetaData().getColumnCount(), is(0));
}
- private static ContextManager mockContextManager(final
ShardingSphereDatabase... databases) {
+ private ContextManager mockContextManager(final ShardingSphereDatabase...
databases) {
ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
MetaDataContexts metaDataContexts = new
MetaDataContexts(mock(MetaDataPersistService.class),
new
ShardingSphereMetaData(Arrays.stream(databases).collect(Collectors.toMap(ShardingSphereDatabase::getName,
each -> each, (key, value) -> value)),
diff --git
a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecutorTaskTest.java
b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecutorTaskTest.java
index d423f05d4d4..b9f72539edf 100644
---
a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecutorTaskTest.java
+++
b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecutorTaskTest.java
@@ -102,6 +102,8 @@ public final class CommandExecutorTaskTest {
public void setup() {
when(connectionSession.getBackendConnection()).thenReturn(backendConnection);
when(handlerContext.channel().attr(CommonConstants.CHARSET_ATTRIBUTE_KEY).get()).thenReturn(StandardCharsets.UTF_8);
+ when(ProxyContext.getInstance().getContextManager()).thenReturn(
+ new ContextManager(new
MetaDataContexts(mock(MetaDataPersistService.class), new
ShardingSphereMetaData()), mock(InstanceContext.class)));
}
@Test
@@ -112,8 +114,6 @@ public final class CommandExecutorTaskTest {
when(engine.getCommandExecuteEngine().getCommandPacketType(payload)).thenReturn(commandPacketType);
when(engine.getCodecEngine().createPacketPayload(message,
StandardCharsets.UTF_8)).thenReturn(payload);
CommandExecutorTask actual = new CommandExecutorTask(engine,
connectionSession, handlerContext, message);
- when(ProxyContext.getInstance().getContextManager()).thenReturn(
- new ContextManager(new
MetaDataContexts(mock(MetaDataPersistService.class), new
ShardingSphereMetaData()), mock(InstanceContext.class)));
actual.run();
verify(queryCommandExecutor).close();
verify(backendConnection).closeExecutionResources();
@@ -128,8 +128,6 @@ public final class CommandExecutorTaskTest {
when(engine.getCommandExecuteEngine().getCommandPacketType(payload)).thenReturn(commandPacketType);
when(engine.getCodecEngine().createPacketPayload(message,
StandardCharsets.UTF_8)).thenReturn(payload);
CommandExecutorTask actual = new CommandExecutorTask(engine,
connectionSession, handlerContext, message);
- when(ProxyContext.getInstance().getContextManager()).thenReturn(
- new ContextManager(new
MetaDataContexts(mock(MetaDataPersistService.class), new
ShardingSphereMetaData()), mock(InstanceContext.class)));
actual.run();
verify(handlerContext).write(databasePacket);
verify(handlerContext).flush();
@@ -148,8 +146,6 @@ public final class CommandExecutorTaskTest {
when(engine.getCommandExecuteEngine().getCommandPacketType(payload)).thenReturn(commandPacketType);
when(engine.getCodecEngine().createPacketPayload(message,
StandardCharsets.UTF_8)).thenReturn(payload);
CommandExecutorTask actual = new CommandExecutorTask(engine,
connectionSession, handlerContext, message);
- when(ProxyContext.getInstance().getContextManager()).thenReturn(
- new ContextManager(new
MetaDataContexts(mock(MetaDataPersistService.class), new
ShardingSphereMetaData()), mock(InstanceContext.class)));
actual.run();
verify(handlerContext).write(databasePacket);
verify(handlerContext).flush();
@@ -169,8 +165,6 @@ public final class CommandExecutorTaskTest {
when(engine.getCommandExecuteEngine().getErrorPacket(mockException)).thenReturn(databasePacket);
when(engine.getCommandExecuteEngine().getOtherPacket(connectionSession)).thenReturn(Optional.of(databasePacket));
CommandExecutorTask actual = new CommandExecutorTask(engine,
connectionSession, handlerContext, message);
- when(ProxyContext.getInstance().getContextManager()).thenReturn(
- new ContextManager(new
MetaDataContexts(mock(MetaDataPersistService.class), new
ShardingSphereMetaData()), mock(InstanceContext.class)));
actual.run();
verify(handlerContext, times(2)).write(databasePacket);
verify(handlerContext).flush();
@@ -187,8 +181,6 @@ public final class CommandExecutorTaskTest {
when(engine.getCommandExecuteEngine().getErrorPacket(any(RuntimeException.class))).thenReturn(databasePacket);
when(engine.getCommandExecuteEngine().getOtherPacket(connectionSession)).thenReturn(Optional.of(databasePacket));
CommandExecutorTask actual = new CommandExecutorTask(engine,
connectionSession, handlerContext, message);
- when(ProxyContext.getInstance().getContextManager()).thenReturn(
- new ContextManager(new
MetaDataContexts(mock(MetaDataPersistService.class), new
ShardingSphereMetaData()), mock(InstanceContext.class)));
actual.run();
verify(handlerContext, times(2)).write(databasePacket);
verify(handlerContext).flush();
diff --git
a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/connection/ConnectionLimitContextTest.java
b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/connection/ConnectionLimitContextTest.java
index dbf634001a0..4471abb3c5d 100644
---
a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/connection/ConnectionLimitContextTest.java
+++
b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/connection/ConnectionLimitContextTest.java
@@ -57,7 +57,7 @@ public final class ConnectionLimitContextTest {
assertFalse(ConnectionLimitContext.getInstance().limitsMaxConnections());
}
- private static ContextManager mockContextManager(final int maxConnections)
{
+ private ContextManager mockContextManager(final int maxConnections) {
ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
when(result.getMetaDataContexts().getMetaData().getProps().getValue(ConfigurationPropertyKey.PROXY_FRONTEND_MAX_CONNECTIONS)).thenReturn(maxConnections);
return result;
diff --git
a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/protocol/FrontDatabaseProtocolTypeFactoryTest.java
b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/protocol/FrontDatabaseProtocolTypeFactoryTest.java
index 6e258de5ef5..a7ffd28e450 100644
---
a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/protocol/FrontDatabaseProtocolTypeFactoryTest.java
+++
b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/protocol/FrontDatabaseProtocolTypeFactoryTest.java
@@ -82,7 +82,7 @@ public final class FrontDatabaseProtocolTypeFactoryTest {
return Collections.singletonMap("foo_db", database);
}
- private static ContextManager mockContextManager(final Map<String,
ShardingSphereDatabase> databases, final Properties props) {
+ private ContextManager mockContextManager(final Map<String,
ShardingSphereDatabase> databases, final Properties props) {
MetaDataContexts metaDataContexts = new MetaDataContexts(
mock(MetaDataPersistService.class), new
ShardingSphereMetaData(databases, mock(ShardingSphereRuleMetaData.class), new
ConfigurationProperties(props)));
return new ContextManager(metaDataContexts,
mock(InstanceContext.class));
diff --git
a/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsHandlerTest.java
b/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsHandlerTest.java
index 525a52b2905..39f352d5e5a 100644
---
a/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsHandlerTest.java
+++
b/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsHandlerTest.java
@@ -98,7 +98,7 @@ public final class MySQLMultiStatementsHandlerTest {
return result;
}
- private static ContextManager mockContextManager() {
+ private ContextManager mockContextManager() {
ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
when(result.getMetaDataContexts().getMetaData().getDatabase("foo_db").getResourceMetaData().getAllInstanceDataSourceNames())
.thenReturn(Collections.singletonList("foo_ds"));
