(shardingsphere) branch master updated: Remove redundant database type mocks (#35490)

[zh...@apache.org]

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 dbc8a9a29aa Remove redundant database type mocks (#35490)
dbc8a9a29aa is described below

commit dbc8a9a29aaeda6299947f55cc230d635219142f
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri May 23 00:29:25 2025 +0800

    Remove redundant database type mocks (#35490)
    
    * Add DistSQLExecutorDatabaseAware interface to ShowShardingTableNodesExecutor
    
    * Refactor SetTransactionHandler
    
    * Remove redundant database type mocks
    
    - Remove unnecessary database type mocking from FetchStreamMergedResultTest and ShardingDDLResultMergerTest
    - This change simplifies the test setup by removing redundant mock configurations
---
 .../shardingsphere/sharding/merge/ddl/ShardingDDLResultMergerTest.java  | 1 -
 .../sharding/merge/ddl/fetch/FetchStreamMergedResultTest.java           | 2 --
 2 files changed, 3 deletions(-)

diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/ddl/ShardingDDLResultMergerTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/ddl/ShardingDDLResultMergerTest.java
index 8914d07529f..b3a0d9e8f0b 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/ddl/ShardingDDLResultMergerTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/ddl/ShardingDDLResultMergerTest.java
@@ -97,7 +97,6 @@ class ShardingDDLResultMergerTest {
         SelectStatement result = mock(SelectStatement.class, RETURNS_DEEP_STUBS);
         when(result.getFrom()).thenReturn(Optional.of(new SimpleTableSegment(new TableNameSegment(10, 13, new IdentifierValue("tbl")))));
         when(result.getProjections()).thenReturn(new ProjectionsSegment(0, 0));
-        when(result.getDatabaseType()).thenReturn(databaseType);
         return result;
     }
     
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/ddl/fetch/FetchStreamMergedResultTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/ddl/fetch/FetchStreamMergedResultTest.java
index 55f0b15ffe1..a15486e856d 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/ddl/fetch/FetchStreamMergedResultTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/ddl/fetch/FetchStreamMergedResultTest.java
@@ -110,7 +110,6 @@ class FetchStreamMergedResultTest {
         CursorStatement cursorStatement = mock(CursorStatement.class);
         SelectStatement selectStatement = mockSelectStatement();
         when(cursorStatement.getSelect()).thenReturn(selectStatement);
-        when(cursorStatement.getDatabaseType()).thenReturn(DATABASE_TYPE);
         ShardingSphereDatabase database = mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
         when(database.getName()).thenReturn("foo_db");
         return new CursorStatementContext(new ShardingSphereMetaData(Collections.singleton(database), mock(), mock(), mock()), Collections.emptyList(), cursorStatement, "foo_db");
@@ -120,7 +119,6 @@ class FetchStreamMergedResultTest {
         SelectStatement result = mock(SelectStatement.class);
         when(result.getProjections()).thenReturn(new ProjectionsSegment(0, 0));
         when(result.getFrom()).thenReturn(Optional.of(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("foo_tbl")))));
-        when(result.getDatabaseType()).thenReturn(DATABASE_TYPE);
         return result;
     }