This is an automated email from the ASF dual-hosted git repository.
panjuan 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 38d900502e4 Revise #26845 (#26872)
38d900502e4 is described below
commit 38d900502e477211f200d2951198513ce19db941
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Mon Jul 10 13:22:53 2023 +0800
Revise #26845 (#26872)
---
.../nodepath/BroadcastRuleNodePathProviderTest.java | 13 ++++++-------
.../CompatibleEncryptRuleNodePathProviderTest.java | 13 ++++++-------
.../nodepath/EncryptRuleNodePathProviderTest.java | 13 ++++++-------
.../metadata/nodepath/MaskRuleNodePathProviderTest.java | 13 ++++++-------
.../ReadwriteSplittingRuleNodePathProviderTest.java | 13 ++++++-------
.../nodepath/ShadowRuleNodePathProviderTest.java | 15 +++++++--------
.../nodepath/ShardingRuleNodePathProviderTest.java | 16 +++++++---------
.../nodepath/SingleRuleNodePathProviderTest.java | 13 ++++++-------
8 files changed, 50 insertions(+), 59 deletions(-)
diff --git
a/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/metadata/nodepath/BroadcastRuleNodePathProviderTest.java
b/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/metadata/nodepath/BroadcastRuleNodePathProviderTest.java
index f33d3225f08..0527a8c0f02 100644
---
a/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/metadata/nodepath/BroadcastRuleNodePathProviderTest.java
+++
b/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/metadata/nodepath/BroadcastRuleNodePathProviderTest.java
@@ -21,20 +21,19 @@ import
org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath;
import org.apache.shardingsphere.mode.spi.RuleNodePathProvider;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
-public class BroadcastRuleNodePathProviderTest {
+class BroadcastRuleNodePathProviderTest {
@Test
- void assertBroadcastRuleNodePath() {
+ void assertNew() {
RuleNodePathProvider ruleNodePathProvider = new
BroadcastRuleNodePathProvider();
RuleNodePath actualRuleNodePath =
ruleNodePathProvider.getRuleNodePath();
assertTrue(actualRuleNodePath.getNamedItems().isEmpty());
- assertEquals(1, actualRuleNodePath.getUniqueItems().size());
+ assertThat(actualRuleNodePath.getUniqueItems().size(), is(1));
assertTrue(actualRuleNodePath.getUniqueItems().containsKey(BroadcastRuleNodePathProvider.TABLES));
- assertNotNull(actualRuleNodePath.getRoot());
- assertEquals(BroadcastRuleNodePathProvider.RULE_TYPE,
actualRuleNodePath.getRoot().getRuleType());
+ assertThat(actualRuleNodePath.getRoot().getRuleType(),
is(BroadcastRuleNodePathProvider.RULE_TYPE));
}
}
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/metadata/nodepath/CompatibleEncryptRuleNodePathProviderTest.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/metadata/nodepath/CompatibleEncryptRuleNodePathProviderTest.java
index 41439da769e..5be1b8487e8 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/metadata/nodepath/CompatibleEncryptRuleNodePathProviderTest.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/metadata/nodepath/CompatibleEncryptRuleNodePathProviderTest.java
@@ -21,21 +21,20 @@ import
org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath;
import org.apache.shardingsphere.mode.spi.RuleNodePathProvider;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
-public class CompatibleEncryptRuleNodePathProviderTest {
+class CompatibleEncryptRuleNodePathProviderTest {
@Test
- void assertCompatibleEncryptRuleNodePath() {
+ void assertNew() {
RuleNodePathProvider ruleNodePathProvider = new
CompatibleEncryptRuleNodePathProvider();
RuleNodePath actualRuleNodePath =
ruleNodePathProvider.getRuleNodePath();
- assertEquals(2, actualRuleNodePath.getNamedItems().size());
+ assertThat(actualRuleNodePath.getNamedItems().size(), is(2));
assertTrue(actualRuleNodePath.getNamedItems().containsKey(CompatibleEncryptRuleNodePathProvider.ENCRYPTORS));
assertTrue(actualRuleNodePath.getNamedItems().containsKey(CompatibleEncryptRuleNodePathProvider.TABLES));
assertTrue(actualRuleNodePath.getUniqueItems().isEmpty());
- assertNotNull(actualRuleNodePath.getRoot());
- assertEquals(CompatibleEncryptRuleNodePathProvider.RULE_TYPE,
actualRuleNodePath.getRoot().getRuleType());
+ assertThat(actualRuleNodePath.getRoot().getRuleType(),
is(CompatibleEncryptRuleNodePathProvider.RULE_TYPE));
}
}
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/metadata/nodepath/EncryptRuleNodePathProviderTest.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/metadata/nodepath/EncryptRuleNodePathProviderTest.java
index 7fdd96249ab..df97fb93a8c 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/metadata/nodepath/EncryptRuleNodePathProviderTest.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/metadata/nodepath/EncryptRuleNodePathProviderTest.java
@@ -21,21 +21,20 @@ import
org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath;
import org.apache.shardingsphere.mode.spi.RuleNodePathProvider;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
-public class EncryptRuleNodePathProviderTest {
+class EncryptRuleNodePathProviderTest {
@Test
- void assertEncryptRuleNodePath() {
+ void assertNew() {
RuleNodePathProvider ruleNodePathProvider = new
EncryptRuleNodePathProvider();
RuleNodePath actualRuleNodePath =
ruleNodePathProvider.getRuleNodePath();
- assertEquals(2, actualRuleNodePath.getNamedItems().size());
+ assertThat(actualRuleNodePath.getNamedItems().size(), is(2));
assertTrue(actualRuleNodePath.getNamedItems().containsKey(EncryptRuleNodePathProvider.ENCRYPTORS));
assertTrue(actualRuleNodePath.getNamedItems().containsKey(EncryptRuleNodePathProvider.TABLES));
assertTrue(actualRuleNodePath.getUniqueItems().isEmpty());
- assertNotNull(actualRuleNodePath.getRoot());
- assertEquals(EncryptRuleNodePathProvider.RULE_TYPE,
actualRuleNodePath.getRoot().getRuleType());
+ assertThat(actualRuleNodePath.getRoot().getRuleType(),
is(EncryptRuleNodePathProvider.RULE_TYPE));
}
}
diff --git
a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/metadata/nodepath/MaskRuleNodePathProviderTest.java
b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/metadata/nodepath/MaskRuleNodePathProviderTest.java
index 9f7871728fa..15f87fe204b 100644
---
a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/metadata/nodepath/MaskRuleNodePathProviderTest.java
+++
b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/metadata/nodepath/MaskRuleNodePathProviderTest.java
@@ -21,21 +21,20 @@ import
org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath;
import org.apache.shardingsphere.mode.spi.RuleNodePathProvider;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
-public class MaskRuleNodePathProviderTest {
+class MaskRuleNodePathProviderTest {
@Test
- void assertMaskRuleNodePath() {
+ void assertNew() {
RuleNodePathProvider ruleNodePathProvider = new
MaskRuleNodePathProvider();
RuleNodePath actualRuleNodePath =
ruleNodePathProvider.getRuleNodePath();
- assertEquals(2, actualRuleNodePath.getNamedItems().size());
+ assertThat(actualRuleNodePath.getNamedItems().size(), is(2));
assertTrue(actualRuleNodePath.getNamedItems().containsKey(MaskRuleNodePathProvider.ALGORITHMS));
assertTrue(actualRuleNodePath.getNamedItems().containsKey(MaskRuleNodePathProvider.TABLES));
assertTrue(actualRuleNodePath.getUniqueItems().isEmpty());
- assertNotNull(actualRuleNodePath.getRoot());
- assertEquals(MaskRuleNodePathProvider.RULE_TYPE,
actualRuleNodePath.getRoot().getRuleType());
+ assertThat(actualRuleNodePath.getRoot().getRuleType(),
is(MaskRuleNodePathProvider.RULE_TYPE));
}
}
diff --git
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/metadata/nodepath/ReadwriteSplittingRuleNodePathProviderTest.java
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/metadata/nodepath/ReadwriteSplittingRuleNodePathProviderTest.java
index 05aa33c87a2..1f4a35bfebe 100644
---
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/metadata/nodepath/ReadwriteSplittingRuleNodePathProviderTest.java
+++
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/metadata/nodepath/ReadwriteSplittingRuleNodePathProviderTest.java
@@ -21,21 +21,20 @@ import
org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath;
import org.apache.shardingsphere.mode.spi.RuleNodePathProvider;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
-public class ReadwriteSplittingRuleNodePathProviderTest {
+class ReadwriteSplittingRuleNodePathProviderTest {
@Test
- void assertReadwriteSplittingRuleNodePath() {
+ void assertNew() {
RuleNodePathProvider ruleNodePathProvider = new
ReadwriteSplittingRuleNodePathProvider();
RuleNodePath actualRuleNodePath =
ruleNodePathProvider.getRuleNodePath();
- assertEquals(2, actualRuleNodePath.getNamedItems().size());
+ assertThat(actualRuleNodePath.getNamedItems().size(), is(2));
assertTrue(actualRuleNodePath.getNamedItems().containsKey(ReadwriteSplittingRuleNodePathProvider.DATA_SOURCES));
assertTrue(actualRuleNodePath.getNamedItems().containsKey(ReadwriteSplittingRuleNodePathProvider.LOAD_BALANCERS));
assertTrue(actualRuleNodePath.getUniqueItems().isEmpty());
- assertNotNull(actualRuleNodePath.getRoot());
- assertEquals(ReadwriteSplittingRuleNodePathProvider.RULE_TYPE,
actualRuleNodePath.getRoot().getRuleType());
+ assertThat(actualRuleNodePath.getRoot().getRuleType(),
is(ReadwriteSplittingRuleNodePathProvider.RULE_TYPE));
}
}
diff --git
a/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/metadata/nodepath/ShadowRuleNodePathProviderTest.java
b/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/metadata/nodepath/ShadowRuleNodePathProviderTest.java
index 67f1ef6acad..be1c6cfd7bd 100644
---
a/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/metadata/nodepath/ShadowRuleNodePathProviderTest.java
+++
b/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/metadata/nodepath/ShadowRuleNodePathProviderTest.java
@@ -21,23 +21,22 @@ import
org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath;
import org.apache.shardingsphere.mode.spi.RuleNodePathProvider;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
-public class ShadowRuleNodePathProviderTest {
+class ShadowRuleNodePathProviderTest {
@Test
- void assertShadowRuleNodePath() {
+ void assertNew() {
RuleNodePathProvider ruleNodePathProvider = new
ShadowRuleNodePathProvider();
RuleNodePath actualRuleNodePath =
ruleNodePathProvider.getRuleNodePath();
- assertEquals(3, actualRuleNodePath.getNamedItems().size());
+ assertThat(actualRuleNodePath.getNamedItems().size(), is(3));
assertTrue(actualRuleNodePath.getNamedItems().containsKey(ShadowRuleNodePathProvider.ALGORITHMS));
assertTrue(actualRuleNodePath.getNamedItems().containsKey(ShadowRuleNodePathProvider.TABLES));
assertTrue(actualRuleNodePath.getNamedItems().containsKey(ShadowRuleNodePathProvider.DATA_SOURCES));
- assertEquals(1, actualRuleNodePath.getUniqueItems().size());
+ assertThat(actualRuleNodePath.getUniqueItems().size(), is(1));
assertTrue(actualRuleNodePath.getUniqueItems().containsKey(ShadowRuleNodePathProvider.DEFAULT_ALGORITHM));
- assertNotNull(actualRuleNodePath.getRoot());
- assertEquals(ShadowRuleNodePathProvider.RULE_TYPE,
actualRuleNodePath.getRoot().getRuleType());
+ assertThat(actualRuleNodePath.getRoot().getRuleType(),
is(ShadowRuleNodePathProvider.RULE_TYPE));
}
}
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/metadata/nodepath/ShardingRuleNodePathProviderTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/metadata/nodepath/ShardingRuleNodePathProviderTest.java
index 4b597eff4a0..da7a36812e8 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/metadata/nodepath/ShardingRuleNodePathProviderTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/metadata/nodepath/ShardingRuleNodePathProviderTest.java
@@ -25,26 +25,24 @@ import org.junit.jupiter.api.Test;
import java.util.Arrays;
import java.util.List;
+import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-public class ShardingRuleNodePathProviderTest {
+class ShardingRuleNodePathProviderTest {
+
@Test
- void assertShardingRuleNodePath() {
+ void assertNew() {
RuleNodePathProvider ruleNodePathProvider = new
ShardingRuleNodePathProvider();
RuleNodePath actualRuleNodePath =
ruleNodePathProvider.getRuleNodePath();
- assertEquals(6, actualRuleNodePath.getNamedItems().size());
+ assertThat(actualRuleNodePath.getNamedItems().size(), is(6));
List<String> namedRuleItems =
Arrays.asList(ShardingRuleNodePathProvider.TABLES,
ShardingRuleNodePathProvider.AUTO_TABLES,
ShardingRuleNodePathProvider.BINDING_TABLES,
ShardingRuleNodePathProvider.ALGORITHMS,
ShardingRuleNodePathProvider.KEY_GENERATORS,
ShardingRuleNodePathProvider.AUDITORS);
assertThat("Named rule items equality without order",
actualRuleNodePath.getNamedItems().keySet(),
IsIterableContainingInAnyOrder.containsInAnyOrder(namedRuleItems.toArray()));
- assertEquals(6, actualRuleNodePath.getUniqueItems().size());
+ assertThat(actualRuleNodePath.getUniqueItems().size(), is(6));
List<String> uniqueRuleItems =
Arrays.asList(ShardingRuleNodePathProvider.DEFAULT_DATABASE_STRATEGY,
ShardingRuleNodePathProvider.DEFAULT_TABLE_STRATEGY,
ShardingRuleNodePathProvider.DEFAULT_KEY_GENERATE_STRATEGY,
ShardingRuleNodePathProvider.DEFAULT_AUDIT_STRATEGY,
ShardingRuleNodePathProvider.DEFAULT_SHARDING_COLUMN,
ShardingRuleNodePathProvider.SHARDING_CACHE);
assertThat("Unique rule items equality without order",
actualRuleNodePath.getUniqueItems().keySet(),
IsIterableContainingInAnyOrder.containsInAnyOrder(uniqueRuleItems.toArray()));
- assertNotNull(actualRuleNodePath.getRoot());
- assertEquals(ShardingRuleNodePathProvider.RULE_TYPE,
actualRuleNodePath.getRoot().getRuleType());
+ assertThat(actualRuleNodePath.getRoot().getRuleType(),
is(ShardingRuleNodePathProvider.RULE_TYPE));
}
}
diff --git
a/kernel/single/core/src/test/java/org/apache/shardingsphere/single/metadata/nodepath/SingleRuleNodePathProviderTest.java
b/kernel/single/core/src/test/java/org/apache/shardingsphere/single/metadata/nodepath/SingleRuleNodePathProviderTest.java
index df40c58e94d..fd02d55095e 100644
---
a/kernel/single/core/src/test/java/org/apache/shardingsphere/single/metadata/nodepath/SingleRuleNodePathProviderTest.java
+++
b/kernel/single/core/src/test/java/org/apache/shardingsphere/single/metadata/nodepath/SingleRuleNodePathProviderTest.java
@@ -21,20 +21,19 @@ import
org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath;
import org.apache.shardingsphere.mode.spi.RuleNodePathProvider;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
-public class SingleRuleNodePathProviderTest {
+class SingleRuleNodePathProviderTest {
@Test
- void assertSingleRuleNodePath() {
+ void assertNew() {
RuleNodePathProvider ruleNodePathProvider = new
SingleRuleNodePathProvider();
RuleNodePath actualRuleNodePath =
ruleNodePathProvider.getRuleNodePath();
assertTrue(actualRuleNodePath.getNamedItems().isEmpty());
- assertEquals(1, actualRuleNodePath.getUniqueItems().size());
+ assertThat(actualRuleNodePath.getUniqueItems().size(), is(1));
assertTrue(actualRuleNodePath.getUniqueItems().containsKey(SingleRuleNodePathProvider.TABLES));
- assertNotNull(actualRuleNodePath.getRoot());
- assertEquals(SingleRuleNodePathProvider.RULE_TYPE,
actualRuleNodePath.getRoot().getRuleType());
+ assertThat(actualRuleNodePath.getRoot().getRuleType(),
is(SingleRuleNodePathProvider.RULE_TYPE));
}
}
