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 f06caea5eb1 Revise test cases for sharding checker (#33925)
f06caea5eb1 is described below
commit f06caea5eb1299c66f489c56b9422248fc92241e
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Dec 5 23:58:33 2024 +0800
Revise test cases for sharding checker (#33925)
---
.../sql/ddl/ShardingAlterIndexSupportedCheckerTest.java | 8 ++++----
.../sql/ddl/ShardingAlterTableSupportedCheckerTest.java | 6 +++---
.../sql/ddl/ShardingCreateIndexSupportedCheckerTest.java | 14 +++++++-------
.../sql/ddl/ShardingCreateViewSupportedCheckerTest.java | 10 +++++-----
.../sql/ddl/ShardingDropTableSupportedCheckerTest.java | 6 +++---
.../sql/ddl/ShardingRenameTableSupportedCheckerTest.java | 8 ++++----
.../sql/dml/ShardingDeleteSupportedCheckerTest.java | 8 ++++----
7 files changed, 30 insertions(+), 30 deletions(-)
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingAlterIndexSupportedCheckerTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingAlterIndexSupportedCheckerTest.java
index 4d5baa355ee..9161b8842a1 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingAlterIndexSupportedCheckerTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingAlterIndexSupportedCheckerTest.java
@@ -45,7 +45,7 @@ import static org.mockito.Mockito.when;
class ShardingAlterIndexSupportedCheckerTest {
@Mock
- private ShardingRule shardingRule;
+ private ShardingRule rule;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private ShardingSphereDatabase database;
@@ -60,7 +60,7 @@ class ShardingAlterIndexSupportedCheckerTest {
when(schema.getAllTables()).thenReturn(Collections.singleton(table));
when(table.containsIndex("t_order_index")).thenReturn(true);
when(table.containsIndex("t_order_index_new")).thenReturn(false);
- assertDoesNotThrow(() -> new
ShardingAlterIndexSupportedChecker().check(shardingRule, database, schema, new
AlterIndexStatementContext(sqlStatement, "foo_db")));
+ assertDoesNotThrow(() -> new
ShardingAlterIndexSupportedChecker().check(rule, database, schema, new
AlterIndexStatementContext(sqlStatement, "foo_db")));
}
@Test
@@ -70,7 +70,7 @@ class ShardingAlterIndexSupportedCheckerTest {
sqlStatement.setRenameIndex(new IndexSegment(0, 0, new
IndexNameSegment(0, 0, new IdentifierValue("t_order_index_new"))));
ShardingSphereTable table = mock(ShardingSphereTable.class);
when(database.getSchema("public").getTable("t_order")).thenReturn(table);
- assertThrows(IndexNotExistedException.class, () -> new
ShardingAlterIndexSupportedChecker().check(shardingRule, database, mock(), new
AlterIndexStatementContext(sqlStatement, "foo_db")));
+ assertThrows(IndexNotExistedException.class, () -> new
ShardingAlterIndexSupportedChecker().check(rule, database, mock(), new
AlterIndexStatementContext(sqlStatement, "foo_db")));
}
@Test
@@ -84,6 +84,6 @@ class ShardingAlterIndexSupportedCheckerTest {
when(table.containsIndex("t_order_index")).thenReturn(true);
when(table.containsIndex("t_order_index_new")).thenReturn(true);
assertThrows(DuplicateIndexException.class,
- () -> new
ShardingAlterIndexSupportedChecker().check(shardingRule, database, schema, new
AlterIndexStatementContext(sqlStatement, "foo_db")));
+ () -> new ShardingAlterIndexSupportedChecker().check(rule,
database, schema, new AlterIndexStatementContext(sqlStatement, "foo_db")));
}
}
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingAlterTableSupportedCheckerTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingAlterTableSupportedCheckerTest.java
index 1a76344e7a5..0ed445f918c 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingAlterTableSupportedCheckerTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingAlterTableSupportedCheckerTest.java
@@ -41,7 +41,7 @@ import static org.mockito.Mockito.when;
class ShardingAlterTableSupportedCheckerTest {
@Mock
- private ShardingRule shardingRule;
+ private ShardingRule rule;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private ShardingSphereDatabase database;
@@ -52,7 +52,7 @@ class ShardingAlterTableSupportedCheckerTest {
sqlStatement.setTable(new SimpleTableSegment(new TableNameSegment(0,
0, new IdentifierValue("t_order"))));
sqlStatement.setRenameTable(new SimpleTableSegment(new
TableNameSegment(0, 0, new IdentifierValue("t_order_new"))));
AlterTableStatementContext sqlStatementContext = new
AlterTableStatementContext(sqlStatement, "foo_db");
- when(shardingRule.containsShardingTable(Arrays.asList("t_order",
"t_order_new"))).thenReturn(true);
- assertThrows(UnsupportedShardingOperationException.class, () -> new
ShardingAlterTableSupportedChecker().check(shardingRule, database, mock(),
sqlStatementContext));
+ when(rule.containsShardingTable(Arrays.asList("t_order",
"t_order_new"))).thenReturn(true);
+ assertThrows(UnsupportedShardingOperationException.class, () -> new
ShardingAlterTableSupportedChecker().check(rule, database, mock(),
sqlStatementContext));
}
}
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingCreateIndexSupportedCheckerTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingCreateIndexSupportedCheckerTest.java
index b01e5d70700..60e86be90a0 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingCreateIndexSupportedCheckerTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingCreateIndexSupportedCheckerTest.java
@@ -45,7 +45,7 @@ import static org.mockito.Mockito.when;
class ShardingCreateIndexSupportedCheckerTest {
@Mock
- private ShardingRule shardingRule;
+ private ShardingRule rule;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private ShardingSphereDatabase database;
@@ -57,7 +57,7 @@ class ShardingCreateIndexSupportedCheckerTest {
sqlStatement.setIndex(new IndexSegment(0, 0, new IndexNameSegment(0,
0, new IdentifierValue("t_order_index"))));
ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
when(schema.containsTable("t_order")).thenReturn(true);
- assertDoesNotThrow(() -> new
ShardingCreateIndexSupportedChecker().check(shardingRule, database, schema, new
CreateIndexStatementContext(sqlStatement, "foo_db")));
+ assertDoesNotThrow(() -> new
ShardingCreateIndexSupportedChecker().check(rule, database, schema, new
CreateIndexStatementContext(sqlStatement, "foo_db")));
}
@Test
@@ -67,7 +67,7 @@ class ShardingCreateIndexSupportedCheckerTest {
sqlStatement.setIndex(new IndexSegment(0, 0, new IndexNameSegment(0,
0, new IdentifierValue("t_order_index"))));
ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
when(schema.containsTable("t_order")).thenReturn(false);
- assertThrows(NoSuchTableException.class, () -> new
ShardingCreateIndexSupportedChecker().check(shardingRule, database, schema, new
CreateIndexStatementContext(sqlStatement, "foo_db")));
+ assertThrows(NoSuchTableException.class, () -> new
ShardingCreateIndexSupportedChecker().check(rule, database, schema, new
CreateIndexStatementContext(sqlStatement, "foo_db")));
}
@Test
@@ -78,7 +78,7 @@ class ShardingCreateIndexSupportedCheckerTest {
ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
when(schema.containsTable("t_order")).thenReturn(true);
when(schema.containsIndex("t_order",
"t_order_index")).thenReturn(true);
- assertThrows(DuplicateIndexException.class, () -> new
ShardingCreateIndexSupportedChecker().check(shardingRule, database, schema, new
CreateIndexStatementContext(sqlStatement, "foo_db")));
+ assertThrows(DuplicateIndexException.class, () -> new
ShardingCreateIndexSupportedChecker().check(rule, database, schema, new
CreateIndexStatementContext(sqlStatement, "foo_db")));
}
@Test
@@ -89,7 +89,7 @@ class ShardingCreateIndexSupportedCheckerTest {
sqlStatement.setGeneratedIndexStartIndex(10);
ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
when(schema.containsTable("t_order")).thenReturn(true);
- assertDoesNotThrow(() -> new
ShardingCreateIndexSupportedChecker().check(shardingRule, database, schema, new
CreateIndexStatementContext(sqlStatement, "foo_db")));
+ assertDoesNotThrow(() -> new
ShardingCreateIndexSupportedChecker().check(rule, database, schema, new
CreateIndexStatementContext(sqlStatement, "foo_db")));
}
@Test
@@ -100,7 +100,7 @@ class ShardingCreateIndexSupportedCheckerTest {
sqlStatement.setGeneratedIndexStartIndex(10);
ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
when(schema.containsTable("t_order")).thenReturn(false);
- assertThrows(NoSuchTableException.class, () -> new
ShardingCreateIndexSupportedChecker().check(shardingRule, database, schema, new
CreateIndexStatementContext(sqlStatement, "foo_db")));
+ assertThrows(NoSuchTableException.class, () -> new
ShardingCreateIndexSupportedChecker().check(rule, database, schema, new
CreateIndexStatementContext(sqlStatement, "foo_db")));
}
@Test
@@ -112,6 +112,6 @@ class ShardingCreateIndexSupportedCheckerTest {
ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
when(schema.containsTable("t_order")).thenReturn(true);
when(schema.containsIndex("t_order", "content_idx")).thenReturn(true);
- assertThrows(DuplicateIndexException.class, () -> new
ShardingCreateIndexSupportedChecker().check(shardingRule, database, schema, new
CreateIndexStatementContext(sqlStatement, "foo_db")));
+ assertThrows(DuplicateIndexException.class, () -> new
ShardingCreateIndexSupportedChecker().check(rule, database, schema, new
CreateIndexStatementContext(sqlStatement, "foo_db")));
}
}
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingCreateViewSupportedCheckerTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingCreateViewSupportedCheckerTest.java
index 1f7544cdb58..e4a2f33984d 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingCreateViewSupportedCheckerTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingCreateViewSupportedCheckerTest.java
@@ -51,7 +51,7 @@ class ShardingCreateViewSupportedCheckerTest {
private RouteContext routeContext;
@Mock
- private ShardingRule shardingRule;
+ private ShardingRule rule;
@Mock
private CreateViewStatementContext createViewStatementContext;
@@ -73,13 +73,13 @@ class ShardingCreateViewSupportedCheckerTest {
@Test
void assertCheck() {
- assertDoesNotThrow(() -> new
ShardingCreateViewSupportedChecker().check(shardingRule, mock(), mock(),
createViewStatementContext));
+ assertDoesNotThrow(() -> new
ShardingCreateViewSupportedChecker().check(rule, mock(), mock(),
createViewStatementContext));
}
@Test
void assertCheckWithException() {
- when(shardingRule.isShardingTable(any())).thenReturn(true);
- when(shardingRule.isAllBindingTables(any())).thenReturn(false);
- assertThrows(EngagedViewException.class, () -> new
ShardingCreateViewSupportedChecker().check(shardingRule, mock(), mock(),
createViewStatementContext));
+ when(rule.isShardingTable(any())).thenReturn(true);
+ when(rule.isAllBindingTables(any())).thenReturn(false);
+ assertThrows(EngagedViewException.class, () -> new
ShardingCreateViewSupportedChecker().check(rule, mock(), mock(),
createViewStatementContext));
}
}
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingDropTableSupportedCheckerTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingDropTableSupportedCheckerTest.java
index 4efeb700a4e..38489b6b6df 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingDropTableSupportedCheckerTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingDropTableSupportedCheckerTest.java
@@ -50,14 +50,14 @@ import static org.mockito.Mockito.when;
class ShardingDropTableSupportedCheckerTest {
@Mock
- private ShardingRule shardingRule;
+ private ShardingRule rule;
@BeforeEach
void init() {
Map<String, ShardingTable> shardingTables = new LinkedHashMap<>(2, 1F);
shardingTables.put("t_order_item",
createShardingTable("t_order_item"));
shardingTables.put("t_order", createShardingTable("t_order"));
- when(shardingRule.getShardingTables()).thenReturn(shardingTables);
+ when(rule.getShardingTables()).thenReturn(shardingTables);
}
@Test
@@ -69,7 +69,7 @@ class ShardingDropTableSupportedCheckerTest {
ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
when(schema.containsTable("t_order_item")).thenReturn(true);
ShardingDropTableSupportedChecker checker = new
ShardingDropTableSupportedChecker();
- assertDoesNotThrow(() -> checker.check(shardingRule, database, schema,
sqlStatementContext));
+ assertDoesNotThrow(() -> checker.check(rule, database, schema,
sqlStatementContext));
}
private ShardingTable createShardingTable(final String tableName) {
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingRenameTableSupportedCheckerTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingRenameTableSupportedCheckerTest.java
index fdfec20f08e..d4aaae3d616 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingRenameTableSupportedCheckerTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingRenameTableSupportedCheckerTest.java
@@ -40,19 +40,19 @@ import static org.mockito.Mockito.when;
class ShardingRenameTableSupportedCheckerTest {
@Mock
- private ShardingRule shardingRule;
+ private ShardingRule rule;
@Test
void assertCheckShardingTable() {
RenameTableStatementContext sqlStatementContext =
createRenameTableStatementContext("t_order", "t_user_order");
- when(shardingRule.containsShardingTable(argThat(tableNames ->
tableNames.contains("t_order") ||
tableNames.contains("t_user_order")))).thenReturn(true);
- assertThrows(UnsupportedShardingOperationException.class, () -> new
ShardingRenameTableSupportedChecker().check(shardingRule, mock(), mock(),
sqlStatementContext));
+ when(rule.containsShardingTable(argThat(tableNames ->
tableNames.contains("t_order") ||
tableNames.contains("t_user_order")))).thenReturn(true);
+ assertThrows(UnsupportedShardingOperationException.class, () -> new
ShardingRenameTableSupportedChecker().check(rule, mock(), mock(),
sqlStatementContext));
}
@Test
void assertCheckNormalCase() {
RenameTableStatementContext sqlStatementContext =
createRenameTableStatementContext("t_not_sharding_table",
"t_not_sharding_table_new");
- assertDoesNotThrow(() -> new
ShardingRenameTableSupportedChecker().check(shardingRule, mock(), mock(),
sqlStatementContext));
+ assertDoesNotThrow(() -> new
ShardingRenameTableSupportedChecker().check(rule, mock(), mock(),
sqlStatementContext));
}
private RenameTableStatementContext
createRenameTableStatementContext(final String originTableName, final String
newTableName) {
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/dml/ShardingDeleteSupportedCheckerTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/dml/ShardingDeleteSupportedCheckerTest.java
index 2224f969f7a..7644a8f4109 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/dml/ShardingDeleteSupportedCheckerTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/dml/ShardingDeleteSupportedCheckerTest.java
@@ -47,7 +47,7 @@ import static org.mockito.Mockito.when;
class ShardingDeleteSupportedCheckerTest {
@Mock
- private ShardingRule shardingRule;
+ private ShardingRule rule;
@Test
void assertCheckWhenDeleteMultiTablesForMySQL() {
@@ -81,9 +81,9 @@ class ShardingDeleteSupportedCheckerTest {
tableSegment.getActualDeleteTables().add(new SimpleTableSegment(new
TableNameSegment(0, 0, new IdentifierValue("order_item"))));
sqlStatement.setTable(tableSegment);
Collection<String> tableNames = new HashSet<>(Arrays.asList("user",
"order", "order_item"));
- when(shardingRule.isAllShardingTables(tableNames)).thenReturn(false);
- when(shardingRule.containsShardingTable(tableNames)).thenReturn(true);
+ when(rule.isAllShardingTables(tableNames)).thenReturn(false);
+ when(rule.containsShardingTable(tableNames)).thenReturn(true);
DeleteStatementContext sqlStatementContext = new
DeleteStatementContext(sqlStatement, "foo_db");
- new ShardingDeleteSupportedChecker().check(shardingRule, mock(),
mock(), sqlStatementContext);
+ new ShardingDeleteSupportedChecker().check(rule, mock(), mock(),
sqlStatementContext);
}
}
