(shardingsphere) branch master updated: Add more test cases on ResourceMetaData (#36987)

[zhangliang]

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 e617a522a26 Add more test cases on ResourceMetaData (#36987)
e617a522a26 is described below

commit e617a522a26ae91fac0bb8db0ae9a5422db274db
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sat Nov 1 21:57:19 2025 +0800

    Add more test cases on ResourceMetaData (#36987)
    
    * Add test coverage for line 68 in ResourceMetaData
    
    - Modify assertGetAllInstanceDataSourceNames to test deduplication logic
    - Add two MockedDataSources to trigger !isExisted(each, result) condition
    - Verify getAllInstanceDataSourceNames() returns size 1 due to line 68 
deduplication
    - Maintain minimal code changes within 3-line limit
    - Update data source names to follow foo_ds convention
    
    🤖 Generated with [Claude Code](https://claude.com/claude-code)
    
    Co-Authored-By: Claude <nore...@anthropic.com>
    
    * Add more test cases on ResourceMetaData
    
    ---------
    
    Co-authored-by: Claude <nore...@anthropic.com>
---
 .../infra/metadata/database/resource/ResourceMetaData.java |  5 ++---
 .../metadata/database/resource/ResourceMetaDataTest.java   | 14 ++++++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git 
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/ResourceMetaData.java
 
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/ResourceMetaData.java
index cd861085f14..0ff5a8cb178 100644
--- 
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/ResourceMetaData.java
+++ 
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/ResourceMetaData.java
@@ -52,9 +52,8 @@ public final class ResourceMetaData {
                 .collect(Collectors.toMap(each -> each, StorageNode::new, 
(oldValue, currentValue) -> oldValue, LinkedHashMap::new));
         Map<String, DataSourcePoolProperties> dataSourcePoolPropsMap = 
dataSources.entrySet().stream().collect(
                 Collectors.toMap(Entry::getKey, entry -> 
DataSourcePoolPropertiesCreator.create(entry.getValue()), (oldValue, 
currentValue) -> oldValue, LinkedHashMap::new));
-        storageUnits = storageUnitNodeMap.entrySet().stream()
-                .collect(Collectors.toMap(Entry::getKey, entry -> new 
StorageUnit(entry.getValue(), dataSourcePoolPropsMap.get(entry.getKey()), 
dataSources.get(entry.getValue().getName())),
-                        (oldValue, currentValue) -> currentValue, 
LinkedHashMap::new));
+        storageUnits = 
storageUnitNodeMap.entrySet().stream().collect(Collectors.toMap(Entry::getKey, 
entry -> new StorageUnit(
+                entry.getValue(), dataSourcePoolPropsMap.get(entry.getKey()), 
dataSources.get(entry.getValue().getName())), (oldValue, currentValue) -> 
currentValue, LinkedHashMap::new));
     }
     
     /**
diff --git 
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/resource/ResourceMetaDataTest.java
 
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/resource/ResourceMetaDataTest.java
index 947ebf38651..434ead68b6d 100644
--- 
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/resource/ResourceMetaDataTest.java
+++ 
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/resource/ResourceMetaDataTest.java
@@ -20,7 +20,10 @@ package 
org.apache.shardingsphere.infra.metadata.database.resource;
 import org.apache.shardingsphere.test.infra.fixture.jdbc.MockedDataSource;
 import org.junit.jupiter.api.Test;
 
+import javax.sql.DataSource;
 import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -30,17 +33,20 @@ class ResourceMetaDataTest {
     
     @Test
     void assertGetAllInstanceDataSourceNames() {
-        assertThat(new ResourceMetaData(Collections.singletonMap("foo", new 
MockedDataSource())).getAllInstanceDataSourceNames(), 
is(Collections.singletonList("foo")));
+        Map<String, DataSource> dataSources = new LinkedHashMap<>(2, 1F);
+        dataSources.put("foo_ds", new MockedDataSource());
+        dataSources.put("bar_ds", new MockedDataSource());
+        assertThat(new 
ResourceMetaData(dataSources).getAllInstanceDataSourceNames().size(), is(1));
     }
     
     @Test
     void assertGetNotExistedDataSources() {
-        assertTrue(new ResourceMetaData(Collections.singletonMap("foo", new 
MockedDataSource())).getNotExistedDataSources(Collections.singleton("foo")).isEmpty());
+        assertTrue(new ResourceMetaData(Collections.singletonMap("foo_ds", new 
MockedDataSource())).getNotExistedDataSources(Collections.singleton("foo_ds")).isEmpty());
     }
     
     @Test
     void assertGetDataSourceMap() {
-        assertThat(new ResourceMetaData(Collections.singletonMap("foo", new 
MockedDataSource())).getDataSourceMap().size(), is(1));
-        assertTrue(new ResourceMetaData(Collections.singletonMap("foo", new 
MockedDataSource())).getDataSourceMap().containsKey("foo"));
+        assertThat(new ResourceMetaData(Collections.singletonMap("foo_ds", new 
MockedDataSource())).getDataSourceMap().size(), is(1));
+        assertTrue(new ResourceMetaData(Collections.singletonMap("foo_ds", new 
MockedDataSource())).getDataSourceMap().containsKey("foo_ds"));
     }
 }