You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2024/11/01 04:12:56 UTC
(shardingsphere) branch master updated: Refactor test cases of AlgorithmChangedProcessor's impl (#33492)
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 85d62311f20 Refactor test cases of AlgorithmChangedProcessor's impl (#33492)
85d62311f20 is described below
commit 85d62311f20215e4282df7d191b0b984e11dcabf
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri Nov 1 12:12:50 2024 +0800
Refactor test cases of AlgorithmChangedProcessor's impl (#33492)
---
.../encrypt/rule/changed/EncryptorChangedProcessorTest.java | 6 ++++--
.../mask/rule/changed/MaskAlgorithmChangedProcessorTest.java | 6 ++++--
.../ReadwriteSplittingLoadBalancerChangedProcessorTest.java | 6 ++++--
.../rule/changed/ShadowAlgorithmChangedProcessorTest.java | 6 ++++--
.../rule/changed/KeyGeneratorChangedProcessorTest.java | 6 ++++--
.../rule/changed/ShardingAlgorithmChangedProcessorTest.java | 6 ++++--
.../rule/changed/ShardingAuditorChangedProcessorTest.java | 6 ++++--
.../mode/processor/AlgorithmChangedProcessorTest.java | 12 +++++++-----
8 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rule/changed/EncryptorChangedProcessorTest.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rule/changed/EncryptorChangedProcessorTest.java
index 9066f52dd57..c25d3ae25c3 100644
--- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rule/changed/EncryptorChangedProcessorTest.java
+++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rule/changed/EncryptorChangedProcessorTest.java
@@ -59,7 +59,8 @@ class EncryptorChangedProcessorTest {
@Test
void assertChangeRuleItemConfiguration() {
- AlterNamedRuleItemEvent event = new AlterNamedRuleItemEvent("", "bar_algo", "", "", "");
+ AlterNamedRuleItemEvent event = mock(AlterNamedRuleItemEvent.class);
+ when(event.getItemName()).thenReturn("bar_algo");
EncryptRuleConfiguration currentRuleConfig = createCurrentRuleConfiguration();
AlgorithmConfiguration toBeChangedItemConfig = new AlgorithmConfiguration("BAR_FIXTURE", new Properties());
processor.changeRuleItemConfiguration(event, currentRuleConfig, toBeChangedItemConfig);
@@ -70,7 +71,8 @@ class EncryptorChangedProcessorTest {
@Test
void assertDropRuleItemConfiguration() {
- DropNamedRuleItemEvent event = new DropNamedRuleItemEvent("", "foo_algo", "");
+ DropNamedRuleItemEvent event = mock(DropNamedRuleItemEvent.class);
+ when(event.getItemName()).thenReturn("foo_algo");
EncryptRuleConfiguration currentRuleConfig = createCurrentRuleConfiguration();
processor.dropRuleItemConfiguration(event, currentRuleConfig);
assertTrue(currentRuleConfig.getEncryptors().isEmpty());
diff --git a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/rule/changed/MaskAlgorithmChangedProcessorTest.java b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/rule/changed/MaskAlgorithmChangedProcessorTest.java
index c0b12db3faf..83346155941 100644
--- a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/rule/changed/MaskAlgorithmChangedProcessorTest.java
+++ b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/rule/changed/MaskAlgorithmChangedProcessorTest.java
@@ -59,7 +59,8 @@ class MaskAlgorithmChangedProcessorTest {
@Test
void assertChangeRuleItemConfiguration() {
- AlterNamedRuleItemEvent event = new AlterNamedRuleItemEvent("", "bar_algo", "", "", "");
+ AlterNamedRuleItemEvent event = mock(AlterNamedRuleItemEvent.class);
+ when(event.getItemName()).thenReturn("bar_algo");
MaskRuleConfiguration currentRuleConfig = createCurrentRuleConfiguration();
AlgorithmConfiguration toBeChangedItemConfig = new AlgorithmConfiguration("BAR_FIXTURE", new Properties());
processor.changeRuleItemConfiguration(event, currentRuleConfig, toBeChangedItemConfig);
@@ -70,7 +71,8 @@ class MaskAlgorithmChangedProcessorTest {
@Test
void assertDropRuleItemConfiguration() {
- DropNamedRuleItemEvent event = new DropNamedRuleItemEvent("", "foo_algo", "");
+ DropNamedRuleItemEvent event = mock(DropNamedRuleItemEvent.class);
+ when(event.getItemName()).thenReturn("foo_algo");
MaskRuleConfiguration currentRuleConfig = createCurrentRuleConfiguration();
processor.dropRuleItemConfiguration(event, currentRuleConfig);
assertTrue(currentRuleConfig.getMaskAlgorithms().isEmpty());
diff --git a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/changed/ReadwriteSplittingLoadBalancerChangedProcessorTest.java b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/changed/ReadwriteSplittingLoadBalancerChangedProcessorTest.java
index 08dd630ed39..065bc880430 100644
--- a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/changed/ReadwriteSplittingLoadBalancerChangedProcessorTest.java
+++ b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/changed/ReadwriteSplittingLoadBalancerChangedProcessorTest.java
@@ -59,7 +59,8 @@ class ReadwriteSplittingLoadBalancerChangedProcessorTest {
@Test
void assertChangeRuleItemConfiguration() {
- AlterNamedRuleItemEvent event = new AlterNamedRuleItemEvent("", "bar_algo", "", "", "");
+ AlterNamedRuleItemEvent event = mock(AlterNamedRuleItemEvent.class);
+ when(event.getItemName()).thenReturn("bar_algo");
ReadwriteSplittingRuleConfiguration currentRuleConfig = createCurrentRuleConfiguration();
AlgorithmConfiguration toBeChangedItemConfig = new AlgorithmConfiguration("BAR_FIXTURE", new Properties());
processor.changeRuleItemConfiguration(event, currentRuleConfig, toBeChangedItemConfig);
@@ -70,7 +71,8 @@ class ReadwriteSplittingLoadBalancerChangedProcessorTest {
@Test
void assertDropRuleItemConfiguration() {
- DropNamedRuleItemEvent event = new DropNamedRuleItemEvent("", "foo_algo", "");
+ DropNamedRuleItemEvent event = mock(DropNamedRuleItemEvent.class);
+ when(event.getItemName()).thenReturn("foo_algo");
ReadwriteSplittingRuleConfiguration currentRuleConfig = createCurrentRuleConfiguration();
processor.dropRuleItemConfiguration(event, currentRuleConfig);
assertTrue(currentRuleConfig.getLoadBalancers().isEmpty());
diff --git a/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/rule/changed/ShadowAlgorithmChangedProcessorTest.java b/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/rule/changed/ShadowAlgorithmChangedProcessorTest.java
index d79b2ca9b1b..a17e8711b0f 100644
--- a/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/rule/changed/ShadowAlgorithmChangedProcessorTest.java
+++ b/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/rule/changed/ShadowAlgorithmChangedProcessorTest.java
@@ -56,7 +56,8 @@ class ShadowAlgorithmChangedProcessorTest {
@Test
void assertChangeRuleItemConfiguration() {
- AlterNamedRuleItemEvent event = new AlterNamedRuleItemEvent("", "bar_algo", "", "", "");
+ AlterNamedRuleItemEvent event = mock(AlterNamedRuleItemEvent.class);
+ when(event.getItemName()).thenReturn("bar_algo");
ShadowRuleConfiguration currentRuleConfig = createCurrentRuleConfiguration();
AlgorithmConfiguration toBeChangedItemConfig = new AlgorithmConfiguration("BAR_FIXTURE", new Properties());
processor.changeRuleItemConfiguration(event, currentRuleConfig, toBeChangedItemConfig);
@@ -67,7 +68,8 @@ class ShadowAlgorithmChangedProcessorTest {
@Test
void assertDropRuleItemConfiguration() {
- DropNamedRuleItemEvent event = new DropNamedRuleItemEvent("", "foo_algo", "");
+ DropNamedRuleItemEvent event = mock(DropNamedRuleItemEvent.class);
+ when(event.getItemName()).thenReturn("foo_algo");
ShadowRuleConfiguration currentRuleConfig = createCurrentRuleConfiguration();
processor.dropRuleItemConfiguration(event, currentRuleConfig);
assertTrue(currentRuleConfig.getShadowAlgorithms().isEmpty());
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/changed/KeyGeneratorChangedProcessorTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/changed/KeyGeneratorChangedProcessorTest.java
index 2c97179aa0a..a2cd6e36d27 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/changed/KeyGeneratorChangedProcessorTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/changed/KeyGeneratorChangedProcessorTest.java
@@ -56,7 +56,8 @@ class KeyGeneratorChangedProcessorTest {
@Test
void assertChangeRuleItemConfiguration() {
- AlterNamedRuleItemEvent event = new AlterNamedRuleItemEvent("", "bar_algo", "", "", "");
+ AlterNamedRuleItemEvent event = mock(AlterNamedRuleItemEvent.class);
+ when(event.getItemName()).thenReturn("bar_algo");
ShardingRuleConfiguration currentRuleConfig = createCurrentRuleConfiguration();
AlgorithmConfiguration toBeChangedItemConfig = new AlgorithmConfiguration("BAR_FIXTURE", new Properties());
processor.changeRuleItemConfiguration(event, currentRuleConfig, toBeChangedItemConfig);
@@ -67,7 +68,8 @@ class KeyGeneratorChangedProcessorTest {
@Test
void assertDropRuleItemConfiguration() {
- DropNamedRuleItemEvent event = new DropNamedRuleItemEvent("", "foo_algo", "");
+ DropNamedRuleItemEvent event = mock(DropNamedRuleItemEvent.class);
+ when(event.getItemName()).thenReturn("foo_algo");
ShardingRuleConfiguration currentRuleConfig = createCurrentRuleConfiguration();
processor.dropRuleItemConfiguration(event, currentRuleConfig);
assertTrue(currentRuleConfig.getKeyGenerators().isEmpty());
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/changed/ShardingAlgorithmChangedProcessorTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/changed/ShardingAlgorithmChangedProcessorTest.java
index a8ede01df43..d3ae6c720b9 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/changed/ShardingAlgorithmChangedProcessorTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/changed/ShardingAlgorithmChangedProcessorTest.java
@@ -56,7 +56,8 @@ class ShardingAlgorithmChangedProcessorTest {
@Test
void assertChangeRuleItemConfiguration() {
- AlterNamedRuleItemEvent event = new AlterNamedRuleItemEvent("", "bar_algo", "", "", "");
+ AlterNamedRuleItemEvent event = mock(AlterNamedRuleItemEvent.class);
+ when(event.getItemName()).thenReturn("bar_algo");
ShardingRuleConfiguration currentRuleConfig = createCurrentRuleConfiguration();
AlgorithmConfiguration toBeChangedItemConfig = new AlgorithmConfiguration("BAR_FIXTURE", new Properties());
processor.changeRuleItemConfiguration(event, currentRuleConfig, toBeChangedItemConfig);
@@ -67,7 +68,8 @@ class ShardingAlgorithmChangedProcessorTest {
@Test
void assertDropRuleItemConfiguration() {
- DropNamedRuleItemEvent event = new DropNamedRuleItemEvent("", "foo_algo", "");
+ DropNamedRuleItemEvent event = mock(DropNamedRuleItemEvent.class);
+ when(event.getItemName()).thenReturn("foo_algo");
ShardingRuleConfiguration currentRuleConfig = createCurrentRuleConfiguration();
processor.dropRuleItemConfiguration(event, currentRuleConfig);
assertTrue(currentRuleConfig.getShardingAlgorithms().isEmpty());
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/changed/ShardingAuditorChangedProcessorTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/changed/ShardingAuditorChangedProcessorTest.java
index 86c48fbc582..5ba4bb81f84 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/changed/ShardingAuditorChangedProcessorTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/changed/ShardingAuditorChangedProcessorTest.java
@@ -56,7 +56,8 @@ class ShardingAuditorChangedProcessorTest {
@Test
void assertChangeRuleItemConfiguration() {
- AlterNamedRuleItemEvent event = new AlterNamedRuleItemEvent("", "bar_algo", "", "", "");
+ AlterNamedRuleItemEvent event = mock(AlterNamedRuleItemEvent.class);
+ when(event.getItemName()).thenReturn("bar_algo");
ShardingRuleConfiguration currentRuleConfig = createCurrentRuleConfiguration();
AlgorithmConfiguration toBeChangedItemConfig = new AlgorithmConfiguration("BAR_FIXTURE", new Properties());
processor.changeRuleItemConfiguration(event, currentRuleConfig, toBeChangedItemConfig);
@@ -67,7 +68,8 @@ class ShardingAuditorChangedProcessorTest {
@Test
void assertDropRuleItemConfiguration() {
- DropNamedRuleItemEvent event = new DropNamedRuleItemEvent("", "foo_algo", "");
+ DropNamedRuleItemEvent event = mock(DropNamedRuleItemEvent.class);
+ when(event.getItemName()).thenReturn("foo_algo");
ShardingRuleConfiguration currentRuleConfig = createCurrentRuleConfiguration();
processor.dropRuleItemConfiguration(event, currentRuleConfig);
assertTrue(currentRuleConfig.getAuditors().isEmpty());
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/processor/AlgorithmChangedProcessorTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/processor/AlgorithmChangedProcessorTest.java
index cbbe1fe245e..b34845460a9 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/processor/AlgorithmChangedProcessorTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/processor/AlgorithmChangedProcessorTest.java
@@ -42,13 +42,13 @@ import static org.mockito.Mockito.when;
class AlgorithmChangedProcessorTest {
- @SuppressWarnings({"rawtypes", "unchecked"})
- private final AlgorithmChangedProcessor<AlgorithmChangedProcessorFixtureRuleConfiguration> processor = (AlgorithmChangedProcessor) TypedSPILoader.getService(
+ @SuppressWarnings("unchecked")
+ private final RuleItemConfigurationChangedProcessor<AlgorithmChangedProcessorFixtureRuleConfiguration, AlgorithmConfiguration> processor = TypedSPILoader.getService(
RuleItemConfigurationChangedProcessor.class, "FIXTURE");
@Test
void assertSwapRuleItemConfiguration() {
- AlterNamedRuleItemEvent event = new AlterNamedRuleItemEvent("", "foo", "", "", "");
+ AlterNamedRuleItemEvent event = mock(AlterNamedRuleItemEvent.class);
AlgorithmConfiguration actual = processor.swapRuleItemConfiguration(event, createYAMLContent());
assertThat(actual, deepEqual(new AlgorithmConfiguration("foo_algo", new Properties())));
}
@@ -73,7 +73,8 @@ class AlgorithmChangedProcessorTest {
@Test
void assertChangeRuleItemConfiguration() {
- AlterNamedRuleItemEvent event = new AlterNamedRuleItemEvent("", "bar_algo", "", "", "");
+ AlterNamedRuleItemEvent event = mock(AlterNamedRuleItemEvent.class);
+ when(event.getItemName()).thenReturn("bar_algo");
AlgorithmChangedProcessorFixtureRuleConfiguration currentRuleConfig = new AlgorithmChangedProcessorFixtureRuleConfiguration();
currentRuleConfig.getAlgorithmConfigurations().put("foo_algo", new AlgorithmConfiguration("FOO_FIXTURE", new Properties()));
AlgorithmConfiguration toBeChangedItemConfig = new AlgorithmConfiguration("BAR_FIXTURE", new Properties());
@@ -85,7 +86,8 @@ class AlgorithmChangedProcessorTest {
@Test
void assertDropRuleItemConfiguration() {
- DropNamedRuleItemEvent event = new DropNamedRuleItemEvent("", "foo_algo", "");
+ DropNamedRuleItemEvent event = mock(DropNamedRuleItemEvent.class);
+ when(event.getItemName()).thenReturn("foo_algo");
AlgorithmChangedProcessorFixtureRuleConfiguration currentRuleConfig = new AlgorithmChangedProcessorFixtureRuleConfiguration();
currentRuleConfig.getAlgorithmConfigurations().put("foo_algo", new AlgorithmConfiguration("FOO_FIXTURE", new Properties()));
processor.dropRuleItemConfiguration(event, currentRuleConfig);