[incubator-dubbo-ops] branch develop updated: fix loadbalance test issue

[min]

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

min 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 9bb1f42  fix loadbalance test issue
9bb1f42 is described below

commit 9bb1f42358654b6327c7e3c96f9c975c24a1052d
Author: nzomkxia <z82507...@gmail.com>
AuthorDate: Wed Jan 30 11:35:09 2019 +0800

    fix loadbalance test issue
---
 .../dubbo/admin/controller/LoadBalanceControllerTest.java     | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

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 38bf946..fe8878b 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
@@ -84,14 +84,12 @@ public class LoadBalanceControllerTest extends 
AbstractSpringIntegrationTest {
         URI uri;
         ResponseEntity<String> response;
         // unknown id
-        uri = 
restTemplate.getUriTemplateHandler().expand(url("/api/{env}/rules/balancing/{id}"),
 env, id);
-        response = restTemplate.exchange(uri, HttpMethod.PUT, new 
HttpEntity<>(balancingDTO), String.class);
+        response = 
restTemplate.exchange(url("/api/{env}/rules/balancing/{id}"), HttpMethod.PUT, 
new HttpEntity<>(balancingDTO, null), String.class, env, id);
         assertFalse("should return a fail response, when id is null", 
(Boolean) objectMapper.readValue(response.getBody(), Map.class).get("success"));
         // valid id
         BalancingDTO balancing = mock(BalancingDTO.class);
         when(overrideService.findBalance(id)).thenReturn(balancing);
-        uri = 
restTemplate.getUriTemplateHandler().expand(url("/api/{env}/rules/balancing/{id}"),
 env, id);
-        assertTrue(restTemplate.exchange(uri, HttpMethod.PUT, new 
HttpEntity<>(balancingDTO), Boolean.class).getBody());
+        
assertTrue(restTemplate.exchange(url("/api/{env}/rules/balancing/{id}"), 
HttpMethod.PUT, new HttpEntity<>(balancingDTO, null), Boolean.class, env, 
id).getBody());
         verify(overrideService).saveBalance(any(BalancingDTO.class));
     }
 
@@ -138,9 +136,8 @@ public class LoadBalanceControllerTest extends 
AbstractSpringIntegrationTest {
         URI uri;
         ResponseEntity<String> response;
 
-        uri = 
restTemplate.getUriTemplateHandler().expand(url("/api/{env}/rules/balancing/{id}"),
 env, id);
-        response = restTemplate.exchange(uri, HttpMethod.DELETE, new 
HttpEntity<>(null), String.class);
+        response = 
restTemplate.exchange(url("/api/{env}/rules/balancing/{id}"), 
HttpMethod.DELETE, new HttpEntity<>(null), String.class, env, id);
         assertEquals(HttpStatus.OK, response.getStatusCode());
         assertTrue(Boolean.valueOf(response.getBody()));
     }
-}
\ No newline at end of file
+}