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 dcc87c0340e Fix sonar issue for
InsertClauseShardingConditionEngineTest (#25622)
dcc87c0340e is described below
commit dcc87c0340ebdf5d79ba4aa21a667cbab6069e4f
Author: Liang Zhang <[email protected]>
AuthorDate: Fri May 12 19:45:46 2023 +0800
Fix sonar issue for InsertClauseShardingConditionEngineTest (#25622)
* Fix sonar issue for InsertClauseShardingConditionEngineTest
* Fix sonar issue for ShardingLoadDataStatementValidatorTest
---
.../engine/InsertClauseShardingConditionEngineTest.java | 13 ++++++-------
.../dml/ShardingLoadDataStatementValidatorTest.java | 4 +++-
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/InsertClauseShardingConditionEngineTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/InsertClauseShardingConditionEngineTest.java
index a4dd1b0049f..8a4dd981ac0 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/InsertClauseShardingConditionEngineTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/InsertClauseShardingConditionEngineTest.java
@@ -59,7 +59,6 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -105,15 +104,15 @@ class InsertClauseShardingConditionEngineTest {
}
private InsertValueContext createInsertValueContext() {
- return new InsertValueContext(Collections.singletonList(new
LiteralExpressionSegment(0, 10, "1")), Collections.emptyList(), 0);
+ return new InsertValueContext(Collections.singleton(new
LiteralExpressionSegment(0, 10, "1")), Collections.emptyList(), 0);
}
private InsertValueContext
createInsertValueContextAsCommonExpressionSegmentEmptyText() {
- return new InsertValueContext(Collections.singletonList(new
CommonExpressionSegment(0, 10, "null")), Collections.emptyList(), 0);
+ return new InsertValueContext(Collections.singleton(new
CommonExpressionSegment(0, 10, "null")), Collections.emptyList(), 0);
}
private InsertValueContext
createInsertValueContextAsCommonExpressionSegmentWithNow() {
- return new InsertValueContext(Collections.singletonList(new
CommonExpressionSegment(0, 10, "now()")), Collections.emptyList(), 0);
+ return new InsertValueContext(Collections.singleton(new
CommonExpressionSegment(0, 10, "now()")), Collections.emptyList(), 0);
}
@Test
@@ -166,8 +165,8 @@ class InsertClauseShardingConditionEngineTest {
GeneratedKeyContext generatedKeyContext =
mock(GeneratedKeyContext.class);
when(insertStatementContext.getGeneratedKeyContext()).thenReturn(Optional.of(generatedKeyContext));
when(generatedKeyContext.isGenerated()).thenReturn(true);
-
when(generatedKeyContext.getGeneratedValues()).thenReturn(Collections.singletonList("foo_col1"));
-
when(shardingRule.findTableRule(eq("foo_table"))).thenReturn(Optional.of(new
TableRule(Collections.singletonList("foo_col_1"), "test")));
+
when(generatedKeyContext.getGeneratedValues()).thenReturn(Collections.singleton("foo_col_1"));
+
when(shardingRule.findTableRule("foo_table")).thenReturn(Optional.of(new
TableRule(Collections.singleton("foo_col_1"), "test")));
when(shardingRule.findShardingColumn(any(),
any())).thenReturn(Optional.of("foo_sharding_col"));
List<ShardingCondition> shardingConditions =
shardingConditionEngine.createShardingConditions(insertStatementContext,
Collections.emptyList());
assertThat(shardingConditions.get(0).getStartIndex(), is(0));
@@ -176,7 +175,7 @@ class InsertClauseShardingConditionEngineTest {
@Test
void assertCreateShardingConditionsWithParameterMarkers() {
- InsertValueContext insertValueContext = new
InsertValueContext(Collections.singletonList(new
ParameterMarkerExpressionSegment(0, 0, 0)), Collections.singletonList(1), 0);
+ InsertValueContext insertValueContext = new
InsertValueContext(Collections.singleton(new
ParameterMarkerExpressionSegment(0, 0, 0)), Collections.singletonList(1), 0);
when(insertStatementContext.getInsertValueContexts()).thenReturn(Collections.singletonList(insertValueContext));
when(shardingRule.findShardingColumn("foo_col_1",
"foo_table")).thenReturn(Optional.of("foo_col_1"));
List<ShardingCondition> shardingConditions =
shardingConditionEngine.createShardingConditions(insertStatementContext,
Collections.singletonList(1));
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingLoadDataStatementValidatorTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingLoadDataStatementValidatorTest.java
index 88451151541..5f02b12cd5e 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingLoadDataStatementValidatorTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingLoadDataStatementValidatorTest.java
@@ -36,6 +36,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
import java.util.Collections;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -51,7 +52,8 @@ class ShardingLoadDataStatementValidatorTest {
@Test
void assertPreValidateLoadDataWithSingleTable() {
MySQLLoadDataStatement sqlStatement = new MySQLLoadDataStatement(new
SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("t_order"))));
- new ShardingLoadDataStatementValidator().preValidate(shardingRule, new
LoadDataStatementContext(sqlStatement), Collections.emptyList(), database,
mock(ConfigurationProperties.class));
+ assertDoesNotThrow(() -> new
ShardingLoadDataStatementValidator().preValidate(
+ shardingRule, new LoadDataStatementContext(sqlStatement),
Collections.emptyList(), database, mock(ConfigurationProperties.class)));
}
@Test
