From 7992f5303d060521eeb62e080e775d361457b02e Mon Sep 17 00:00:00 2001 From: lidongdai Date: Fri, 30 Aug 2019 06:19:18 +0800 Subject: [PATCH] update escheduler-api unit test --- .../api/service/ResourcesService.java | 28 +++++++----- .../ProcessDefinitionControllerTest.java | 12 +---- .../ProcessInstanceControllerTest.java | 34 +++----------- .../api/controller/ProjectControllerTest.java | 19 +------- .../api/controller/QueueControllerTest.java | 45 +++++++------------ .../controller/ResourcesControllerTest.java | 32 +++---------- .../controller/SchedulerControllerTest.java | 32 ++++--------- .../TaskInstanceControllerTest.java | 28 +++--------- .../api/controller/TenantControllerTest.java | 29 +++--------- .../api/controller/UsersControllerTest.java | 27 +++-------- .../dao/mapper/WorkerGroupMapperTest.java | 2 - 11 files changed, 72 insertions(+), 216 deletions(-) diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/ResourcesService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/ResourcesService.java index 81fc7107c8..9e37ce01fd 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/ResourcesService.java +++ b/escheduler-api/src/main/java/cn/escheduler/api/service/ResourcesService.java @@ -27,6 +27,7 @@ import cn.escheduler.common.utils.HadoopUtils; import cn.escheduler.common.utils.PropertyUtils; import cn.escheduler.dao.mapper.*; import cn.escheduler.dao.model.Resource; +import cn.escheduler.dao.model.Tenant; import cn.escheduler.dao.model.UdfFunc; import cn.escheduler.dao.model.User; import org.apache.commons.collections.BeanMap; @@ -441,18 +442,23 @@ public class ResourcesService extends BaseService { putMsg(result, Status.RESOURCE_EXIST); } else { // query tenant - String tenantCode = tenantMapper.queryById(loginUser.getTenantId()).getTenantCode(); - - try { - String hdfsFilename = getHdfsFileName(type,tenantCode,name); - if(HadoopUtils.getInstance().exists(hdfsFilename)){ - logger.error("resource type:{} name:{} has exist in hdfs {}, can't create again.", type, name,hdfsFilename); - putMsg(result, Status.RESOURCE_FILE_EXIST,hdfsFilename); + Tenant tenant = tenantMapper.queryById(loginUser.getTenantId()); + if(tenant != null){ + String tenantCode = tenant.getTenantCode(); + + try { + String hdfsFilename = getHdfsFileName(type,tenantCode,name); + if(HadoopUtils.getInstance().exists(hdfsFilename)){ + logger.error("resource type:{} name:{} has exist in hdfs {}, can't create again.", type, name,hdfsFilename); + putMsg(result, Status.RESOURCE_FILE_EXIST,hdfsFilename); + } + + } catch (Exception e) { + logger.error(e.getMessage(),e); + putMsg(result,Status.HDFS_OPERATION_ERROR); } - - } catch (Exception e) { - logger.error(e.getMessage(),e); - putMsg(result,Status.HDFS_OPERATION_ERROR); + }else{ + putMsg(result,Status.TENANT_NOT_EXIST); } } diff --git a/escheduler-api/src/test/java/cn/escheduler/api/controller/ProcessDefinitionControllerTest.java b/escheduler-api/src/test/java/cn/escheduler/api/controller/ProcessDefinitionControllerTest.java index eaec048ff6..bbd61afbec 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/controller/ProcessDefinitionControllerTest.java +++ b/escheduler-api/src/test/java/cn/escheduler/api/controller/ProcessDefinitionControllerTest.java @@ -20,22 +20,13 @@ import cn.escheduler.api.enums.Status; import cn.escheduler.api.utils.Result; import cn.escheduler.common.utils.JSONUtils; import org.junit.Assert; -import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; -import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.MediaType; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import org.springframework.web.context.WebApplicationContext; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; @@ -44,7 +35,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. /** * process definition controller test */ -@Ignore public class ProcessDefinitionControllerTest extends AbstractControllerTest{ private static Logger logger = LoggerFactory.getLogger(ProcessDefinitionControllerTest.class); @@ -69,7 +59,7 @@ public class ProcessDefinitionControllerTest extends AbstractControllerTest{ .andReturn(); Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class); - Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue()); + Assert.assertEquals(Status.PROJECT_NOT_FOUNT.getCode(),result.getCode().intValue()); logger.info(mvcResult.getResponse().getContentAsString()); } } \ No newline at end of file diff --git a/escheduler-api/src/test/java/cn/escheduler/api/controller/ProcessInstanceControllerTest.java b/escheduler-api/src/test/java/cn/escheduler/api/controller/ProcessInstanceControllerTest.java index 6681f94f44..b3a2ea8c4a 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/controller/ProcessInstanceControllerTest.java +++ b/escheduler-api/src/test/java/cn/escheduler/api/controller/ProcessInstanceControllerTest.java @@ -20,55 +20,35 @@ import cn.escheduler.api.enums.Status; import cn.escheduler.api.utils.Result; import cn.escheduler.common.utils.JSONUtils; import org.junit.Assert; -import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; -import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.MediaType; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.web.context.WebApplicationContext; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -@Ignore -@RunWith(SpringRunner.class) -@SpringBootTest -public class ProcessInstanceControllerTest { +/** + * process instance controller test + */ +public class ProcessInstanceControllerTest extends AbstractControllerTest { private static Logger logger = LoggerFactory.getLogger(ProcessInstanceControllerTest.class); - private MockMvc mockMvc; - - @Autowired - private WebApplicationContext webApplicationContext; - @Before - public void setUp() { - mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build(); - } @Test public void queryTaskListByProcessId() throws Exception { MvcResult mvcResult = mockMvc.perform(get("/projects/{projectName}/instance/task-list-by-process-id","project_test1") - .header("sessionId", "08fae8bf-fe2d-4fc0-8129-23c37fbfac82") - .param("processInstanceId","1370")) + .header(SESSION_ID, sessionId) + .param("processInstanceId","-1")) .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8)) .andReturn(); Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class); - Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue()); + Assert.assertEquals(Status.PROJECT_NOT_FOUNT,result.getCode().intValue()); logger.info(mvcResult.getResponse().getContentAsString()); - - - } } \ No newline at end of file diff --git a/escheduler-api/src/test/java/cn/escheduler/api/controller/ProjectControllerTest.java b/escheduler-api/src/test/java/cn/escheduler/api/controller/ProjectControllerTest.java index 8a122ab035..7deda2fafa 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/controller/ProjectControllerTest.java +++ b/escheduler-api/src/test/java/cn/escheduler/api/controller/ProjectControllerTest.java @@ -20,22 +20,13 @@ import cn.escheduler.api.enums.Status; import cn.escheduler.api.utils.Result; import cn.escheduler.common.utils.JSONUtils; import org.junit.Assert; -import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; -import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.MediaType; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import org.springframework.web.context.WebApplicationContext; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; @@ -47,15 +38,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. public class ProjectControllerTest extends AbstractControllerTest{ private static Logger logger = LoggerFactory.getLogger(ProcessInstanceControllerTest.class); - private MockMvc mockMvc; - @Autowired - private WebApplicationContext webApplicationContext; - - @Before - public void setUp() { - mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build(); - } @Test public void createProject() throws Exception { @@ -64,7 +47,7 @@ public class ProjectControllerTest extends AbstractControllerTest{ paramsMap.add("desc","the test project"); MvcResult mvcResult = mockMvc.perform(post("/projects/create") - .header("sessionId", "08fae8bf-fe2d-4fc0-8129-23c37fbfac82") + .header(SESSION_ID, sessionId) .params(paramsMap)) .andExpect(status().isCreated()) .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8)) diff --git a/escheduler-api/src/test/java/cn/escheduler/api/controller/QueueControllerTest.java b/escheduler-api/src/test/java/cn/escheduler/api/controller/QueueControllerTest.java index b2e9e304b2..28e01ee51a 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/controller/QueueControllerTest.java +++ b/escheduler-api/src/test/java/cn/escheduler/api/controller/QueueControllerTest.java @@ -20,48 +20,31 @@ import cn.escheduler.api.enums.Status; import cn.escheduler.api.utils.Result; import cn.escheduler.common.utils.JSONUtils; import org.junit.Assert; -import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; -import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.MediaType; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import org.springframework.web.context.WebApplicationContext; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -@Ignore -@RunWith(SpringRunner.class) -@SpringBootTest -public class QueueControllerTest { - private static Logger logger = LoggerFactory.getLogger(QueueControllerTest.class); - - private MockMvc mockMvc; +/** + * queue controller test + */ +public class QueueControllerTest extends AbstractControllerTest{ - @Autowired - private WebApplicationContext webApplicationContext; + private static Logger logger = LoggerFactory.getLogger(QueueControllerTest.class); - @Before - public void setUp() { - mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build(); - } @Test public void queryList() throws Exception { MvcResult mvcResult = mockMvc.perform(get("/queue/list") - .header("sessionId", "d199af92-d8e0-4f1b-bacb-5b3414567e5c")) + .header(SESSION_ID, sessionId)) .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8)) .andReturn(); @@ -81,7 +64,7 @@ public class QueueControllerTest { paramsMap.add("pageSize","20"); MvcResult mvcResult = mockMvc.perform(get("/queue/list-paging") - .header("sessionId", "d4541e0d-0349-4f05-9c68-300176cd3c91") + .header(SESSION_ID, sessionId) .params(paramsMap)) .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8)) @@ -95,18 +78,20 @@ public class QueueControllerTest { public void createQueue() throws Exception { MultiValueMap paramsMap = new LinkedMultiValueMap<>(); - paramsMap.add("queue","ait111134"); - paramsMap.add("queueName","aitName1"); + paramsMap.add("queue","ait"); + paramsMap.add("queueName","ait"); MvcResult mvcResult = mockMvc.perform(post("/queue/create") - .header("sessionId", "d4541e0d-0349-4f05-9c68-300176cd3c91") + .header(SESSION_ID, sessionId) .params(paramsMap)) .andExpect(status().isCreated()) .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8)) .andReturn(); Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class); - //Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue()); +// Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue()); logger.info(mvcResult.getResponse().getContentAsString()); + + } @Test @@ -118,7 +103,7 @@ public class QueueControllerTest { paramsMap.add("queueName","aitName"); MvcResult mvcResult = mockMvc.perform(post("/queue/update") - .header("sessionId", "d4541e0d-0349-4f05-9c68-300176cd3c91") + .header(SESSION_ID, sessionId) .params(paramsMap)) .andExpect(status().isCreated()) .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8)) @@ -136,7 +121,7 @@ public class QueueControllerTest { paramsMap.add("queueName","aitName"); MvcResult mvcResult = mockMvc.perform(post("/queue/verify-queue") - .header("sessionId", "d4541e0d-0349-4f05-9c68-300176cd3c91") + .header(SESSION_ID, sessionId) .params(paramsMap)) .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8)) diff --git a/escheduler-api/src/test/java/cn/escheduler/api/controller/ResourcesControllerTest.java b/escheduler-api/src/test/java/cn/escheduler/api/controller/ResourcesControllerTest.java index e0e8c2fa41..b1daf8132f 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/controller/ResourcesControllerTest.java +++ b/escheduler-api/src/test/java/cn/escheduler/api/controller/ResourcesControllerTest.java @@ -22,47 +22,29 @@ import cn.escheduler.common.enums.ResourceType; import cn.escheduler.common.utils.JSONUtils; import com.alibaba.fastjson.JSONObject; import org.junit.Assert; -import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; -import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.MediaType; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import org.springframework.web.context.WebApplicationContext; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -@Ignore -@RunWith(SpringRunner.class) -@SpringBootTest -public class ResourcesControllerTest { +/** + * resources controller test + */ +public class ResourcesControllerTest extends AbstractControllerTest{ private static Logger logger = LoggerFactory.getLogger(ResourcesControllerTest.class); - private MockMvc mockMvc; - - @Autowired - private WebApplicationContext webApplicationContext; - - @Before - public void setUp() { - mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build(); - } @Test public void querytResourceList() throws Exception { MvcResult mvcResult = mockMvc.perform(get("/resources/list") - .header("sessionId", "08fae8bf-fe2d-4fc0-8129-23c37fbfac82") + .header(SESSION_ID, sessionId) .param("type", ResourceType.FILE.name())) .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8)) @@ -84,7 +66,7 @@ public class ResourcesControllerTest { paramsMap.add("type","FILE"); MvcResult mvcResult = mockMvc.perform(get("/resources/verify-name") - .header("sessionId", "c24ed9d9-1c20-48a0-bd9c-5cfca14a4dcb") + .header(SESSION_ID, sessionId) .params(paramsMap)) .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8)) @@ -92,7 +74,7 @@ public class ResourcesControllerTest { Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class); - Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue()); + Assert.assertEquals(Status.TENANT_NOT_EXIST.getCode(),result.getCode().intValue()); logger.info(mvcResult.getResponse().getContentAsString()); } } \ No newline at end of file diff --git a/escheduler-api/src/test/java/cn/escheduler/api/controller/SchedulerControllerTest.java b/escheduler-api/src/test/java/cn/escheduler/api/controller/SchedulerControllerTest.java index 6d5d47ffd2..71f63acdb5 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/controller/SchedulerControllerTest.java +++ b/escheduler-api/src/test/java/cn/escheduler/api/controller/SchedulerControllerTest.java @@ -20,44 +20,26 @@ import cn.escheduler.api.enums.Status; import cn.escheduler.api.utils.Result; import cn.escheduler.common.utils.JSONUtils; import org.junit.Assert; -import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; -import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.MediaType; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.web.context.WebApplicationContext; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -@Ignore -@RunWith(SpringRunner.class) -@SpringBootTest -public class SchedulerControllerTest { +/** + * scheduler controller test + */ +public class SchedulerControllerTest extends AbstractControllerTest{ private static Logger logger = LoggerFactory.getLogger(SchedulerControllerTest.class); - private MockMvc mockMvc; - - @Autowired - private WebApplicationContext webApplicationContext; - - @Before - public void setUp() { - mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build(); - } @Test public void queryScheduleList() throws Exception { MvcResult mvcResult = mockMvc.perform(post("/projects/{projectName}/schedule/list","project_test1") - .header("sessionId", "08fae8bf-fe2d-4fc0-8129-23c37fbfac82")) + .header(SESSION_ID, sessionId)) .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8)) .andReturn(); @@ -66,10 +48,12 @@ public class SchedulerControllerTest { Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue()); logger.info(mvcResult.getResponse().getContentAsString()); } + + @Test public void previewSchedule() throws Exception { MvcResult mvcResult = mockMvc.perform(post("/projects/{projectName}/schedule/preview","li_test_1") - .header("sessionId", "c24ed9d9-1c20-48a0-bd9c-5cfca14a4dcb") + .header(SESSION_ID, sessionId) .param("schedule","{'startTime':'2019-06-10 00:00:00','endTime':'2019-06-13 00:00:00','crontab':'0 0 3/6 * * ? *'}")) .andExpect(status().isCreated()) .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8)) diff --git a/escheduler-api/src/test/java/cn/escheduler/api/controller/TaskInstanceControllerTest.java b/escheduler-api/src/test/java/cn/escheduler/api/controller/TaskInstanceControllerTest.java index 29ce766e8f..96db23d061 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/controller/TaskInstanceControllerTest.java +++ b/escheduler-api/src/test/java/cn/escheduler/api/controller/TaskInstanceControllerTest.java @@ -20,42 +20,24 @@ import cn.escheduler.api.enums.Status; import cn.escheduler.api.utils.Result; import cn.escheduler.common.utils.JSONUtils; import org.junit.Assert; -import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; -import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.MediaType; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import org.springframework.web.context.WebApplicationContext; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -@Ignore -@RunWith(SpringRunner.class) -@SpringBootTest -public class TaskInstanceControllerTest { +/** + * task instance controller test + */ +public class TaskInstanceControllerTest extends AbstractControllerTest{ private static Logger logger = LoggerFactory.getLogger(SchedulerControllerTest.class); - private MockMvc mockMvc; - - @Autowired - private WebApplicationContext webApplicationContext; - - @Before - public void setUp() { - mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build(); - } @Test public void queryTaskListPaging() throws Exception { @@ -70,7 +52,7 @@ public class TaskInstanceControllerTest { paramsMap.add("pageSize","20"); MvcResult mvcResult = mockMvc.perform(get("/projects/{projectName}/task-instance/list-paging","project_test1") - .header("sessionId", "08fae8bf-fe2d-4fc0-8129-23c37fbfac82") + .header(SESSION_ID, sessionId) .params(paramsMap)) .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8)) diff --git a/escheduler-api/src/test/java/cn/escheduler/api/controller/TenantControllerTest.java b/escheduler-api/src/test/java/cn/escheduler/api/controller/TenantControllerTest.java index 9001ae6d0b..b4cb7db901 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/controller/TenantControllerTest.java +++ b/escheduler-api/src/test/java/cn/escheduler/api/controller/TenantControllerTest.java @@ -20,50 +20,33 @@ import cn.escheduler.api.enums.Status; import cn.escheduler.api.utils.Result; import cn.escheduler.common.utils.JSONUtils; import org.junit.Assert; -import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; -import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.MediaType; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.web.context.WebApplicationContext; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -@Ignore -@RunWith(SpringRunner.class) -@SpringBootTest -public class TenantControllerTest { +/** + * tenant controller test + */ +public class TenantControllerTest extends AbstractControllerTest{ private static Logger logger = LoggerFactory.getLogger(DataAnalysisControllerTest.class); - private MockMvc mockMvc; - - @Autowired - private WebApplicationContext webApplicationContext; - - @Before - public void setUp() { - mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build(); - } @Test public void countTaskState() throws Exception { MvcResult mvcResult = mockMvc.perform(get("/tenant/list") - .header("sessionId", "d199af92-d8e0-4f1b-bacb-5b3414567e5c")) + .header(SESSION_ID, sessionId)) .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8)) .andReturn(); + Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class); Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue()); logger.info(mvcResult.getResponse().getContentAsString()); diff --git a/escheduler-api/src/test/java/cn/escheduler/api/controller/UsersControllerTest.java b/escheduler-api/src/test/java/cn/escheduler/api/controller/UsersControllerTest.java index d9ab22cc79..8425ccbd43 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/controller/UsersControllerTest.java +++ b/escheduler-api/src/test/java/cn/escheduler/api/controller/UsersControllerTest.java @@ -20,45 +20,28 @@ import cn.escheduler.api.enums.Status; import cn.escheduler.api.utils.Result; import cn.escheduler.common.utils.JSONUtils; import org.junit.Assert; -import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; -import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.MediaType; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.web.context.WebApplicationContext; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -@Ignore -@RunWith(SpringRunner.class) -@SpringBootTest -public class UsersControllerTest { +/** + * users controller test + */ +public class UsersControllerTest extends AbstractControllerTest{ private static Logger logger = LoggerFactory.getLogger(QueueControllerTest.class); - private MockMvc mockMvc; - - @Autowired - private WebApplicationContext webApplicationContext; - @Before - public void setUp() { - mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build(); - } @Test public void queryList() throws Exception { MvcResult mvcResult = mockMvc.perform(get("/users/list") - .header("sessionId", "d199af92-d8e0-4f1b-bacb-5b3414567e5c")) + .header(SESSION_ID, sessionId)) .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8)) .andReturn(); diff --git a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/WorkerGroupMapperTest.java b/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/WorkerGroupMapperTest.java index 4ea4173097..fa4bdeae20 100644 --- a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/WorkerGroupMapperTest.java +++ b/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/WorkerGroupMapperTest.java @@ -20,7 +20,6 @@ import cn.escheduler.dao.datasource.ConnectionFactory; import cn.escheduler.dao.model.WorkerGroup; import org.junit.Assert; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import java.util.Date; @@ -29,7 +28,6 @@ import java.util.List; /** * worker group mapper test */ -@Ignore public class WorkerGroupMapperTest { WorkerGroupMapper workerGroupMapper;