[dubbo] branch 3.0-multi-instances updated: Fix zk not startup in DubboBootstrapMultiInstanceTest

[al...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a commit to branch 3.0-multi-instances
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.0-multi-instances by this push:
     new 2edffd6  Fix zk not startup in DubboBootstrapMultiInstanceTest
2edffd6 is described below

commit 2edffd60a5038d2da2afd86be02f457ddb72a8eb
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Sun Aug 29 16:39:19 2021 +0800

    Fix zk not startup in DubboBootstrapMultiInstanceTest
---
 .../bootstrap/DubboBootstrapMultiInstanceTest.java | 25 ++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboBootstrapMultiInstanceTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboBootstrapMultiInstanceTest.java
index bda9199..e7fb4fe 100644
--- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboBootstrapMultiInstanceTest.java
+++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboBootstrapMultiInstanceTest.java
@@ -16,23 +16,39 @@
  */
 package org.apache.dubbo.config.bootstrap;
 
+import org.apache.dubbo.common.utils.NetUtils;
 import org.apache.dubbo.common.utils.StringUtils;
 import org.apache.dubbo.config.ProtocolConfig;
 import org.apache.dubbo.config.ReferenceConfig;
-import org.apache.dubbo.config.RegistryConfig;
 import org.apache.dubbo.config.ServiceConfig;
 import org.apache.dubbo.config.SysProps;
 import org.apache.dubbo.config.api.DemoService;
 import org.apache.dubbo.config.provider.impl.DemoServiceImpl;
+import org.apache.dubbo.registrycenter.DefaultSingleRegistryCenter;
 import org.apache.dubbo.rpc.model.ApplicationModel;
 import org.apache.dubbo.rpc.model.FrameworkModel;
 
+import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 public class DubboBootstrapMultiInstanceTest {
 
+    private static DefaultSingleRegistryCenter registryCenter;
+
+    @BeforeAll
+    public static void setup() {
+        registryCenter = new DefaultSingleRegistryCenter(NetUtils.getAvailablePort());
+        registryCenter.startup();
+    }
+
+    @AfterAll
+    public static void teardown() {
+        registryCenter.shutdown();
+    }
+
     @AfterEach
     protected void afterEach() {
         SysProps.clear();
@@ -110,7 +126,7 @@ public class DubboBootstrapMultiInstanceTest {
         if (!dubboBootstrap.getConfigManager().getApplication().isPresent()) {
             dubboBootstrap.application("consumer-app");
         }
-        dubboBootstrap.registry(new RegistryConfig("zookeeper://localhost:2181"))
+        dubboBootstrap.registry(registryCenter.getRegistryConfig())
             .reference(referenceConfig);
         return dubboBootstrap;
     }
@@ -123,9 +139,6 @@ public class DubboBootstrapMultiInstanceTest {
     }
 
     private DubboBootstrap configProviderApp(DubboBootstrap dubboBootstrap) {
-        RegistryConfig registry1 = new RegistryConfig();
-        registry1.setAddress("zookeeper://localhost:2181");
-
         ProtocolConfig protocol1 = new ProtocolConfig();
         protocol1.setName("dubbo");
         protocol1.setPort(2001);
@@ -137,7 +150,7 @@ public class DubboBootstrapMultiInstanceTest {
         if (!dubboBootstrap.getConfigManager().getApplication().isPresent()) {
             dubboBootstrap.application("provider-app");
         }
-        dubboBootstrap.registry(registry1)
+        dubboBootstrap.registry(registryCenter.getRegistryConfig())
             .protocol(protocol1)
             .service(serviceConfig);
         return dubboBootstrap;