(shardingsphere) branch master updated: Refactor SQLRewriterIT's resourceMetaData creation (#35153)

[zhangliang]

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 cb68ee9bedc Refactor SQLRewriterIT's resourceMetaData creation (#35153)
cb68ee9bedc is described below

commit cb68ee9bedcf636a44980fe80b89226d88e37d3c
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Wed Apr 9 23:47:50 2025 +0800

    Refactor SQLRewriterIT's resourceMetaData creation (#35153)
---
 .../test/it/rewrite/engine/SQLRewriterIT.java               | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git 
a/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/engine/SQLRewriterIT.java
 
b/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/engine/SQLRewriterIT.java
index a23793134a9..e5a13dace7e 100644
--- 
a/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/engine/SQLRewriterIT.java
+++ 
b/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/engine/SQLRewriterIT.java
@@ -35,7 +35,6 @@ import 
org.apache.shardingsphere.infra.instance.ComputeNodeInstanceContext;
 import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
 import 
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
 import 
org.apache.shardingsphere.infra.metadata.database.resource.ResourceMetaData;
-import 
org.apache.shardingsphere.infra.metadata.database.resource.unit.StorageUnit;
 import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData;
 import 
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
 import org.apache.shardingsphere.infra.parser.sql.SQLStatementParserEngine;
@@ -74,20 +73,16 @@ import org.junit.jupiter.params.provider.ArgumentsSource;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
-import java.sql.SQLException;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Properties;
 import java.util.stream.Stream;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 public abstract class SQLRewriterIT {
     
@@ -98,7 +93,7 @@ public abstract class SQLRewriterIT {
     
     @ParameterizedTest(name = "{0}")
     @ArgumentsSource(TestCaseArgumentsProvider.class)
-    void assertRewrite(final SQLRewriteEngineTestParameters testParams) throws 
IOException, SQLException {
+    void assertRewrite(final SQLRewriteEngineTestParameters testParams) throws 
IOException {
         Collection<SQLRewriteUnit> actual = createSQLRewriteUnits(testParams);
         assertThat(actual.size(), is(testParams.getOutputSQLs().size()));
         int count = 0;
@@ -112,14 +107,12 @@ public abstract class SQLRewriterIT {
         }
     }
     
-    private Collection<SQLRewriteUnit> createSQLRewriteUnits(final 
SQLRewriteEngineTestParameters testParams) throws IOException, SQLException {
+    private Collection<SQLRewriteUnit> createSQLRewriteUnits(final 
SQLRewriteEngineTestParameters testParams) throws IOException {
         YamlRootConfiguration rootConfig = loadRootConfiguration(testParams);
         DatabaseConfiguration databaseConfig = new 
DataSourceProvidedDatabaseConfiguration(
                 new 
YamlDataSourceConfigurationSwapper().swapToDataSources(rootConfig.getDataSources()),
 new 
YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(rootConfig.getRules()));
         DatabaseType databaseType = 
TypedSPILoader.getService(DatabaseType.class, testParams.getDatabaseType());
-        ResourceMetaData resourceMetaData = mock(ResourceMetaData.class, 
RETURNS_DEEP_STUBS);
-        Map<String, StorageUnit> stringStorageUnits = 
databaseConfig.getStorageUnits();
-        
when(resourceMetaData.getStorageUnits()).thenReturn(stringStorageUnits);
+        ResourceMetaData resourceMetaData = new 
ResourceMetaData(Collections.emptyMap(), databaseConfig.getStorageUnits());
         String databaseName = null != rootConfig.getDatabaseName() ? 
rootConfig.getDatabaseName() : DefaultDatabase.LOGIC_NAME;
         String schemaName = new 
DatabaseTypeRegistry(databaseType).getDefaultSchemaName(databaseName);
         SQLStatementParserEngine sqlStatementParserEngine = new 
SQLStatementParserEngine(databaseType, sqlParserRule.getSqlStatementCache(), 
sqlParserRule.getParseTreeCache());