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 9e41867ccec Refactor EncryptDALResultDecoratorTest (#35889) 9e41867ccec is described below commit 9e41867ccec19d6d8ed083c9bc08555fc86c6e13 Author: Liang Zhang <zhangli...@apache.org> AuthorDate: Fri Jul 4 22:54:28 2025 +0800 Refactor EncryptDALResultDecoratorTest (#35889) --- .../encrypt/merge/dal/EncryptDALResultDecoratorTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/EncryptDALResultDecoratorTest.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/EncryptDALResultDecoratorTest.java index 7fcd6ebfd32..ea5da1e995a 100644 --- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/EncryptDALResultDecoratorTest.java +++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/EncryptDALResultDecoratorTest.java @@ -21,7 +21,6 @@ import org.apache.shardingsphere.encrypt.merge.dal.show.EncryptShowColumnsMerged import org.apache.shardingsphere.encrypt.merge.dal.show.EncryptShowCreateTableMergedResult; import org.apache.shardingsphere.encrypt.rule.EncryptRule; import org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext; -import org.apache.shardingsphere.infra.binder.context.statement.type.CommonSQLStatementContext; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.merge.result.MergedResult; import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData; @@ -30,8 +29,8 @@ import org.apache.shardingsphere.parser.rule.SQLParserRule; import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.SimpleTableSegment; import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.TableNameSegment; import org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatement; -import org.apache.shardingsphere.sql.parser.statement.core.statement.attribute.type.ColumnInResultSetSQLStatementAttribute; import org.apache.shardingsphere.sql.parser.statement.core.statement.attribute.SQLStatementAttributes; +import org.apache.shardingsphere.sql.parser.statement.core.statement.attribute.type.ColumnInResultSetSQLStatementAttribute; import org.apache.shardingsphere.sql.parser.statement.core.statement.attribute.type.TableInResultSetSQLStatementAttribute; import org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue; import org.junit.jupiter.api.Test; @@ -90,7 +89,7 @@ class EncryptDALResultDecoratorTest { } private SQLStatementContext mockTableInfoInResultSetAvailableStatementContext() { - SQLStatementContext result = mock(CommonSQLStatementContext.class, RETURNS_DEEP_STUBS); + SQLStatementContext result = mock(SQLStatementContext.class, RETURNS_DEEP_STUBS); when(result.getDatabaseType()).thenReturn(databaseType); SimpleTableSegment simpleTableSegment = new SimpleTableSegment(new TableNameSegment(1, 7, new IdentifierValue("foo_tbl"))); when(result.getTablesContext().getSimpleTables()).thenReturn(Collections.singleton(simpleTableSegment));