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 5139505711c Add test cases on DatabaseRuleItem (#34768)
5139505711c is described below
commit 5139505711c9b6aa3f53d3b65a8b5925a480fc8c
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sun Feb 23 21:33:26 2025 +0800
Add test cases on DatabaseRuleItem (#34768)
---
.../database/DatabaseRulePersistService.java | 2 +-
.../item => metadata/rule}/DatabaseRuleItem.java | 2 +-
.../type/metadata/rule/DatabaseRuleNodePath.java | 1 -
.../type/metadata/rule/DatabaseRuleItemTest.java} | 29 ++++++++++------------
.../metadata/rule/DatabaseRuleNodePathTest.java | 1 -
5 files changed, 15 insertions(+), 20 deletions(-)
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java
index 65d57fed06d..2753c51188f 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigur
import
org.apache.shardingsphere.mode.metadata.persist.config.RepositoryTuplePersistService;
import
org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
import
org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
-import
org.apache.shardingsphere.mode.node.path.type.config.database.item.DatabaseRuleItem;
+import
org.apache.shardingsphere.mode.node.path.type.metadata.rule.DatabaseRuleItem;
import
org.apache.shardingsphere.mode.node.path.type.metadata.rule.DatabaseRuleNodePath;
import org.apache.shardingsphere.mode.node.tuple.RepositoryTuple;
import
org.apache.shardingsphere.mode.node.tuple.YamlRepositoryTupleSwapperEngine;
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/config/database/item/DatabaseRuleItem.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleItem.java
similarity index 94%
rename from
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/config/database/item/DatabaseRuleItem.java
rename to
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleItem.java
index 9a071e0cc9c..535a5752875 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/config/database/item/DatabaseRuleItem.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleItem.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.node.path.type.config.database.item;
+package org.apache.shardingsphere.mode.node.path.type.metadata.rule;
/**
* Database rule item.
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleNodePath.java
index 25d306621af..e17a3288a73 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleNodePath.java
@@ -21,7 +21,6 @@ import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.mode.node.path.NodePath;
import org.apache.shardingsphere.mode.node.path.NodePathEntity;
-import
org.apache.shardingsphere.mode.node.path.type.config.database.item.DatabaseRuleItem;
/**
* Database rule node path.
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleNodePath.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleItemTest.java
similarity index 58%
copy from
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleNodePath.java
copy to
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleItemTest.java
index 25d306621af..7316d475773 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleNodePath.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleItemTest.java
@@ -17,23 +17,20 @@
package org.apache.shardingsphere.mode.node.path.type.metadata.rule;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.mode.node.path.NodePath;
-import org.apache.shardingsphere.mode.node.path.NodePathEntity;
-import
org.apache.shardingsphere.mode.node.path.type.config.database.item.DatabaseRuleItem;
+import org.junit.jupiter.api.Test;
-/**
- * Database rule node path.
- */
-@NodePathEntity("/metadata/${databaseName}/rules/${ruleType}/${databaseRuleItem}")
-@RequiredArgsConstructor
-@Getter
-public final class DatabaseRuleNodePath implements NodePath {
-
- private final String databaseName;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+class DatabaseRuleItemTest {
- private final String ruleType;
+ @Test
+ void assertToStringWithItemName() {
+ assertThat(new DatabaseRuleItem("foo_type/foo_item").toString(),
is("foo_type/foo_item"));
+ }
- private final DatabaseRuleItem databaseRuleItem;
+ @Test
+ void assertToStringWithoutItemName() {
+ assertThat(new DatabaseRuleItem("foo_type").toString(),
is("foo_type"));
+ }
}
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleNodePathTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleNodePathTest.java
index 3ec42653114..6f2b85ce316 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleNodePathTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleNodePathTest.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.mode.node.path.type.metadata.rule;
import
org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
-import
org.apache.shardingsphere.mode.node.path.type.config.database.item.DatabaseRuleItem;
import org.apache.shardingsphere.mode.node.path.type.version.VersionNodePath;
import org.junit.jupiter.api.Test;
