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 6d7bd7a4419 Add more test cases on DataSourceMetaDataNode (#32972)
6d7bd7a4419 is described below

commit 6d7bd7a4419058075c82a189f0b5c77a09066606
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Sep 24 13:13:20 2024 +0800

    Add more test cases on DataSourceMetaDataNode (#32972)
---
 .../node/metadata/DataSourceMetaDataNodeTest.java  | 105 ++++++++++++++-------
 .../metadata/DatabaseRuleMetaDataNodeTest.java     |  10 +-
 2 files changed, 78 insertions(+), 37 deletions(-)

diff --git 
a/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/node/metadata/DataSourceMetaDataNodeTest.java
 
b/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/node/metadata/DataSourceMetaDataNodeTest.java
index 5bebaba1fd9..d41477b0e96 100644
--- 
a/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/node/metadata/DataSourceMetaDataNodeTest.java
+++ 
b/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/node/metadata/DataSourceMetaDataNodeTest.java
@@ -23,10 +23,61 @@ import java.util.Optional;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class DataSourceMetaDataNodeTest {
     
+    @Test
+    void assertGetDataSourceUnitsNode() {
+        assertThat(DataSourceMetaDataNode.getDataSourceUnitsNode("foo_db"), 
is("/metadata/foo_db/data_sources/units"));
+    }
+    
+    @Test
+    void assertGetDataSourceNodesNode() {
+        assertThat(DataSourceMetaDataNode.getDataSourceNodesNode("foo_db"), 
is("/metadata/foo_db/data_sources/nodes"));
+    }
+    
+    @Test
+    void assertGetDataSourceUnitNode() {
+        assertThat(DataSourceMetaDataNode.getDataSourceUnitNode("foo_db", 
"foo_ds"), is("/metadata/foo_db/data_sources/units/foo_ds"));
+    }
+    
+    @Test
+    void assertGetDataSourceNodeNode() {
+        assertThat(DataSourceMetaDataNode.getDataSourceNodeNode("foo_db", 
"foo_ds"), is("/metadata/foo_db/data_sources/nodes/foo_ds"));
+    }
+    
+    @Test
+    void assertGetDataSourceUnitVersionNode() {
+        
assertThat(DataSourceMetaDataNode.getDataSourceUnitVersionNode("foo_db", 
"foo_ds", "0"), is("/metadata/foo_db/data_sources/units/foo_ds/versions/0"));
+    }
+    
+    @Test
+    void assertGetDataSourceUnitVersionsNode() {
+        
assertThat(DataSourceMetaDataNode.getDataSourceUnitVersionsNode("foo_db", 
"foo_ds"), is("/metadata/foo_db/data_sources/units/foo_ds/versions"));
+    }
+    
+    @Test
+    void assertGetDataSourceUnitActiveVersionNode() {
+        
assertThat(DataSourceMetaDataNode.getDataSourceUnitActiveVersionNode("foo_db", 
"foo_ds"), is("/metadata/foo_db/data_sources/units/foo_ds/active_version"));
+    }
+    
+    @Test
+    void assertGetDataSourceNodeVersionsNode() {
+        
assertThat(DataSourceMetaDataNode.getDataSourceNodeVersionsNode("foo_db", 
"foo_ds"), is("/metadata/foo_db/data_sources/nodes/foo_ds/versions"));
+    }
+    
+    @Test
+    void assertGetDataSourceNodeVersionNode() {
+        
assertThat(DataSourceMetaDataNode.getDataSourceNodeVersionNode("foo_db", 
"foo_ds", "1"), is("/metadata/foo_db/data_sources/nodes/foo_ds/versions/1"));
+    }
+    
+    @Test
+    void assertGetDataSourceNodeActiveVersionNode() {
+        
assertThat(DataSourceMetaDataNode.getDataSourceNodeActiveVersionNode("foo_db", 
"foo_ds"), is("/metadata/foo_db/data_sources/nodes/foo_ds/active_version"));
+    }
+    
     @Test
     void assertIsDataSourcesNode() {
         
assertTrue(DataSourceMetaDataNode.isDataSourcesNode("/metadata/logic_db/data_sources/foo_ds"));
@@ -39,6 +90,11 @@ class DataSourceMetaDataNodeTest {
         assertThat(actual.get(), is("foo_ds"));
     }
     
+    @Test
+    void assertGetDataSourceNameByDataSourceUnitActiveVersionNodeIfNotFound() {
+        
assertFalse(DataSourceMetaDataNode.getDataSourceNameByDataSourceUnitActiveVersionNode("/xxx/logic_db/data_sources/units/foo_ds/active_version").isPresent());
+    }
+    
     @Test
     void assertGetDataSourceNameByDataSourceUnitNode() {
         Optional<String> actual = 
DataSourceMetaDataNode.getDataSourceNameByDataSourceUnitNode("/metadata/logic_db/data_sources/units/foo_ds");
@@ -46,6 +102,11 @@ class DataSourceMetaDataNodeTest {
         assertThat(actual.get(), is("foo_ds"));
     }
     
+    @Test
+    void assertGetDataSourceNameByDataSourceUnitNodeIfNotFound() {
+        
assertFalse(DataSourceMetaDataNode.getDataSourceNameByDataSourceUnitNode("/xxx/logic_db/data_sources/units/foo_ds").isPresent());
+    }
+    
     @Test
     void assertGetDataSourceNameByDataSourceNodeActiveVersionNode() {
         Optional<String> actual = 
DataSourceMetaDataNode.getDataSourceNameByDataSourceNodeActiveVersionNode("/metadata/logic_db/data_sources/nodes/foo_ds/active_version");
@@ -53,6 +114,11 @@ class DataSourceMetaDataNodeTest {
         assertThat(actual.get(), is("foo_ds"));
     }
     
+    @Test
+    void assertGetDataSourceNameByDataSourceNodeActiveVersionNodeIfNotFound() {
+        
assertFalse(DataSourceMetaDataNode.getDataSourceNameByDataSourceNodeActiveVersionNode("/xxx/logic_db/data_sources/nodes/foo_ds/active_version").isPresent());
+    }
+    
     @Test
     void assertGetDataSourceNameByDataSourceNodeNode() {
         Optional<String> actual = 
DataSourceMetaDataNode.getDataSourceNameByDataSourceNodeNode("/metadata/logic_db/data_sources/nodes/foo_ds");
@@ -60,6 +126,11 @@ class DataSourceMetaDataNodeTest {
         assertThat(actual.get(), is("foo_ds"));
     }
     
+    @Test
+    void assertGetDataSourceNameByDataSourceNodeNodeIfNotFound() {
+        
assertFalse(DataSourceMetaDataNode.getDataSourceNameByDataSourceNodeNode("/xxx/logic_db/data_sources/nodes/foo_ds").isPresent());
+    }
+    
     @Test
     void assertIsDataSourceUnitActiveVersionNode() {
         
assertTrue(DataSourceMetaDataNode.isDataSourceUnitActiveVersionNode("/metadata/logic_db/data_sources/units/foo_ds/active_version"));
@@ -70,43 +141,13 @@ class DataSourceMetaDataNodeTest {
         
assertTrue(DataSourceMetaDataNode.isDataSourceUnitNode("/metadata/logic_db/data_sources/units/foo_ds"));
     }
     
-    @Test
-    void assertIsDataSourceNodeNode() {
-        
assertTrue(DataSourceMetaDataNode.isDataSourceNodeNode("/metadata/logic_db/data_sources/nodes/foo_ds"));
-    }
-    
     @Test
     void assertIsDataSourceNodeActiveVersionNode() {
         
assertTrue(DataSourceMetaDataNode.isDataSourceNodeActiveVersionNode("/metadata/logic_db/data_sources/nodes/foo_ds/active_version"));
     }
     
     @Test
-    void assertGetMetaDataDataSourcesNode() {
-        assertThat(DataSourceMetaDataNode.getDataSourceUnitsNode("foo_db"), 
is("/metadata/foo_db/data_sources/units"));
-    }
-    
-    @Test
-    void assertGetMetaDataDataSourceNode() {
-        assertThat(DataSourceMetaDataNode.getDataSourceUnitNode("foo_db", 
"foo_ds"), is("/metadata/foo_db/data_sources/units/foo_ds"));
-    }
-    
-    @Test
-    void assertGetDataSourceUnitNodeWithVersion() {
-        
assertThat(DataSourceMetaDataNode.getDataSourceUnitVersionNode("foo_db", 
"foo_ds", "0"), is("/metadata/foo_db/data_sources/units/foo_ds/versions/0"));
-    }
-    
-    @Test
-    void assertGetDataSourceUnitVersionsNode() {
-        
assertThat(DataSourceMetaDataNode.getDataSourceUnitVersionsNode("foo_db", 
"foo_ds"), is("/metadata/foo_db/data_sources/units/foo_ds/versions"));
-    }
-    
-    @Test
-    void assertGetDataSourceUnitActiveVersionNode() {
-        
assertThat(DataSourceMetaDataNode.getDataSourceUnitActiveVersionNode("foo_db", 
"foo_ds"), is("/metadata/foo_db/data_sources/units/foo_ds/active_version"));
-    }
-    
-    @Test
-    void assertGetDataSourceNodeVersionsNode() {
-        
assertThat(DataSourceMetaDataNode.getDataSourceNodeVersionsNode("foo_db", 
"foo_ds"), is("/metadata/foo_db/data_sources/nodes/foo_ds/versions"));
+    void assertIsDataSourceNodeNode() {
+        
assertTrue(DataSourceMetaDataNode.isDataSourceNodeNode("/metadata/logic_db/data_sources/nodes/foo_ds"));
     }
 }
diff --git 
a/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/node/metadata/DatabaseRuleMetaDataNodeTest.java
 
b/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/node/metadata/DatabaseRuleMetaDataNodeTest.java
index 394e227f933..2cb551e5a57 100644
--- 
a/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/node/metadata/DatabaseRuleMetaDataNodeTest.java
+++ 
b/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/node/metadata/DatabaseRuleMetaDataNodeTest.java
@@ -23,11 +23,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
 
 class DatabaseRuleMetaDataNodeTest {
     
-    @Test
-    void assertGetDatabaseRuleNode() {
-        assertThat(DatabaseRuleMetaDataNode.getDatabaseRuleNode("foo_db", 
"foo_rule", "sharding"), is("/metadata/foo_db/rules/foo_rule/sharding"));
-    }
-    
     @Test
     void assertGetDatabaseRuleActiveVersionNode() {
         
assertThat(DatabaseRuleMetaDataNode.getDatabaseRuleActiveVersionNode("foo_db", 
"foo_rule", "foo_tables"), 
is("/metadata/foo_db/rules/foo_rule/foo_tables/active_version"));
@@ -42,4 +37,9 @@ class DatabaseRuleMetaDataNodeTest {
     void assertGetDatabaseRuleVersionNode() {
         
assertThat(DatabaseRuleMetaDataNode.getDatabaseRuleVersionNode("foo_db", 
"foo_rule", "foo_tables", "1"), 
is("/metadata/foo_db/rules/foo_rule/foo_tables/versions/1"));
     }
+    
+    @Test
+    void assertGetDatabaseRuleNode() {
+        assertThat(DatabaseRuleMetaDataNode.getDatabaseRuleNode("foo_db", 
"foo_rule", "sharding"), is("/metadata/foo_db/rules/foo_rule/sharding"));
+    }
 }

Reply via email to