This is an automated email from the ASF dual-hosted git repository.

duanzhengqiang 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 dde4c9faba5 Refactor DatabaseNameUtilsTest (#29984)
dde4c9faba5 is described below

commit dde4c9faba5b50d8c89897410d79edb7b83de1c1
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Feb 4 17:35:02 2024 +0800

    Refactor DatabaseNameUtilsTest (#29984)
---
 .../handler/util/DatabaseNameUtilsTest.java        | 50 ++++++----------------
 1 file changed, 12 insertions(+), 38 deletions(-)

diff --git 
a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/util/DatabaseNameUtilsTest.java
 
b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/util/DatabaseNameUtilsTest.java
index 30d118660e1..eca885dbb06 100644
--- 
a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/util/DatabaseNameUtilsTest.java
+++ 
b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/util/DatabaseNameUtilsTest.java
@@ -20,56 +20,30 @@ package org.apache.shardingsphere.distsql.handler.util;
 import 
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
 import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
 import 
org.apache.shardingsphere.sql.parser.sql.common.statement.available.FromDatabaseAvailable;
-import 
org.apache.shardingsphere.sql.parser.sql.common.value.identifier.IdentifierValue;
-import org.apache.shardingsphere.test.mock.AutoMockExtension;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoSettings;
-import org.mockito.quality.Strictness;
 
 import java.util.Optional;
 
-import static org.mockito.Mockito.when;
+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;
 import static org.mockito.Mockito.withSettings;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.CoreMatchers.is;
 
-@ExtendWith(AutoMockExtension.class)
-@MockitoSettings(strictness = Strictness.LENIENT)
 class DatabaseNameUtilsTest {
     
-    private static final String CURRENT_DATABASE = "CURRENT_DATABASE";
-    
-    private static final String AVAILABLE_DATABASE = "AVAILABLE_DATABASE";
-    
-    @Mock
-    private SQLStatement sqlStatement;
-    
-    private FromDatabaseAvailable fromDatabaseAvailable = 
mock(FromDatabaseAvailable.class, 
withSettings().extraInterfaces(SQLStatement.class));
-    
-    @Mock
-    private DatabaseSegment databaseSegment;
-    
-    @Mock
-    private IdentifierValue identifierValue;
-    
-    @BeforeEach
-    void setup() {
-        
when(fromDatabaseAvailable.getDatabase()).thenReturn(Optional.of(databaseSegment));
-        when(databaseSegment.getIdentifier()).thenReturn(identifierValue);
-        when(identifierValue.getValue()).thenReturn(AVAILABLE_DATABASE);
-    }
-    
     @Test
-    void assertDatabaseNameWhenAvailableInSqlStatement() {
-        assertThat(DatabaseNameUtils.getDatabaseName((SQLStatement) 
fromDatabaseAvailable, CURRENT_DATABASE), is(AVAILABLE_DATABASE));
+    void assertDatabaseNameWhenAvailableInSQLStatement() {
+        FromDatabaseAvailable sqlStatement = mock(FromDatabaseAvailable.class, 
withSettings().extraInterfaces(SQLStatement.class));
+        DatabaseSegment databaseSegment = mock(DatabaseSegment.class, 
RETURNS_DEEP_STUBS);
+        when(databaseSegment.getIdentifier().getValue()).thenReturn("bar_db");
+        
when(sqlStatement.getDatabase()).thenReturn(Optional.of(databaseSegment));
+        assertThat(DatabaseNameUtils.getDatabaseName((SQLStatement) 
sqlStatement, "foo_db"), is("bar_db"));
     }
     
     @Test
-    void assertDatabaseNameWhenNotAvailableInSqlStatement() {
-        assertThat(DatabaseNameUtils.getDatabaseName(sqlStatement, 
CURRENT_DATABASE), is(CURRENT_DATABASE));
+    void assertDatabaseNameWhenNotAvailableInSQLStatement() {
+        assertThat(DatabaseNameUtils.getDatabaseName(mock(SQLStatement.class), 
"foo_db"), is("foo_db"));
     }
 }

Reply via email to