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 7433bcbfeb1 Code format for DatabaseConnectorTest (#32447)
7433bcbfeb1 is described below
commit 7433bcbfeb14700c2d45f3a6ae1921d250222166
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Aug 10 00:24:53 2024 +0800
Code format for DatabaseConnectorTest (#32447)
---
.../backend/connector/DatabaseConnectorTest.java | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnectorTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnectorTest.java
index 7d438a1c384..876f7fd3448 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnectorTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnectorTest.java
@@ -120,15 +120,14 @@ class DatabaseConnectorTest {
}
private ContextManager mockContextManager() {
- RuleMetaData globalRuleMetaData =
- new RuleMetaData(Arrays.asList(new SQLParserRule(new
SQLParserRuleConfiguration(mock(CacheOption.class), mock(CacheOption.class))),
sqlFederationRule));
+ RuleMetaData globalRuleMetaData = new RuleMetaData(Arrays.asList(new
SQLParserRule(new SQLParserRuleConfiguration(mock(CacheOption.class),
mock(CacheOption.class))), sqlFederationRule));
MetaDataPersistService metaDataPersistService =
mock(MetaDataPersistService.class);
ShardingSphereDataPersistService shardingSphereDataPersistService =
mock(ShardingSphereDataPersistService.class);
when(shardingSphereDataPersistService.load(any())).thenReturn(Optional.empty());
when(metaDataPersistService.getShardingSphereDataPersistService()).thenReturn(shardingSphereDataPersistService);
Map<String, ShardingSphereDatabase> databases = mockDatabases();
- MetaDataContexts metaDataContexts =
MetaDataContextsFactory.create(metaDataPersistService,
- new ShardingSphereMetaData(databases,
mock(ResourceMetaData.class), globalRuleMetaData, new
ConfigurationProperties(new Properties())));
+ MetaDataContexts metaDataContexts = MetaDataContextsFactory.create(
+ metaDataPersistService, new ShardingSphereMetaData(databases,
mock(ResourceMetaData.class), globalRuleMetaData, new
ConfigurationProperties(new Properties())));
ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
when(result.getMetaDataContexts()).thenReturn(metaDataContexts);
when(result.getDatabase("foo_db")).thenReturn(databases.get("foo_db"));
@@ -207,8 +206,7 @@ class DatabaseConnectorTest {
void assertAddStatementCorrectly() {
SQLStatementContext sqlStatementContext =
mock(SQLStatementContext.class, RETURNS_DEEP_STUBS);
when(sqlStatementContext.getDatabaseType()).thenReturn(TypedSPILoader.getService(DatabaseType.class,
"FIXTURE"));
- DatabaseConnector engine =
DatabaseConnectorFactory.getInstance().newInstance(createQueryContext(sqlStatementContext),
- databaseConnectionManager, false);
+ DatabaseConnector engine =
DatabaseConnectorFactory.getInstance().newInstance(createQueryContext(sqlStatementContext),
databaseConnectionManager, false);
engine.add(statement);
Collection<?> actual = getField(engine, "cachedStatements");
assertThat(actual.size(), is(1));
@@ -219,8 +217,7 @@ class DatabaseConnectorTest {
void assertAddResultSetCorrectly() {
SQLStatementContext sqlStatementContext =
mock(SQLStatementContext.class, RETURNS_DEEP_STUBS);
when(sqlStatementContext.getDatabaseType()).thenReturn(TypedSPILoader.getService(DatabaseType.class,
"FIXTURE"));
- DatabaseConnector engine =
DatabaseConnectorFactory.getInstance().newInstance(createQueryContext(sqlStatementContext),
- databaseConnectionManager, false);
+ DatabaseConnector engine =
DatabaseConnectorFactory.getInstance().newInstance(createQueryContext(sqlStatementContext),
databaseConnectionManager, false);
engine.add(resultSet);
Collection<?> actual = getField(engine, "cachedResultSets");
assertThat(actual.size(), is(1));
@@ -231,8 +228,7 @@ class DatabaseConnectorTest {
void assertCloseCorrectly() throws SQLException {
SQLStatementContext sqlStatementContext =
mock(SQLStatementContext.class, RETURNS_DEEP_STUBS);
when(sqlStatementContext.getDatabaseType()).thenReturn(TypedSPILoader.getService(DatabaseType.class,
"FIXTURE"));
- DatabaseConnector engine =
DatabaseConnectorFactory.getInstance().newInstance(createQueryContext(sqlStatementContext),
- databaseConnectionManager, false);
+ DatabaseConnector engine =
DatabaseConnectorFactory.getInstance().newInstance(createQueryContext(sqlStatementContext),
databaseConnectionManager, false);
Collection<ResultSet> cachedResultSets = getField(engine,
"cachedResultSets");
cachedResultSets.add(resultSet);
Collection<Statement> cachedStatements = getField(engine,
"cachedStatements");
@@ -249,8 +245,7 @@ class DatabaseConnectorTest {
void assertCloseResultSetsWithExceptionThrown() throws SQLException {
SQLStatementContext sqlStatementContext =
mock(SQLStatementContext.class, RETURNS_DEEP_STUBS);
when(sqlStatementContext.getDatabaseType()).thenReturn(TypedSPILoader.getService(DatabaseType.class,
"FIXTURE"));
- DatabaseConnector engine =
DatabaseConnectorFactory.getInstance().newInstance(createQueryContext(sqlStatementContext),
- databaseConnectionManager, false);
+ DatabaseConnector engine =
DatabaseConnectorFactory.getInstance().newInstance(createQueryContext(sqlStatementContext),
databaseConnectionManager, false);
Collection<ResultSet> cachedResultSets = getField(engine,
"cachedResultSets");
SQLException sqlExceptionByResultSet = new SQLException("ResultSet");
doThrow(sqlExceptionByResultSet).when(resultSet).close();
