Simplify url assembly in test cases

apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/AbstractControllerTest.java

@@ -52,4 +52,20 @@ private void postConstruct() {
   protected String url(String path) {
     return "http://localhost:" + port + path;
   }
+
+  protected String namespaceBaseUrl() {
+    return url("/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName:.+}");
+  }
+
+  protected String appBaseUrl() {
+    return url("/apps/{appId}");
+  }
+
+  protected String clusterBaseUrl() {
+    return url("/apps/{appId}/clusters/{clusterName}");
+  }
+
+  protected String itemBaseUrl(){
+    return url("/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items");
+  }
 }

apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/AppControllerTest.java

@@ -37,7 +37,7 @@ public class AppControllerTest extends AbstractControllerTest {
   AppRepository appRepository;
 
   private String getBaseAppUrl() {
-    return "http://localhost:" + port + "/apps/";
+    return url("/apps/");
   }
 
   @Test
@@ -123,7 +123,7 @@ public void testDelete() {
     App app = BeanUtils.transform(App.class, dto);
     app = appRepository.save(app);
 
-    restTemplate.delete("http://localhost:{port}/apps/{appId}?operator={operator}", port, app.getAppId(), "test");
+    restTemplate.delete(url("/apps/{appId}?operator={operator}"), app.getAppId(), "test");
 
     App deletedApp = appRepository.findById(app.getId()).orElse(null);
     Assert.assertNull(deletedApp);

apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/AppNamespaceControllerTest.java

@@ -42,9 +42,9 @@ public void testCreate(){
     dto.setComment(comment);
     dto.setDataChangeCreatedBy("apollo");
 
-    AppNamespaceDTO resultDto = restTemplate.postForEntity(
-        String.format("http://localhost:%d/apps/%s/appnamespaces", port, appId),dto, AppNamespaceDTO.class).getBody();
+    AppNamespaceDTO resultDto = restTemplate.postForEntity(url("/apps/{appId}/appnamespaces"), dto, AppNamespaceDTO.class, appId).getBody();
 
+    Assert.assertNotNull(resultDto);
     Assert.assertEquals(appId, resultDto.getAppId());
     Assert.assertTrue(resultDto.getId() > 0);
 
@@ -54,9 +54,5 @@ public void testCreate(){
     Assert.assertNotNull(savedAppNs.getDataChangeLastModifiedTime());
     Assert.assertNotNull(savedAppNs.getDataChangeLastModifiedBy());
     Assert.assertNotNull(savedAppNs.getDataChangeCreatedBy());
-
-
-
-
   }
 }

apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/ClusterControllerTest.java

@@ -23,29 +23,23 @@
 import com.ctrip.framework.apollo.common.utils.InputValidator;
 import com.ctrip.framework.apollo.core.ConfigConsts;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
+import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.HttpClientErrorException;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.mockito.Mockito.*;
 
 public class ClusterControllerTest extends AbstractControllerTest {
+
+  @InjectMocks
   private ClusterController clusterController;
 
   @Mock
   private ClusterService clusterService;
 
-  @Before
-  public void setUp() {
-    MockitoAnnotations.initMocks(this);
-    clusterController = new ClusterController(clusterService);
-  }
-
-
   @Test(expected = BadRequestException.class)
   public void testDeleteDefaultFail() {
     Cluster cluster = new Cluster();
@@ -68,22 +62,18 @@ public void shouldFailWhenRequestBodyInvalid() {
     cluster.setAppId("valid");
     cluster.setName("notBlank");
     ResponseEntity<ClusterDTO> response =
-        restTemplate.postForEntity(baseUrl() + "/apps/{appId}/clusters", cluster, ClusterDTO.class, cluster.getAppId());
+        restTemplate.postForEntity(url("/apps/{appId}/clusters"), cluster, ClusterDTO.class, cluster.getAppId());
     ClusterDTO createdCluster = response.getBody();
     Assert.assertNotNull(createdCluster);
     Assert.assertEquals(cluster.getAppId(), createdCluster.getAppId());
     Assert.assertEquals(cluster.getName(), createdCluster.getName());
 
     cluster.setName("invalid app name");
     try {
-      restTemplate.postForEntity(baseUrl() + "/apps/{appId}/clusters", cluster, ClusterDTO.class, cluster.getAppId());
+      restTemplate.postForEntity(url("/apps/{appId}/clusters"), cluster, ClusterDTO.class, cluster.getAppId());
       Assert.fail("Should throw");
     } catch (HttpClientErrorException e) {
       Assert.assertThat(new String(e.getResponseBodyAsByteArray()), containsString(InputValidator.INVALID_CLUSTER_NAMESPACE_MESSAGE));
     }
   }
-
-  private String baseUrl() {
-    return "http://localhost:" + port;
-  }
 }

apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/ControllerExceptionTest.java

@@ -23,9 +23,9 @@
 import com.ctrip.framework.apollo.common.exception.NotFoundException;
 import com.ctrip.framework.apollo.common.exception.ServiceException;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.data.domain.PageRequest;
@@ -40,6 +40,7 @@
 @RunWith(MockitoJUnitRunner.class)
 public class ControllerExceptionTest {
 
+  @InjectMocks
   private AppController appController;
 
   @Mock
@@ -48,11 +49,6 @@ public class ControllerExceptionTest {
   @Mock
   private AdminService adminService;
 
-  @Before
-  public void setUp() {
-    appController = new AppController(appService, adminService);
-  }
-
   @Test(expected = NotFoundException.class)
   public void testFindNotExists() {
     when(appService.findOne(any(String.class))).thenReturn(null);

apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/ControllerIntegrationExceptionTest.java

@@ -28,7 +28,6 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.jdbc.Sql;
 import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
@@ -57,8 +56,6 @@ public class ControllerIntegrationExceptionTest extends AbstractControllerTest {
 
   @Before
   public void setUp() {
-    MockitoAnnotations.initMocks(this);
-
     realAdminService = ReflectionTestUtils.getField(appController, "adminService");
 
     ReflectionTestUtils.setField(appController, "adminService", adminService);
@@ -69,10 +66,6 @@ public void tearDown() throws Exception {
     ReflectionTestUtils.setField(appController, "adminService", realAdminService);
   }
 
-  private String getBaseAppUrl() {
-    return "http://localhost:" + port + "/apps/";
-  }
-
   @Test
   @Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
   public void testCreateFailed() {
@@ -81,7 +74,7 @@ public void testCreateFailed() {
     when(adminService.createNewApp(any(App.class))).thenThrow(new RuntimeException("save failed"));
 
     try {
-      restTemplate.postForEntity(getBaseAppUrl(), dto, AppDTO.class);
+      restTemplate.postForEntity(url("/apps/"), dto, AppDTO.class);
     } catch (HttpStatusCodeException e) {
       @SuppressWarnings("unchecked")
       Map<String, String> attr = GSON.fromJson(e.getResponseBodyAsString(), Map.class);