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 5ff840ce371 Refactor RuleConfigurationChangedHandlerTest (#34647)
5ff840ce371 is described below
commit 5ff840ce3714c0d319237ad3461f033ca1cca047
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Wed Feb 12 22:14:48 2025 +0800
Refactor RuleConfigurationChangedHandlerTest (#34647)
* Refactor RuleConfigurationChangedHandlerTest
* Refactor RuleConfigurationChangedHandlerTest
---
.../metadata/DatabaseRuleMetaDataNodePathTest.java | 8 ++++----
.../rule/RuleConfigurationChangedHandlerTest.java | 22 +++++++++++-----------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseRuleMetaDataNodePathTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseRuleMetaDataNodePathTest.java
index 6f31191222f..43f1c59b3c9 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseRuleMetaDataNodePathTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseRuleMetaDataNodePathTest.java
@@ -41,9 +41,9 @@ class DatabaseRuleMetaDataNodePathTest {
@Test
void assertGetVersionNodePathGenerator() {
-
assertThat(DatabaseRuleMetaDataNodePath.getVersionNodePathGenerator("foo_db",
"sharding", "foo_rule_item").getActiveVersionPath(),
-
is("/metadata/foo_db/rules/sharding/foo_rule_item/active_version"));
-
assertThat(DatabaseRuleMetaDataNodePath.getVersionNodePathGenerator("foo_db",
"sharding", "foo_rule_item").getVersionsPath(),
is("/metadata/foo_db/rules/sharding/foo_rule_item/versions"));
-
assertThat(DatabaseRuleMetaDataNodePath.getVersionNodePathGenerator("foo_db",
"sharding", "foo_rule_item").getVersionPath(0),
is("/metadata/foo_db/rules/sharding/foo_rule_item/versions/0"));
+
assertThat(DatabaseRuleMetaDataNodePath.getVersionNodePathGenerator("foo_db",
"foo_rule", "foo_rule_item").getActiveVersionPath(),
+
is("/metadata/foo_db/rules/foo_rule/foo_rule_item/active_version"));
+
assertThat(DatabaseRuleMetaDataNodePath.getVersionNodePathGenerator("foo_db",
"foo_rule", "foo_rule_item").getVersionsPath(),
is("/metadata/foo_db/rules/foo_rule/foo_rule_item/versions"));
+
assertThat(DatabaseRuleMetaDataNodePath.getVersionNodePathGenerator("foo_db",
"foo_rule", "foo_rule_item").getVersionPath(0),
is("/metadata/foo_db/rules/foo_rule/foo_rule_item/versions/0"));
}
}
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/RuleConfigurationChangedHandlerTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/RuleConfigurationChangedHandlerTest.java
index cd5458da72f..541b0ce216f 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/RuleConfigurationChangedHandlerTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/RuleConfigurationChangedHandlerTest.java
@@ -58,71 +58,71 @@ class RuleConfigurationChangedHandlerTest {
void setUp() {
handler = new RuleConfigurationChangedHandler(contextManager);
RuleNodePathProvider ruleNodePathProvider =
mock(RuleNodePathProvider.class, RETURNS_DEEP_STUBS);
- when(ruleNodePathProvider.getRuleNodePath()).thenReturn(new
RuleNodePath("fixture", Collections.singleton("named"),
Collections.singleton("unique")));
+ when(ruleNodePathProvider.getRuleNodePath()).thenReturn(new
RuleNodePath("foo_rule", Collections.singleton("named"),
Collections.singleton("unique")));
when(ShardingSphereServiceLoader.getServiceInstances(RuleNodePathProvider.class)).thenReturn(Collections.singleton(ruleNodePathProvider));
}
@Test
void assertHandleWithInvalidPath() throws SQLException {
- handler.handle("foo_db", new
DataChangedEvent("/metadata/invalid/rules/fixture", "foo", Type.ADDED));
+ handler.handle("foo_db", new
DataChangedEvent("/metadata/foo_db/rules/foo_rule", "foo", Type.ADDED));
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager(),
times(0)).alter(any());
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager(),
times(0)).drop(any());
}
@Test
void assertHandleWithEmptyValue() throws SQLException {
- handler.handle("foo_db", new
DataChangedEvent("/metadata/fixture/rules/fixture/versions/0", "", Type.ADDED));
+ handler.handle("foo_db", new
DataChangedEvent("/metadata/foo_db/rules/foo_rule/versions/0", "", Type.ADDED));
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager(),
times(0)).alter(any());
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager(),
times(0)).drop(any());
}
@Test
void assertHandleWithPathNotFound() throws SQLException {
- handler.handle("foo_db", new
DataChangedEvent("/metadata/fixture/rules/fixture/versions/0", "foo",
Type.ADDED));
+ handler.handle("foo_db", new
DataChangedEvent("/metadata/foo_db/rules/foo_rule/versions/0", "foo",
Type.ADDED));
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager(),
times(0)).alter(any());
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager(),
times(0)).drop(any());
}
@Test
void assertHandleWithIgnoreType() throws SQLException {
- handler.handle("foo_db", new
DataChangedEvent("/metadata/fixture/rules/fixture/named/xxx/active_version",
"foo", Type.IGNORED));
+ handler.handle("foo_db", new
DataChangedEvent("/metadata/foo_db/rules/foo_rule/named/foo_rule_item/active_version",
"foo", Type.IGNORED));
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager(),
times(0)).alter(any());
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager(),
times(0)).drop(any());
}
@Test
void assertHandleWithNamedRuleItemAdded() throws SQLException {
- handler.handle("foo_db", new
DataChangedEvent("/metadata/fixture/rules/fixture/named/xxx/active_version",
"0", Type.ADDED));
+ handler.handle("foo_db", new
DataChangedEvent("/metadata/foo_db/rules/foo_rule/named/foo_rule_item/active_version",
"0", Type.ADDED));
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager()).alter(any(AlterNamedRuleItem.class));
}
@Test
void assertHandleWithNamedRuleItemAltered() throws SQLException {
- handler.handle("foo_db", new
DataChangedEvent("/metadata/fixture/rules/fixture/named/xxx/active_version",
"0", Type.UPDATED));
+ handler.handle("foo_db", new
DataChangedEvent("/metadata/foo_db/rules/foo_rule/named/foo_rule_item/active_version",
"0", Type.UPDATED));
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager()).alter(any(AlterNamedRuleItem.class));
}
@Test
void assertHandleWithNamedRuleItemDropped() throws SQLException {
- handler.handle("foo_db", new
DataChangedEvent("/metadata/fixture/rules/fixture/named/xxx", "foo",
Type.DELETED));
+ handler.handle("foo_db", new
DataChangedEvent("/metadata/foo_db/rules/foo_rule/named/foo_rule_item", "foo",
Type.DELETED));
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager()).drop(any(DropNamedRuleItem.class));
}
@Test
void assertHandleWithUniqueRuleItemAdded() throws SQLException {
- handler.handle("foo_db", new
DataChangedEvent("/metadata/fixture/rules/fixture/unique/active_version", "0",
Type.ADDED));
+ handler.handle("foo_db", new
DataChangedEvent("/metadata/foo_db/rules/foo_rule/unique/active_version", "0",
Type.ADDED));
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager()).alter(any(AlterUniqueRuleItem.class));
}
@Test
void assertHandleWithUniqueRuleItemAltered() throws SQLException {
- handler.handle("foo_db", new
DataChangedEvent("/metadata/fixture/rules/fixture/unique/active_version", "0",
Type.UPDATED));
+ handler.handle("foo_db", new
DataChangedEvent("/metadata/foo_db/rules/foo_rule/unique/active_version", "0",
Type.UPDATED));
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager()).alter(any(AlterUniqueRuleItem.class));
}
@Test
void assertHandleWithUniqueRuleItemDropped() throws SQLException {
- handler.handle("foo_db", new
DataChangedEvent("/metadata/fixture/rules/fixture/unique/active_version",
"foo", Type.DELETED));
+ handler.handle("foo_db", new
DataChangedEvent("/metadata/foo_db/rules/foo_rule/unique/active_version",
"foo", Type.DELETED));
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager()).drop(any(DropUniqueRuleItem.class));
}
}
