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 810f242aa05 Add more test cases on DatabaseRuleConfiguration's impl
(#33578)
810f242aa05 is described below
commit 810f242aa05269557ccf5ab790ddb6ca72c11ce4
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Nov 7 00:40:05 2024 +0800
Add more test cases on DatabaseRuleConfiguration's impl (#33578)
* Add test cases on ReadwriteSplittingRuleConfiguration
* Add more test cases on DatabaseRuleConfiguration's impl
---
.../broadcast/config/BroadcastRuleConfigurationTest.java} | 14 +++-----------
.../encrypt/config/EncryptRuleConfigurationTest.java} | 14 +++-----------
.../mask/config/MaskRuleConfigurationTest.java | 8 --------
.../ReadwriteSplittingRuleStatementConverterTest.java | 10 ++++++----
4 files changed, 12 insertions(+), 34 deletions(-)
diff --git
a/features/mask/api/src/test/java/org/apache/shardingsphere/mask/config/MaskRuleConfigurationTest.java
b/features/broadcast/api/src/test/java/org/apache/shardingsphere/broadcast/config/BroadcastRuleConfigurationTest.java
similarity index 63%
copy from
features/mask/api/src/test/java/org/apache/shardingsphere/mask/config/MaskRuleConfigurationTest.java
copy to
features/broadcast/api/src/test/java/org/apache/shardingsphere/broadcast/config/BroadcastRuleConfigurationTest.java
index 8b2351b60e2..93500a0f321 100644
---
a/features/mask/api/src/test/java/org/apache/shardingsphere/mask/config/MaskRuleConfigurationTest.java
+++
b/features/broadcast/api/src/test/java/org/apache/shardingsphere/broadcast/config/BroadcastRuleConfigurationTest.java
@@ -15,26 +15,18 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mask.config;
+package org.apache.shardingsphere.broadcast.config;
-import org.apache.shardingsphere.mask.config.rule.MaskTableRuleConfiguration;
import org.junit.jupiter.api.Test;
import java.util.Collections;
-import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-class MaskRuleConfigurationTest {
+class BroadcastRuleConfigurationTest {
@Test
void assertIsEmpty() {
- assertTrue(new MaskRuleConfiguration(Collections.emptyList(),
Collections.emptyMap()).isEmpty());
- }
-
- @Test
- void assertIsNotEmpty() {
- assertFalse(new
MaskRuleConfiguration(Collections.singleton(mock(MaskTableRuleConfiguration.class)),
Collections.emptyMap()).isEmpty());
+ assertTrue(new
BroadcastRuleConfiguration(Collections.emptyList()).isEmpty());
}
}
diff --git
a/features/mask/api/src/test/java/org/apache/shardingsphere/mask/config/MaskRuleConfigurationTest.java
b/features/encrypt/api/src/test/java/org/apache/shardingsphere/encrypt/config/EncryptRuleConfigurationTest.java
similarity index 63%
copy from
features/mask/api/src/test/java/org/apache/shardingsphere/mask/config/MaskRuleConfigurationTest.java
copy to
features/encrypt/api/src/test/java/org/apache/shardingsphere/encrypt/config/EncryptRuleConfigurationTest.java
index 8b2351b60e2..363652e9113 100644
---
a/features/mask/api/src/test/java/org/apache/shardingsphere/mask/config/MaskRuleConfigurationTest.java
+++
b/features/encrypt/api/src/test/java/org/apache/shardingsphere/encrypt/config/EncryptRuleConfigurationTest.java
@@ -15,26 +15,18 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mask.config;
+package org.apache.shardingsphere.encrypt.config;
-import org.apache.shardingsphere.mask.config.rule.MaskTableRuleConfiguration;
import org.junit.jupiter.api.Test;
import java.util.Collections;
-import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-class MaskRuleConfigurationTest {
+class EncryptRuleConfigurationTest {
@Test
void assertIsEmpty() {
- assertTrue(new MaskRuleConfiguration(Collections.emptyList(),
Collections.emptyMap()).isEmpty());
- }
-
- @Test
- void assertIsNotEmpty() {
- assertFalse(new
MaskRuleConfiguration(Collections.singleton(mock(MaskTableRuleConfiguration.class)),
Collections.emptyMap()).isEmpty());
+ assertTrue(new EncryptRuleConfiguration(Collections.emptyList(),
Collections.emptyMap()).isEmpty());
}
}
diff --git
a/features/mask/api/src/test/java/org/apache/shardingsphere/mask/config/MaskRuleConfigurationTest.java
b/features/mask/api/src/test/java/org/apache/shardingsphere/mask/config/MaskRuleConfigurationTest.java
index 8b2351b60e2..4c89f25657b 100644
---
a/features/mask/api/src/test/java/org/apache/shardingsphere/mask/config/MaskRuleConfigurationTest.java
+++
b/features/mask/api/src/test/java/org/apache/shardingsphere/mask/config/MaskRuleConfigurationTest.java
@@ -17,14 +17,11 @@
package org.apache.shardingsphere.mask.config;
-import org.apache.shardingsphere.mask.config.rule.MaskTableRuleConfiguration;
import org.junit.jupiter.api.Test;
import java.util.Collections;
-import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
class MaskRuleConfigurationTest {
@@ -32,9 +29,4 @@ class MaskRuleConfigurationTest {
void assertIsEmpty() {
assertTrue(new MaskRuleConfiguration(Collections.emptyList(),
Collections.emptyMap()).isEmpty());
}
-
- @Test
- void assertIsNotEmpty() {
- assertFalse(new
MaskRuleConfiguration(Collections.singleton(mock(MaskTableRuleConfiguration.class)),
Collections.emptyMap()).isEmpty());
- }
}
diff --git
a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleStatementConverterTest.java
b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleStatementConverterTest.java
index fb530b307bc..4e728dbeff6 100644
---
a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleStatementConverterTest.java
+++
b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleStatementConverterTest.java
@@ -37,10 +37,12 @@ class ReadwriteSplittingRuleStatementConverterTest {
@Test
void assertConvert() {
- ReadwriteSplittingRuleConfiguration actual =
ReadwriteSplittingRuleStatementConverter.convert(Collections.singleton(new
ReadwriteSplittingRuleSegment(
- "foo_name", "write_ds", Arrays.asList("read_ds0", "read_ds1"),
TransactionalReadQueryStrategy.FIXED.name(), new AlgorithmSegment("foo_algo",
new Properties()))));
- assertThat(actual.getDataSourceGroups(),
deepEqual(Collections.singletonList(
- new
ReadwriteSplittingDataSourceGroupRuleConfiguration("foo_name", "write_ds",
Arrays.asList("read_ds0", "read_ds1"), TransactionalReadQueryStrategy.FIXED,
"foo_name_foo_algo"))));
+ ReadwriteSplittingRuleSegment ruleSegment = new
ReadwriteSplittingRuleSegment(
+ "foo_name", "write_ds", Arrays.asList("read_ds0", "read_ds1"),
TransactionalReadQueryStrategy.FIXED.name(), new AlgorithmSegment("foo_algo",
new Properties()));
+ ReadwriteSplittingRuleConfiguration actual =
ReadwriteSplittingRuleStatementConverter.convert(Collections.singleton(ruleSegment));
+ ReadwriteSplittingDataSourceGroupRuleConfiguration
expectedDataSourceGroupRuleConfig = new
ReadwriteSplittingDataSourceGroupRuleConfiguration(
+ "foo_name", "write_ds", Arrays.asList("read_ds0", "read_ds1"),
TransactionalReadQueryStrategy.FIXED, "foo_name_foo_algo");
+ assertThat(actual.getDataSourceGroups(),
deepEqual(Collections.singletonList(expectedDataSourceGroupRuleConfig)));
assertThat(actual.getLoadBalancers(),
deepEqual(Collections.singletonMap("foo_name_foo_algo", new
AlgorithmConfiguration("foo_algo", new Properties()))));
}
