[incubator-dubbo-ops] branch develop updated: Cleanup registry info after controller test cases (#291) (#292)

[biyuhao]

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

biyuhao pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git


The following commit(s) were added to refs/heads/develop by this push:
     new 4262b47  Cleanup registry info after controller test cases (#291) 
(#292)
4262b47 is described below

commit 4262b471e034af5e2325227024ab4cc68059ff50
Author: Yuhao Bi <byh0...@gmail.com>
AuthorDate: Mon Feb 4 11:25:09 2019 +0800

    Cleanup registry info after controller test cases (#291) (#292)
---
 .../apache/dubbo/admin/controller/AccessesControllerTest.java    | 9 +++++++++
 .../apache/dubbo/admin/controller/LoadBalanceControllerTest.java | 9 +++++++++
 .../apache/dubbo/admin/controller/ManagementControllerTest.java  | 9 +++++++++
 3 files changed, 27 insertions(+)

diff --git 
a/dubbo-admin-backend/src/test/java/org/apache/dubbo/admin/controller/AccessesControllerTest.java
 
b/dubbo-admin-backend/src/test/java/org/apache/dubbo/admin/controller/AccessesControllerTest.java
index fc494ba..c77bf34 100644
--- 
a/dubbo-admin-backend/src/test/java/org/apache/dubbo/admin/controller/AccessesControllerTest.java
+++ 
b/dubbo-admin-backend/src/test/java/org/apache/dubbo/admin/controller/AccessesControllerTest.java
@@ -24,6 +24,8 @@ import org.apache.dubbo.admin.model.dto.AccessDTO;
 import org.apache.dubbo.admin.model.dto.ConditionRouteDTO;
 import org.apache.dubbo.admin.service.ProviderService;
 import org.apache.dubbo.admin.service.RouteService;
+
+import org.junit.After;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.mock.mockito.MockBean;
@@ -52,6 +54,13 @@ public class AccessesControllerTest extends 
AbstractSpringIntegrationTest {
     @Autowired
     private ObjectMapper objectMapper;
 
+    @After
+    public void tearDown() throws Exception {
+        if (zkClient.checkExists().forPath("/dubbo") != null) {
+            zkClient.delete().deletingChildrenIfNeeded().forPath("/dubbo");
+        }
+    }
+
     @Test
     public void searchAccess() throws IOException {
         AccessDTO accessDTO = new AccessDTO();
diff --git 
a/dubbo-admin-backend/src/test/java/org/apache/dubbo/admin/controller/LoadBalanceControllerTest.java
 
b/dubbo-admin-backend/src/test/java/org/apache/dubbo/admin/controller/LoadBalanceControllerTest.java
index fe8878b..bdc77ea 100644
--- 
a/dubbo-admin-backend/src/test/java/org/apache/dubbo/admin/controller/LoadBalanceControllerTest.java
+++ 
b/dubbo-admin-backend/src/test/java/org/apache/dubbo/admin/controller/LoadBalanceControllerTest.java
@@ -22,6 +22,8 @@ import org.apache.dubbo.admin.AbstractSpringIntegrationTest;
 import org.apache.dubbo.admin.model.dto.BalancingDTO;
 import org.apache.dubbo.admin.service.OverrideService;
 import org.apache.dubbo.admin.service.ProviderService;
+
+import org.junit.After;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.mock.mockito.MockBean;
@@ -56,6 +58,13 @@ public class LoadBalanceControllerTest extends 
AbstractSpringIntegrationTest {
     @Autowired
     private ObjectMapper objectMapper;
 
+    @After
+    public void tearDown() throws Exception {
+        if (zkClient.checkExists().forPath("/dubbo") != null) {
+            zkClient.delete().deletingChildrenIfNeeded().forPath("/dubbo");
+        }
+    }
+
     @Test
     public void createLoadbalance() throws IOException {
         BalancingDTO balancingDTO = new BalancingDTO();
diff --git 
a/dubbo-admin-backend/src/test/java/org/apache/dubbo/admin/controller/ManagementControllerTest.java
 
b/dubbo-admin-backend/src/test/java/org/apache/dubbo/admin/controller/ManagementControllerTest.java
index fc061e1..fb89b86 100644
--- 
a/dubbo-admin-backend/src/test/java/org/apache/dubbo/admin/controller/ManagementControllerTest.java
+++ 
b/dubbo-admin-backend/src/test/java/org/apache/dubbo/admin/controller/ManagementControllerTest.java
@@ -21,6 +21,8 @@ import org.apache.dubbo.admin.AbstractSpringIntegrationTest;
 import org.apache.dubbo.admin.common.util.Constants;
 import org.apache.dubbo.admin.model.dto.ConfigDTO;
 import org.apache.dubbo.admin.service.ProviderService;
+
+import org.junit.After;
 import org.junit.Test;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.core.ParameterizedTypeReference;
@@ -45,6 +47,13 @@ public class ManagementControllerTest extends 
AbstractSpringIntegrationTest {
   @MockBean
   private ProviderService providerService;
 
+  @After
+  public void tearDown() throws Exception {
+    if (zkClient.checkExists().forPath("/dubbo") != null) {
+      zkClient.delete().deletingChildrenIfNeeded().forPath("/dubbo");
+    }
+  }
+
   @Test
   public void shouldCreateGlobalConfig() throws Exception {
     ConfigDTO configDTO = new ConfigDTO();