Skip to content

A
apollo
Commit f7191bfa by Jason Song
Options

Merge pull request #87 from yiming187/test_update

Update AllTests
parents 2998db81 17e2e5c1
Showing with 124 additions and 107 deletions
apollo-adminservice/src/test/java/com/ctrip/apollo/adminservice/AllTests.java 0 → 100644
package com.ctrip.apollo.adminservice;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
import com.ctrip.apollo.adminservice.controller.AppControllerTest;
import com.ctrip.apollo.adminservice.controller.ItemSetControllerTest;
import com.ctrip.apollo.adminservice.controller.ReleaseControllerTest;
@RunWith(Suite.class)
@SuiteClasses({AppControllerTest.class, ReleaseControllerTest.class, ItemSetControllerTest.class})
public class AllTests {
}
apollo-adminservice/src/test/java/com/ctrip/apollo/adminservice/controller/AppControllerTest.java
...@@ -5,6 +5,8 @@ import org.junit.Test; ...@@ -5,6 +5,8 @@ import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.test.context.jdbc.Sql;
import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
import com.ctrip.apollo.biz.entity.App; import com.ctrip.apollo.biz.entity.App;
import com.ctrip.apollo.biz.repository.AppRepository; import com.ctrip.apollo.biz.repository.AppRepository;
...@@ -21,6 +23,7 @@ public class AppControllerTest extends AbstractControllerTest{ ...@@ -21,6 +23,7 @@ public class AppControllerTest extends AbstractControllerTest{
} }
@Test @Test
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testCreate() { public void testCreate() {
AppDTO dto = generateSampleDTOData(); AppDTO dto = generateSampleDTOData();
ResponseEntity<AppDTO> response = ResponseEntity<AppDTO> response =
...@@ -33,11 +36,10 @@ public class AppControllerTest extends AbstractControllerTest{ ...@@ -33,11 +36,10 @@ public class AppControllerTest extends AbstractControllerTest{
App savedApp = appRepository.findOne(result.getId()); App savedApp = appRepository.findOne(result.getId());
Assert.assertEquals(dto.getAppId(), savedApp.getAppId()); Assert.assertEquals(dto.getAppId(), savedApp.getAppId());
Assert.assertNotNull(savedApp.getDataChangeCreatedTime()); Assert.assertNotNull(savedApp.getDataChangeCreatedTime());
appRepository.delete(savedApp.getId());
} }
@Test @Test
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testFind() { public void testFind() {
AppDTO dto = generateSampleDTOData(); AppDTO dto = generateSampleDTOData();
App app = BeanUtils.transfrom(App.class, dto); App app = BeanUtils.transfrom(App.class, dto);
...@@ -47,11 +49,10 @@ public class AppControllerTest extends AbstractControllerTest{ ...@@ -47,11 +49,10 @@ public class AppControllerTest extends AbstractControllerTest{
restTemplate.getForObject(getBaseAppUrl() + dto.getAppId(), AppDTO.class); restTemplate.getForObject(getBaseAppUrl() + dto.getAppId(), AppDTO.class);
Assert.assertEquals(dto.getAppId(), result.getAppId()); Assert.assertEquals(dto.getAppId(), result.getAppId());
Assert.assertEquals(dto.getName(), result.getName()); Assert.assertEquals(dto.getName(), result.getName());
appRepository.delete(app.getId());
} }
@Test @Test
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testFindNotExist() { public void testFindNotExist() {
ResponseEntity<AppDTO> result = ResponseEntity<AppDTO> result =
restTemplate.getForEntity(getBaseAppUrl() + "notExists", AppDTO.class); restTemplate.getForEntity(getBaseAppUrl() + "notExists", AppDTO.class);
...@@ -59,6 +60,7 @@ public class AppControllerTest extends AbstractControllerTest{ ...@@ -59,6 +60,7 @@ public class AppControllerTest extends AbstractControllerTest{
} }
@Test @Test
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testDelete() { public void testDelete() {
AppDTO dto = generateSampleDTOData(); AppDTO dto = generateSampleDTOData();
App app = BeanUtils.transfrom(App.class, dto); App app = BeanUtils.transfrom(App.class, dto);
...@@ -71,6 +73,7 @@ public class AppControllerTest extends AbstractControllerTest{ ...@@ -71,6 +73,7 @@ public class AppControllerTest extends AbstractControllerTest{
} }
@Test @Test
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testUpdate() { public void testUpdate() {
AppDTO dto = generateSampleDTOData(); AppDTO dto = generateSampleDTOData();
App app = BeanUtils.transfrom(App.class, dto); App app = BeanUtils.transfrom(App.class, dto);
......
apollo-adminservice/src/test/java/com/ctrip/apollo/adminservice/controller/ItemSetControllerTest.java
...@@ -25,7 +25,7 @@ public class ItemSetControllerTest extends AbstractControllerTest { ...@@ -25,7 +25,7 @@ public class ItemSetControllerTest extends AbstractControllerTest {
@Test @Test
@Sql(scripts = "/controller/test-itemset.sql", executionPhase = ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/controller/test-itemset.sql", executionPhase = ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/controller/test-itemset-cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD) @Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testItemSetCreated() { public void testItemSetCreated() {
String appId = "someAppId"; String appId = "someAppId";
AppDTO app = AppDTO app =
...@@ -72,7 +72,7 @@ public class ItemSetControllerTest extends AbstractControllerTest { ...@@ -72,7 +72,7 @@ public class ItemSetControllerTest extends AbstractControllerTest {
@Test @Test
@Sql(scripts = "/controller/test-itemset.sql", executionPhase = ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/controller/test-itemset.sql", executionPhase = ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/controller/test-itemset-cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD) @Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testItemSetUpdated() { public void testItemSetUpdated() {
String appId = "someAppId"; String appId = "someAppId";
AppDTO app = AppDTO app =
...@@ -141,7 +141,7 @@ public class ItemSetControllerTest extends AbstractControllerTest { ...@@ -141,7 +141,7 @@ public class ItemSetControllerTest extends AbstractControllerTest {
@Test @Test
@Sql(scripts = "/controller/test-itemset.sql", executionPhase = ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/controller/test-itemset.sql", executionPhase = ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/controller/test-itemset-cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD) @Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testItemSetDeleted() { public void testItemSetDeleted() {
String appId = "someAppId"; String appId = "someAppId";
AppDTO app = AppDTO app =
......
apollo-adminservice/src/test/java/com/ctrip/apollo/adminservice/controller/ReleaseControllerTest.java
...@@ -29,7 +29,7 @@ public class ReleaseControllerTest extends AbstractControllerTest { ...@@ -29,7 +29,7 @@ public class ReleaseControllerTest extends AbstractControllerTest {
@Test @Test
@Sql(scripts = "/controller/test-release.sql", executionPhase = ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/controller/test-release.sql", executionPhase = ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/controller/test-release-cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD) @Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testReleaseBuild() { public void testReleaseBuild() {
String appId = "someAppId"; String appId = "someAppId";
AppDTO app = AppDTO app =
......
apollo-adminservice/src/test/resources/controller/test-release-cleanup.sql deleted 100644 → 0
DELETE FROM Item;
DELETE FROM Namespace;
DELETE FROM AppNamespace;
DELETE FROM Cluster;
DELETE FROM App;
apollo-configservice/src/test/java/com/ctrip/apollo/configservice/AllTests.java
...@@ -7,9 +7,7 @@ import org.junit.runners.Suite; ...@@ -7,9 +7,7 @@ import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses; import org.junit.runners.Suite.SuiteClasses;
@RunWith(Suite.class) @RunWith(Suite.class)
@SuiteClasses({ @SuiteClasses({ConfigControllerTest.class})
//ConfigControllerTest.class
})
public class AllTests { public class AllTests {
} }
apollo-configservice/src/test/java/com/ctrip/apollo/configservice/controller/ConfigControllerTest.java
...@@ -29,6 +29,7 @@ import static org.mockito.Mockito.when; ...@@ -29,6 +29,7 @@ import static org.mockito.Mockito.when;
*/ */
@RunWith(MockitoJUnitRunner.class) @RunWith(MockitoJUnitRunner.class)
public class ConfigControllerTest { public class ConfigControllerTest {
private ConfigController configController; private ConfigController configController;
@Mock @Mock
private ConfigService configService; private ConfigService configService;
...@@ -39,94 +40,89 @@ public class ConfigControllerTest { ...@@ -39,94 +40,89 @@ public class ConfigControllerTest {
ReflectionTestUtils.setField(configController, "configService", configService); ReflectionTestUtils.setField(configController, "configService", configService);
} }
// @Test @Test
// public void testQueryConfig() throws Exception { public void testQueryConfig() throws Exception {
// ApolloConfig someApolloConfig = mock(ApolloConfig.class); ApolloConfig someApolloConfig = mock(ApolloConfig.class);
// String someAppId = "1"; String someAppId = "1";
// String someClusterName = "someClusterName"; String someClusterName = "someClusterName";
// String someGroupName = "someGroupName"; String someNamespaceName = "someNamespaceName";
// long someClientSideReleaseId = 1; long someClientSideReleaseId = 1;
// long someServerSideNewReleaseId = 2; long someServerSideNewReleaseId = 2;
// HttpServletResponse someResponse = mock(HttpServletResponse.class); HttpServletResponse someResponse = mock(HttpServletResponse.class);
// Release someRelease = mock(Release.class); Release someRelease = mock(Release.class);
//
// when(configService.findRelease(someAppId, someClusterName, someGroupName)) when(configService.findRelease(someAppId, someClusterName, someNamespaceName))
// .thenReturn(someRelease); .thenReturn(someRelease);
// when(someRelease.getId()).thenReturn(someServerSideNewReleaseId); when(someRelease.getId()).thenReturn(someServerSideNewReleaseId);
// when(configService.loadConfig(someRelease, someGroupName)) when(configService.loadConfig(someRelease, someNamespaceName)).thenReturn(someApolloConfig);
// .thenReturn(someApolloConfig);
// ApolloConfig result = configController.queryConfig(someAppId, someClusterName,
// ApolloConfig result = configController.queryConfig(someAppId, someClusterName, someGroupName, someNamespaceName, someClientSideReleaseId, someResponse);
// someClientSideReleaseId, someResponse);
// assertEquals(someApolloConfig, result);
// assertEquals(someApolloConfig, result); verify(configService, times(1)).findRelease(someAppId, someClusterName, someNamespaceName);
// verify(configService, times(1)).findRelease(someAppId, someClusterName, someGroupName verify(configService, times(1)).loadConfig(someRelease, someNamespaceName);
// someVersinName); }
// verify(configService, times(1)).loadConfig(someRelease, someGroupName,);
// }
// @Test
// @Test public void testQueryConfigWithVersionNotFound() throws Exception {
// public void testQueryConfigWithVersionNotFound() throws Exception { String someAppId = "1";
// String someAppId = "1"; String someClusterName = "someClusterName";
// String someClusterName = "someClusterName"; String someNamespaceName = "someNamespaceName";
// String someGroupName = "someGroupName"; long someClientSideReleaseId = 1;
// String someVersionName = "someVersion"; HttpServletResponse someResponse = mock(HttpServletResponse.class);
// long someClientSideReleaseId = 1;
// HttpServletResponse someResponse = mock(HttpServletResponse.class); when(configService.findRelease(someAppId, someClusterName, someNamespaceName)).thenReturn(null);
//
// when(configService.findRelease(someAppId, someClusterName, someGroupName, someVersionName)) ApolloConfig result = configController.queryConfig(someAppId, someClusterName,
// .thenReturn(null); someNamespaceName, someClientSideReleaseId, someResponse);
//
// ApolloConfig result = configController.queryConfig(someAppId, someClusterName, someGroupName, assertNull(result);
// someVersionName, someClientSideReleaseId, someResponse); verify(someResponse, times(1)).sendError(eq(HttpServletResponse.SC_NOT_FOUND), anyString());
// }
// assertNull(result);
// verify(someResponse, times(1)).sendError(eq(HttpServletResponse.SC_NOT_FOUND), anyString()); @Test
// } public void testQueryConfigWithApolloConfigNotFound() throws Exception {
// String someAppId = "1";
// @Test String someClusterName = "someClusterName";
// public void testQueryConfigWithApolloConfigNotFound() throws Exception { String someNamespaceName = "someNamespaceName";
// String someAppId = "1"; long someClientSideReleaseId = 1;
// String someClusterName = "someClusterName"; long someServerSideNewReleaseId = 2;
// String someGroupName = "someGroupName"; HttpServletResponse someResponse = mock(HttpServletResponse.class);
// String someVersionName = "someVersion"; Release someRelease = mock(Release.class);
// long someClientSideReleaseId = 1;
// long someServerSideNewReleaseId = 2; when(configService.findRelease(someAppId, someClusterName, someNamespaceName))
// HttpServletResponse someResponse = mock(HttpServletResponse.class); .thenReturn(someRelease);
// Release someRelease = mock(Release.class); when(someRelease.getId()).thenReturn(someServerSideNewReleaseId);
// when(configService.loadConfig(someRelease, someNamespaceName)).thenReturn(null);
// when(configService.findRelease(someAppId, someClusterName, someGroupName, someVersionName))
// .thenReturn(someRelease); ApolloConfig result = configController.queryConfig(someAppId, someClusterName,
// when(someRelease.getId()).thenReturn(someServerSideNewReleaseId); someNamespaceName, someClientSideReleaseId, someResponse);
// when(configService.loadConfig(someRelease, someGroupName, someVersionName)).thenReturn(null);
// assertNull(result);
// ApolloConfig result = configController.queryConfig(someAppId, someClusterName, someGroupName, verify(someResponse, times(1)).sendError(eq(HttpServletResponse.SC_NOT_FOUND), anyString());
// someVersionName, someClientSideReleaseId, someResponse); }
//
// assertNull(result); @Test
// verify(someResponse, times(1)).sendError(eq(HttpServletResponse.SC_NOT_FOUND), anyString()); public void testQueryConfigWithApolloConfigNotModified() throws Exception {
// } String someAppId = "1";
// String someClusterName = "someClusterName";
// @Test String someNamespaceName = "someNamespaceName";
// public void testQueryConfigWithApolloConfigNotModified() throws Exception { long someClientSideReleaseId = 1;
// String someAppId = "1"; long someServerSideReleaseId = someClientSideReleaseId;
// String someClusterName = "someClusterName"; HttpServletResponse someResponse = mock(HttpServletResponse.class);
// String someGroupName = "someGroupName"; Release someRelease = mock(Release.class);
// String someVersionName = "someVersion";
// long someClientSideReleaseId = 1; when(configService.findRelease(someAppId, someClusterName, someNamespaceName))
// long someServerSideReleaseId = someClientSideReleaseId; .thenReturn(someRelease);
// HttpServletResponse someResponse = mock(HttpServletResponse.class); when(someRelease.getId()).thenReturn(someServerSideReleaseId);
// Release someRelease = mock(Release.class);
// ApolloConfig result = configController.queryConfig(someAppId, someClusterName, someNamespaceName,
// when(configService.findRelease(someAppId, someClusterName, someGroupName, someVersionName)) someClientSideReleaseId, someResponse);
// .thenReturn(someRelease);
// when(someRelease.getId()).thenReturn(someServerSideReleaseId); assertNull(result);
// verify(someResponse, times(1)).setStatus(HttpServletResponse.SC_NOT_MODIFIED);
// ApolloConfig result = configController.queryConfig(someAppId, someClusterName, someGroupName, verify(configService, never()).loadConfig(any(Release.class), anyString());
// someVersionName, someClientSideReleaseId, someResponse); }
//
// assertNull(result);
// verify(someResponse, times(1)).setStatus(HttpServletResponse.SC_NOT_MODIFIED);
// verify(configService, never()).loadConfig(any(Release.class), anyString(), anyString());
// }
} }
apollo-core/src/test/java/com/ctrip/apollo/core/AllTests.java 0 → 100644
package com.ctrip.apollo.core;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
@RunWith(Suite.class)
@SuiteClasses({MetaDomainTest.class})
public class AllTests {
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment