feat: Curator5ZookeeperClientTest.testCheckExists

apache · Jan 21, 2025 · f5f717e · f5f717e
1 parent 628dcbf
commit f5f717e
Show file tree

Hide file tree

Showing 9 changed files with 87 additions and 22 deletions.
diff --git a/dubbo-remoting/dubbo-remoting-api/pom.xml b/dubbo-remoting/dubbo-remoting-api/pom.xml
@@ -58,5 +58,11 @@
       <artifactId>log4j-slf4j-impl</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.dubbo</groupId>
+      <artifactId>dubbo-test-check</artifactId>
+      <version>${project.parent.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/dubbo-remoting/dubbo-remoting-http12/pom.xml b/dubbo-remoting/dubbo-remoting-http12/pom.xml
@@ -85,5 +85,11 @@
       <artifactId>log4j-slf4j-impl</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.dubbo</groupId>
+      <artifactId>dubbo-test-check</artifactId>
+      <version>${project.parent.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/dubbo-remoting/dubbo-remoting-http3/pom.xml b/dubbo-remoting/dubbo-remoting-http3/pom.xml
@@ -52,5 +52,11 @@
       <artifactId>log4j-slf4j-impl</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.dubbo</groupId>
+      <artifactId>dubbo-test-check</artifactId>
+      <version>${project.parent.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/dubbo-remoting/dubbo-remoting-netty/pom.xml b/dubbo-remoting/dubbo-remoting-netty/pom.xml
@@ -57,5 +57,11 @@
       <version>${project.parent.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.dubbo</groupId>
+      <artifactId>dubbo-test-check</artifactId>
+      <version>${project.parent.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/dubbo-remoting/dubbo-remoting-netty4/pom.xml b/dubbo-remoting/dubbo-remoting-netty4/pom.xml
@@ -68,6 +68,12 @@
       <version>${project.parent.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.dubbo</groupId>
+      <artifactId>dubbo-test-check</artifactId>
+      <version>${project.parent.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-slf4j-impl</artifactId>

diff --git a/dubbo-remoting/dubbo-remoting-websocket/pom.xml b/dubbo-remoting/dubbo-remoting-websocket/pom.xml
@@ -37,5 +37,11 @@
       <artifactId>dubbo-remoting-http12</artifactId>
       <version>${project.parent.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.dubbo</groupId>
+      <artifactId>dubbo-test-check</artifactId>
+      <version>${project.parent.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/dubbo-remoting/dubbo-remoting-zookeeper-curator5/pom.xml b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/pom.xml
@@ -39,13 +39,6 @@
       <version>${project.parent.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.dubbo</groupId>
-      <artifactId>dubbo-test-common</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.curator</groupId>
       <artifactId>curator-framework</artifactId>

diff --git a/...c/test/java/org/apache/dubbo/remoting/zookeeper/curator5/Curator5ZookeeperClientTest.java b/...c/test/java/org/apache/dubbo/remoting/zookeeper/curator5/Curator5ZookeeperClientTest.java
@@ -16,10 +16,17 @@
  */
 package org.apache.dubbo.remoting.zookeeper.curator5;
 
+import org.apache.curator.framework.CuratorFrameworkFactory.Builder;
+
+import org.apache.curator.framework.api.CreateBuilder;
+import org.apache.curator.framework.api.ExistsBuilder;
+import org.apache.curator.framework.listen.StandardListenerManager;
+
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.config.configcenter.ConfigItem;
 
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -35,31 +42,67 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+import org.mockito.Spy;
 
 import static org.awaitility.Awaitility.await;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
 
 class Curator5ZookeeperClientTest {
     private static Curator5ZookeeperClient curatorClient;
     private static CuratorFramework client = null;
 
-    private static int zookeeperServerPort1;
+    private static int zookeeperServerMockPort1;
     private static String zookeeperConnectionAddress1;
 
+    @Spy
+    CuratorFrameworkFactory.Builder spyBuilder = CuratorFrameworkFactory.builder();
+
     @BeforeAll
     public static void setUp() throws Exception {
-        zookeeperConnectionAddress1 = System.getProperty("zookeeper.connection.address.1");
-        zookeeperServerPort1 = Integer.parseInt(
-                zookeeperConnectionAddress1.substring(zookeeperConnectionAddress1.lastIndexOf(":") + 1));
+        zookeeperServerMockPort1 = 2181;
+        zookeeperConnectionAddress1 = "zookeeper://localhost:" + zookeeperServerMockPort1;
+
+        // mock begin
+        // create mock bean begin
+        CuratorFrameworkFactory.Builder realBuilder = CuratorFrameworkFactory.builder();
+        CuratorFrameworkFactory.Builder spyBuilder = spy(realBuilder);
+        CreateBuilder mockCreateBuilder = mock(CreateBuilder.class);
+        ExistsBuilder mockExistsBuilder = mock(ExistsBuilder.class);
+        CuratorFramework mockCuratorFramework = Mockito.mock(CuratorFramework.class);
+        MockedStatic<CuratorFrameworkFactory> curatorFrameworkFactoryMockedStatic = Mockito.mockStatic(CuratorFrameworkFactory.class);
+        curatorFrameworkFactoryMockedStatic.when(CuratorFrameworkFactory::builder).thenReturn(spyBuilder);
+        doReturn(mockCuratorFramework).when(spyBuilder).build();
+        Mockito.when(mockCuratorFramework.blockUntilConnected(anyInt(), any())).thenReturn(true);
+        Mockito.when(mockCuratorFramework.getConnectionStateListenable()).thenReturn(StandardListenerManager.standard());
+        Mockito.when(mockCuratorFramework.create()).thenReturn(mockCreateBuilder);
+        Mockito.when(mockCuratorFramework.checkExists()).thenReturn(mockExistsBuilder);
+        List<String> paths = new ArrayList<>();
+        Mockito.when(mockCreateBuilder.forPath(anyString())).thenAnswer(i-> {
+            paths.add(i.getArgument(0));
+            return i.getArgument(0);
+        });
+        Mockito.when(mockExistsBuilder.forPath(anyString())).thenAnswer(i-> {
+            if (paths.contains(i.getArgument(0))) {
+                return new Stat();
+            }
+            return null;
+        });
+
+
         curatorClient = new Curator5ZookeeperClient(
                 URL.valueOf(zookeeperConnectionAddress1 + "/org.apache.dubbo.registry.RegistryService"));
-        client = CuratorFrameworkFactory.newClient(
-                "127.0.0.1:" + zookeeperServerPort1, new ExponentialBackoffRetry(1000, 3));
-        client.start();
+
     }
 
     @Test

diff --git a/dubbo-remoting/pom.xml b/dubbo-remoting/pom.xml
@@ -40,12 +40,5 @@
     <skip_maven_deploy>false</skip_maven_deploy>
   </properties>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.dubbo</groupId>
-      <artifactId>dubbo-test-check</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+
 </project>