From baa8f30c2b77c6e9ac9efe30409fd7708013ec37 Mon Sep 17 00:00:00 2001 From: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com> Date: Tue, 7 Sep 2021 21:21:05 +0800 Subject: [PATCH] [Feature-5498][JsonSplit-api] fix some ut (#6121) * fix some ut * fix some ut * fix some ut Co-authored-by: JinyLeeChina <297062848@qq.com> --- .../api/controller/SchedulerController.java | 11 ++++------- .../api/controller/QueueControllerTest.java | 3 ++- .../api/controller/SchedulerControllerTest.java | 9 +++++---- .../api/controller/TenantControllerTest.java | 5 +++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java index 1f3a60f034..3b40fd64c2 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java @@ -222,9 +222,8 @@ public class SchedulerController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "processDefinitionId", value = "PROCESS_DEFINITION_ID", required = true, dataType = "Int", example = "100"), @ApiImplicitParam(name = "searchVal", value = "SEARCH_VAL", type = "String"), - @ApiImplicitParam(name = "pageNo", value = "PAGE_NO", dataType = "Int", example = "100"), - @ApiImplicitParam(name = "pageSize", value = "PAGE_SIZE", dataType = "Int", example = "100") - + @ApiImplicitParam(name = "pageNo", value = "PAGE_NO", dataType = "Int", example = "1"), + @ApiImplicitParam(name = "pageSize", value = "PAGE_SIZE", dataType = "Int", example = "20") }) @GetMapping() @ApiException(QUERY_SCHEDULE_LIST_PAGING_ERROR) @@ -263,8 +262,7 @@ public class SchedulerController extends BaseController { @AccessLogAnnotation(ignoreRequestArgs = "loginUser") public Result deleteScheduleById(@RequestAttribute(value = SESSION_USER) User loginUser, @ApiParam(name = "projectCode", value = "PROJECT_CODE", required = true) @PathVariable long projectCode, - @RequestParam("id") Integer id - ) { + @PathVariable("id") Integer id) { Map result = schedulerService.deleteScheduleById(loginUser, projectCode, id); return returnDataList(result); } @@ -302,8 +300,7 @@ public class SchedulerController extends BaseController { @ApiException(PREVIEW_SCHEDULE_ERROR) @AccessLogAnnotation(ignoreRequestArgs = "loginUser") public Result previewSchedule(@ApiIgnore @RequestAttribute(value = SESSION_USER) User loginUser, - @RequestParam(value = "schedule") String schedule - ) { + @RequestParam(value = "schedule") String schedule) { Map result = schedulerService.previewSchedule(loginUser, schedule); return returnDataList(result); } diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/QueueControllerTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/QueueControllerTest.java index 9a051b749f..a324dc77ec 100644 --- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/QueueControllerTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/QueueControllerTest.java @@ -19,6 +19,7 @@ package org.apache.dolphinscheduler.api.controller; 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.request.MockMvcRequestBuilders.put; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -104,7 +105,7 @@ public class QueueControllerTest extends AbstractControllerTest { paramsMap.add("queue","queue2"); paramsMap.add("queueName","root.queue2"); - MvcResult mvcResult = mockMvc.perform(post("/queues/{id}") + MvcResult mvcResult = mockMvc.perform(put("/queues/{id}", 1) .header(SESSION_ID, sessionId) .params(paramsMap)) .andExpect(status().isCreated()) diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/SchedulerControllerTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/SchedulerControllerTest.java index 03ab838b06..39a75a79e9 100644 --- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/SchedulerControllerTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/SchedulerControllerTest.java @@ -21,6 +21,7 @@ import static org.mockito.ArgumentMatchers.isA; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; 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.request.MockMvcRequestBuilders.put; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -103,7 +104,7 @@ public class SchedulerControllerTest extends AbstractControllerTest { isA(String.class), isA(WarningType.class), isA(Integer.class), isA(FailureStrategy.class), isA(Priority.class), isA(String.class))).thenReturn(success()); - MvcResult mvcResult = mockMvc.perform(post("/projects/{projectCode}/schedules/{id}",123) + MvcResult mvcResult = mockMvc.perform(put("/projects/{projectCode}/schedules/{id}",123, 37) .header(SESSION_ID, sessionId) .params(paramsMap)) .andExpect(status().isOk()) @@ -123,7 +124,7 @@ public class SchedulerControllerTest extends AbstractControllerTest { Mockito.when(schedulerService.setScheduleState(isA(User.class), isA(Long.class), isA(Integer.class), isA(ReleaseState.class))).thenReturn(success()); - MvcResult mvcResult = mockMvc.perform(post("/projects/{projectCode}/schedules/{id}/online",123) + MvcResult mvcResult = mockMvc.perform(post("/projects/{projectCode}/schedules/{id}/online",123, 37) .header(SESSION_ID, sessionId) .params(paramsMap)) .andExpect(status().isOk()) @@ -143,7 +144,7 @@ public class SchedulerControllerTest extends AbstractControllerTest { Mockito.when(schedulerService.setScheduleState(isA(User.class), isA(Long.class), isA(Integer.class), isA(ReleaseState.class))).thenReturn(success()); - MvcResult mvcResult = mockMvc.perform(post("/projects/{projectCode}/schedules/{id}/offline",123) + MvcResult mvcResult = mockMvc.perform(post("/projects/{projectCode}/schedules/{id}/offline",123, 28) .header(SESSION_ID, sessionId) .params(paramsMap)) .andExpect(status().isOk()) @@ -221,7 +222,7 @@ public class SchedulerControllerTest extends AbstractControllerTest { Mockito.when(schedulerService.deleteScheduleById(isA(User.class), isA(Long.class), isA(Integer.class))) .thenReturn(success()); - MvcResult mvcResult = mockMvc.perform(delete("/projects/{projectCode}/schedules/{id}",123) + MvcResult mvcResult = mockMvc.perform(delete("/projects/{projectCode}/schedules/{id}",123, 37) .header(SESSION_ID, sessionId) .params(paramsMap)) .andExpect(status().isOk()) diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/TenantControllerTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/TenantControllerTest.java index 4111ca9a98..14cd52fbe1 100644 --- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/TenantControllerTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/TenantControllerTest.java @@ -20,6 +20,7 @@ package org.apache.dolphinscheduler.api.controller; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; 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.request.MockMvcRequestBuilders.put; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -90,7 +91,7 @@ public class TenantControllerTest extends AbstractControllerTest { paramsMap.add("queueId","1"); paramsMap.add("description","tenant description"); - MvcResult mvcResult = mockMvc.perform(post("/tenants/{id}") + MvcResult mvcResult = mockMvc.perform(put("/tenants/{id}", 9) .header(SESSION_ID, sessionId) .params(paramsMap)) .andExpect(status().isOk()) @@ -159,7 +160,7 @@ public class TenantControllerTest extends AbstractControllerTest { MultiValueMap paramsMap = new LinkedMultiValueMap<>(); paramsMap.add("id","64"); - MvcResult mvcResult = mockMvc.perform(delete("/tenants/{id}") + MvcResult mvcResult = mockMvc.perform(delete("/tenants/{id}", 64) .header(SESSION_ID, sessionId) .params(paramsMap)) .andExpect(status().isOk())