(shardingsphere) branch master updated: Rename DeliverQualifiedDataSourceSubscriberTest (#32893)

[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 4b8bc3ce169 Rename DeliverQualifiedDataSourceSubscriberTest (#32893)
4b8bc3ce169 is described below

commit 4b8bc3ce169f4b1ba524eba8fe2e32cc2529c2fd
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sun Sep 15 21:43:11 2024 +0800

    Rename DeliverQualifiedDataSourceSubscriberTest (#32893)
---
 ... => DeliverQualifiedDataSourceSubscriberTest.java} | 19 +++++++++++--------
 .../dispatch/QualifiedDataSourceSubscriberTest.java   |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git 
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/deliver/QualifiedDataSourceStateSubscriberTest.java
 
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/deliver/DeliverQualifiedDataSourceSubscriberTest.java
similarity index 70%
rename from 
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/deliver/QualifiedDataSourceStateSubscriberTest.java
rename to 
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/deliver/DeliverQualifiedDataSourceSubscriberTest.java
index e096589a2d6..fcdcfa23a09 100644
--- 
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/deliver/QualifiedDataSourceStateSubscriberTest.java
+++ 
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/deliver/DeliverQualifiedDataSourceSubscriberTest.java
@@ -18,9 +18,9 @@
 package 
org.apache.shardingsphere.mode.manager.cluster.event.subscriber.deliver;
 
 import 
org.apache.shardingsphere.infra.metadata.database.schema.QualifiedDataSource;
-import org.apache.shardingsphere.metadata.persist.node.QualifiedDataSourceNode;
 import 
org.apache.shardingsphere.mode.event.deliver.datasource.qualified.QualifiedDataSourceDeletedEvent;
 import 
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
@@ -29,18 +29,21 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import static org.mockito.Mockito.verify;
 
 @ExtendWith(MockitoExtension.class)
-class QualifiedDataSourceStateSubscriberTest {
+class DeliverQualifiedDataSourceSubscriberTest {
+    
+    private DeliverQualifiedDataSourceSubscriber subscriber;
     
     @Mock
     private ClusterPersistRepository repository;
     
+    @BeforeEach
+    void setUp() {
+        subscriber = new DeliverQualifiedDataSourceSubscriber(repository);
+    }
+    
     @Test
     void assertDeleteStorageNodeDataSourceDataSourceState() {
-        String databaseName = "replica_query_db";
-        String groupName = "readwrite_ds";
-        String dataSourceName = "replica_ds_0";
-        QualifiedDataSourceDeletedEvent event = new 
QualifiedDataSourceDeletedEvent(new QualifiedDataSource(databaseName, 
groupName, dataSourceName));
-        new DeliverQualifiedDataSourceSubscriber(repository).delete(event);
-        
verify(repository).delete(QualifiedDataSourceNode.getQualifiedDataSourceNodePath(new
 QualifiedDataSource(databaseName, groupName, dataSourceName)));
+        subscriber.delete(new QualifiedDataSourceDeletedEvent(new 
QualifiedDataSource("foo_db", "foo_group", "foo_ds")));
+        
verify(repository).delete("/nodes/qualified_data_sources/foo_db.foo_group.foo_ds");
     }
 }
diff --git 
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/QualifiedDataSourceSubscriberTest.java
 
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/QualifiedDataSourceSubscriberTest.java
index 6af27c79fb1..f2d94495610 100644
--- 
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/QualifiedDataSourceSubscriberTest.java
+++ 
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/QualifiedDataSourceSubscriberTest.java
@@ -55,7 +55,7 @@ class QualifiedDataSourceSubscriberTest {
         StaticDataSourceRuleAttribute staticDataSourceRuleAttribute = 
mock(StaticDataSourceRuleAttribute.class);
         
when(contextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db").getRuleMetaData().getAttributes(StaticDataSourceRuleAttribute.class))
                 
.thenReturn(Collections.singleton(staticDataSourceRuleAttribute));
-        QualifiedDataSource qualifiedDataSource = new 
QualifiedDataSource("foo_db.readwrite_ds.ds_0");
+        QualifiedDataSource qualifiedDataSource = new 
QualifiedDataSource("foo_db.foo_group.foo_ds");
         subscriber.renew(new 
QualifiedDataSourceStateEvent(qualifiedDataSource, new 
QualifiedDataSourceState(DataSourceState.DISABLED)));
         
verify(staticDataSourceRuleAttribute).updateStatus(qualifiedDataSource, 
DataSourceState.DISABLED);
     }