[shardingsphere] branch master updated: Revise #15130 (#15372)

[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 30f8beb  Revise #15130 (#15372)
30f8beb is described below

commit 30f8bebef5f8a849ae97e06f494e9b9d87defe86
Author: Guocheng Tang <to...@qq.com>
AuthorDate: Sat Feb 12 12:06:48 2022 +0800

    Revise #15130 (#15372)
    
    * Revise #15130
    
    * update code style
---
 .../engine/condition/ShardingConditionsTest.java   | 40 ++++++++++++----------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/condition/ShardingConditionsTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/condition/ShardingConditionsTest.java
index 28398f3..30b4fe4 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/condition/ShardingConditionsTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/condition/ShardingConditionsTest.java
@@ -29,62 +29,66 @@ import org.mockito.junit.MockitoJUnitRunner;
 import java.util.Collections;
 import java.util.LinkedList;
 
+import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
 
 @RunWith(MockitoJUnitRunner.class)
 public final class ShardingConditionsTest {
-
+    
     @Test
     public void assertIsAlwaysFalse() {
         ShardingConditions shardingConditions = new ShardingConditions(Collections.emptyList(), mock(SQLStatementContext.class), mock(ShardingRule.class));
         assertFalse(shardingConditions.isAlwaysFalse());
     }
-
+    
     @Test
     public void assertIsAlwaysFalseTrue() {
-        ShardingConditions shardingConditions = createSingleShardingConditions("t_order");
+        ShardingConditions shardingConditions = createSingleShardingConditions();
         assertTrue(shardingConditions.isAlwaysFalse());
     }
-
+    
     @Test
     public void assertIsNeedMerge() {
-        assertFalse(createSingleShardingConditions("t_order").isNeedMerge());
+        assertFalse(createSingleShardingConditions().isNeedMerge());
     }
-
+    
     @Test
     public void isSameShardingConditionTrue() {
-        ShardingConditions shardingConditions = createSingleShardingConditions("t_order");
+        ShardingConditions shardingConditions = createSingleShardingConditions();
         assertTrue(shardingConditions.isSameShardingCondition());
     }
-
+    
     @Test
     public void isSameShardingConditionFalse() {
-        ShardingConditions shardingConditions = createMultipleShardingConditions("t_order");
+        ShardingConditions shardingConditions = createMultipleShardingConditions();
         assertFalse(shardingConditions.isSameShardingCondition());
     }
-
+    
     @Test
     public void assertMerge() {
-        createSingleShardingConditions("t_order").merge();
+        ShardingConditions multipleShardingConditions = createMultipleShardingConditions();
+        multipleShardingConditions.merge();
+        assertThat(multipleShardingConditions.getConditions().size(), is(2));
     }
-
-    private ShardingConditions createSingleShardingConditions(final String tableName) {
+    
+    private ShardingConditions createSingleShardingConditions() {
         LinkedList<ShardingCondition> result = new LinkedList<>();
-        ShardingConditionValue shardingConditionValue = new ListShardingConditionValue<>("order_id", tableName, Collections.singleton(1L));
+        ShardingConditionValue shardingConditionValue = new ListShardingConditionValue<>("order_id", "t_order", Collections.singleton(1L));
         AlwaysFalseShardingCondition shardingCondition = new AlwaysFalseShardingCondition();
         shardingCondition.getValues().add(shardingConditionValue);
         result.add(shardingCondition);
         SelectStatementContext sqlStatementContext = mock(SelectStatementContext.class, RETURNS_DEEP_STUBS);
         return new ShardingConditions(result, sqlStatementContext, mock(ShardingRule.class));
     }
-
-    private ShardingConditions createMultipleShardingConditions(final String tableName) {
+    
+    private ShardingConditions createMultipleShardingConditions() {
         LinkedList<ShardingCondition> result = new LinkedList<>();
-        ShardingConditionValue shardingConditionValue1 = new ListShardingConditionValue<>("user_id", tableName, Collections.singleton(1L));
-        ShardingConditionValue shardingConditionValue2 = new ListShardingConditionValue<>("order_id", tableName, Collections.singleton(1L));
+        ShardingConditionValue shardingConditionValue1 = new ListShardingConditionValue<>("user_id", "t_order", Collections.singleton(1L));
+        ShardingConditionValue shardingConditionValue2 = new ListShardingConditionValue<>("order_id", "t_order", Collections.singleton(1L));
         ShardingCondition shardingCondition = new ShardingCondition();
         shardingCondition.getValues().add(shardingConditionValue1);
         ShardingCondition shardingCondition2 = new ShardingCondition();