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 075e8ae053d Rename mockShardingSphereDatabase to mockDatabase (#33915)
075e8ae053d is described below

commit 075e8ae053d43c8cdf8653419e6e280f24cf0bb5
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Wed Dec 4 21:35:09 2024 +0800

    Rename mockShardingSphereDatabase to mockDatabase (#33915)
---
 .../TopAndRowNumberDecoratorMergedResultTest.java  | 14 +++++++-------
 .../schema/util/SystemSchemaUtilsTest.java         | 22 +++++++++++-----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git 
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dql/pagination/TopAndRowNumberDecoratorMergedResultTest.java
 
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dql/pagination/TopAndRowNumberDecoratorMergedResultTest.java
index 37ffc30dffa..e23f5236e5c 100644
--- 
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dql/pagination/TopAndRowNumberDecoratorMergedResultTest.java
+++ 
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dql/pagination/TopAndRowNumberDecoratorMergedResultTest.java
@@ -69,7 +69,7 @@ class TopAndRowNumberDecoratorMergedResultTest {
                 new 
SelectStatementContext(createShardingSphereMetaData(database), 
Collections.emptyList(), sqlStatement, "foo_db", Collections.emptyList());
         ShardingDQLResultMerger resultMerger = new 
ShardingDQLResultMerger(TypedSPILoader.getService(DatabaseType.class, 
"SQLServer"));
         MergedResult actual = 
resultMerger.merge(Arrays.asList(mockQueryResult(), mockQueryResult(),
-                mockQueryResult(), mockQueryResult()), selectStatementContext, 
mockShardingSphereDatabase(), mock(ConnectionContext.class));
+                mockQueryResult(), mockQueryResult()), selectStatementContext, 
mockDatabase(), mock(ConnectionContext.class));
         assertFalse(actual.next());
     }
     
@@ -85,7 +85,7 @@ class TopAndRowNumberDecoratorMergedResultTest {
         SelectStatementContext selectStatementContext =
                 new 
SelectStatementContext(createShardingSphereMetaData(database), 
Collections.emptyList(), sqlStatement, "foo_db", Collections.emptyList());
         MergedResult actual = 
resultMerger.merge(Arrays.asList(mockQueryResult(), mockQueryResult(),
-                mockQueryResult(), mockQueryResult()), selectStatementContext, 
mockShardingSphereDatabase(), mock(ConnectionContext.class));
+                mockQueryResult(), mockQueryResult()), selectStatementContext, 
mockDatabase(), mock(ConnectionContext.class));
         for (int i = 0; i < 5; i++) {
             assertTrue(actual.next());
         }
@@ -104,7 +104,7 @@ class TopAndRowNumberDecoratorMergedResultTest {
                 new 
SelectStatementContext(createShardingSphereMetaData(database), 
Collections.emptyList(), sqlStatement, "foo_db", Collections.emptyList());
         ShardingDQLResultMerger resultMerger = new 
ShardingDQLResultMerger(TypedSPILoader.getService(DatabaseType.class, 
"SQLServer"));
         MergedResult actual = 
resultMerger.merge(Arrays.asList(mockQueryResult(), mockQueryResult(),
-                mockQueryResult(), mockQueryResult()), selectStatementContext, 
mockShardingSphereDatabase(), mock(ConnectionContext.class));
+                mockQueryResult(), mockQueryResult()), selectStatementContext, 
mockDatabase(), mock(ConnectionContext.class));
         for (int i = 0; i < 7; i++) {
             assertTrue(actual.next());
         }
@@ -123,7 +123,7 @@ class TopAndRowNumberDecoratorMergedResultTest {
         SelectStatementContext selectStatementContext =
                 new 
SelectStatementContext(createShardingSphereMetaData(database), 
Collections.emptyList(), sqlStatement, "foo_db", Collections.emptyList());
         MergedResult actual = 
resultMerger.merge(Arrays.asList(mockQueryResult(), mockQueryResult(),
-                mockQueryResult(), mockQueryResult()), selectStatementContext, 
mockShardingSphereDatabase(), mock(ConnectionContext.class));
+                mockQueryResult(), mockQueryResult()), selectStatementContext, 
mockDatabase(), mock(ConnectionContext.class));
         assertTrue(actual.next());
         assertTrue(actual.next());
         assertFalse(actual.next());
@@ -141,7 +141,7 @@ class TopAndRowNumberDecoratorMergedResultTest {
         SelectStatementContext selectStatementContext = new 
SelectStatementContext(createShardingSphereMetaData(database),
                 Collections.emptyList(), sqlStatement, "foo_db", 
Collections.emptyList());
         MergedResult actual = 
resultMerger.merge(Arrays.asList(mockQueryResult(), mockQueryResult(),
-                mockQueryResult(), mockQueryResult()), selectStatementContext, 
mockShardingSphereDatabase(), mock(ConnectionContext.class));
+                mockQueryResult(), mockQueryResult()), selectStatementContext, 
mockDatabase(), mock(ConnectionContext.class));
         assertTrue(actual.next());
         assertTrue(actual.next());
         assertTrue(actual.next());
@@ -158,9 +158,9 @@ class TopAndRowNumberDecoratorMergedResultTest {
         return result;
     }
     
-    private ShardingSphereDatabase mockShardingSphereDatabase() {
+    private ShardingSphereDatabase mockDatabase() {
         ShardingSphereDatabase result = mock(ShardingSphereDatabase.class, 
RETURNS_DEEP_STUBS);
-        when(result.getName()).thenReturn("db_schema");
+        when(result.getName()).thenReturn("foo_db");
         return result;
     }
 }
diff --git 
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtilsTest.java
 
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtilsTest.java
index fa31da2eb29..fb71526abf1 100644
--- 
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtilsTest.java
+++ 
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtilsTest.java
@@ -35,39 +35,39 @@ class SystemSchemaUtilsTest {
     @Test
     void assertContainsSystemSchemaForMySQL() {
         DatabaseType databaseType = 
TypedSPILoader.getService(DatabaseType.class, "MySQL");
-        ShardingSphereDatabase informationSchemaDatabase = 
mockShardingSphereDatabase("information_schema", false);
+        ShardingSphereDatabase informationSchemaDatabase = 
mockDatabase("information_schema", false);
         assertTrue(SystemSchemaUtils.containsSystemSchema(databaseType, 
Arrays.asList("information_schema", "mysql"), informationSchemaDatabase));
-        ShardingSphereDatabase shardingSchemaDatabase = 
mockShardingSphereDatabase("sharding_db", false);
+        ShardingSphereDatabase shardingSchemaDatabase = 
mockDatabase("sharding_db", false);
         assertFalse(SystemSchemaUtils.containsSystemSchema(databaseType, 
Collections.singletonList("sharding_db"), shardingSchemaDatabase));
-        ShardingSphereDatabase customizedInformationSchemaDatabase = 
mockShardingSphereDatabase("information_schema", true);
+        ShardingSphereDatabase customizedInformationSchemaDatabase = 
mockDatabase("information_schema", true);
         assertFalse(SystemSchemaUtils.containsSystemSchema(databaseType, 
Arrays.asList("information_schema", "mysql"), 
customizedInformationSchemaDatabase));
     }
     
     @Test
     void assertContainsSystemSchemaForPostgreSQL() {
         DatabaseType databaseType = 
TypedSPILoader.getService(DatabaseType.class, "PostgreSQL");
-        ShardingSphereDatabase informationSchemaDatabase = 
mockShardingSphereDatabase("information_schema", false);
+        ShardingSphereDatabase informationSchemaDatabase = 
mockDatabase("information_schema", false);
         assertTrue(SystemSchemaUtils.containsSystemSchema(databaseType, 
Arrays.asList("information_schema", "pg_catalog"), informationSchemaDatabase));
-        ShardingSphereDatabase shardingSchemaDatabase = 
mockShardingSphereDatabase("sharding_db", false);
+        ShardingSphereDatabase shardingSchemaDatabase = 
mockDatabase("sharding_db", false);
         assertFalse(SystemSchemaUtils.containsSystemSchema(databaseType, 
Collections.singletonList("sharding_db"), shardingSchemaDatabase));
-        ShardingSphereDatabase customizedInformationSchemaDatabase = 
mockShardingSphereDatabase("information_schema", true);
+        ShardingSphereDatabase customizedInformationSchemaDatabase = 
mockDatabase("information_schema", true);
         assertTrue(SystemSchemaUtils.containsSystemSchema(databaseType, 
Arrays.asList("information_schema", "pg_catalog"), 
customizedInformationSchemaDatabase));
     }
     
     @Test
     void assertContainsSystemSchemaForOpenGaussSQL() {
         DatabaseType databaseType = 
TypedSPILoader.getService(DatabaseType.class, "openGauss");
-        ShardingSphereDatabase informationSchemaDatabase = 
mockShardingSphereDatabase("information_schema", false);
+        ShardingSphereDatabase informationSchemaDatabase = 
mockDatabase("information_schema", false);
         assertTrue(SystemSchemaUtils.containsSystemSchema(databaseType, 
Arrays.asList("information_schema", "pg_catalog"), informationSchemaDatabase));
-        ShardingSphereDatabase shardingSchemaDatabase = 
mockShardingSphereDatabase("sharding_db", false);
+        ShardingSphereDatabase shardingSchemaDatabase = 
mockDatabase("sharding_db", false);
         assertFalse(SystemSchemaUtils.containsSystemSchema(databaseType, 
Collections.singletonList("sharding_db"), shardingSchemaDatabase));
-        ShardingSphereDatabase customizedInformationSchemaDatabase = 
mockShardingSphereDatabase("information_schema", true);
+        ShardingSphereDatabase customizedInformationSchemaDatabase = 
mockDatabase("information_schema", true);
         assertTrue(SystemSchemaUtils.containsSystemSchema(databaseType, 
Arrays.asList("information_schema", "pg_catalog"), 
customizedInformationSchemaDatabase));
-        ShardingSphereDatabase customizedGaussDBDatabase = 
mockShardingSphereDatabase("gaussdb", true);
+        ShardingSphereDatabase customizedGaussDBDatabase = 
mockDatabase("gaussdb", true);
         assertFalse(SystemSchemaUtils.containsSystemSchema(databaseType, 
Collections.emptyList(), customizedGaussDBDatabase));
     }
     
-    private ShardingSphereDatabase mockShardingSphereDatabase(final String 
databaseName, final boolean isComplete) {
+    private ShardingSphereDatabase mockDatabase(final String databaseName, 
final boolean isComplete) {
         ShardingSphereDatabase result = mock(ShardingSphereDatabase.class);
         when(result.getName()).thenReturn(databaseName);
         when(result.isComplete()).thenReturn(isComplete);

Reply via email to