You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by GitBox <gi...@apache.org> on 2022/10/09 02:10:49 UTC
[GitHub] [dolphinscheduler] github-code-scanning[bot] commented on a diff in pull request #12264: [Fix-#11669][Workflow Instance Page] Fix the duration in Workflow Instance page.
github-code-scanning[bot] commented on code in PR #12264:
URL: https://github.com/apache/dolphinscheduler/pull/12264#discussion_r990719979
##########
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java:
##########
@@ -570,11 +615,61 @@
Project project = getProject(projectCode);
Map<String, Object> result = new HashMap<>();
putMsg(result, Status.PROJECT_NOT_FOUND, projectCode);
- // process instance null
- putMsg(result, Status.SUCCESS, projectCode);
+
+ // project auth fail
when(projectMapper.queryByCode(projectCode)).thenReturn(project);
when(projectService.checkProjectAndAuth(loginUser, project, projectCode, INSTANCE_DELETE)).thenReturn(result);
- when(processService.findProcessInstanceDetailById(1)).thenReturn(null);
+ Map<String, Object> projectAuthFailRes =
+ processInstanceService.deleteProcessInstanceById(loginUser, projectCode, 1);
+ Assert.assertEquals(Status.PROJECT_NOT_FOUND, projectAuthFailRes.get(Constants.STATUS));
+
+ // not sub process
+ ProcessInstance processInstance = getProcessInstance();
+ processInstance.setIsSubProcess(Flag.NO);
+ processInstance.setState(WorkflowExecutionStatus.RUNNING_EXECUTION);
+ putMsg(result, Status.SUCCESS, projectCode);
+ when(processService.findProcessInstanceDetailById(1)).thenReturn(Optional.ofNullable(processInstance));
+ try {
+ Map<String, Object> processNotFinished =
+ processInstanceService.deleteProcessInstanceById(loginUser, projectCode, 1);
Review Comment:
## Unread local variable
Variable 'Map<String,Object> processNotFinished' is never read.
[Show more details](https://github.com/apache/dolphinscheduler/security/code-scanning/1608)
##########
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java:
##########
@@ -570,11 +615,61 @@
Project project = getProject(projectCode);
Map<String, Object> result = new HashMap<>();
putMsg(result, Status.PROJECT_NOT_FOUND, projectCode);
- // process instance null
- putMsg(result, Status.SUCCESS, projectCode);
+
+ // project auth fail
when(projectMapper.queryByCode(projectCode)).thenReturn(project);
when(projectService.checkProjectAndAuth(loginUser, project, projectCode, INSTANCE_DELETE)).thenReturn(result);
- when(processService.findProcessInstanceDetailById(1)).thenReturn(null);
+ Map<String, Object> projectAuthFailRes =
+ processInstanceService.deleteProcessInstanceById(loginUser, projectCode, 1);
+ Assert.assertEquals(Status.PROJECT_NOT_FOUND, projectAuthFailRes.get(Constants.STATUS));
+
+ // not sub process
+ ProcessInstance processInstance = getProcessInstance();
+ processInstance.setIsSubProcess(Flag.NO);
+ processInstance.setState(WorkflowExecutionStatus.RUNNING_EXECUTION);
+ putMsg(result, Status.SUCCESS, projectCode);
+ when(processService.findProcessInstanceDetailById(1)).thenReturn(Optional.ofNullable(processInstance));
+ try {
+ Map<String, Object> processNotFinished =
+ processInstanceService.deleteProcessInstanceById(loginUser, projectCode, 1);
+ Assert.fail();
+ } catch (ServiceException ex) {
+ Assert.assertEquals(Status.PROCESS_INSTANCE_STATE_OPERATION_ERROR.getCode(), ex.getCode());
+ }
+
+ processInstance.setState(WorkflowExecutionStatus.SUCCESS);
+ processInstance.setState(WorkflowExecutionStatus.SUCCESS);
+ processInstance.setTimeout(3000);
+ processInstance.setCommandType(CommandType.STOP);
+ processInstance.setProcessDefinitionCode(46L);
+ processInstance.setProcessDefinitionVersion(1);
+ ProcessDefinition processDefinition = getProcessDefinition();
+ processDefinition.setId(1);
+ processDefinition.setUserId(1);
+ processDefinition.setProjectCode(0L);
+ when(processDefineMapper.queryByCode(46L)).thenReturn(processDefinition);
+ try {
+ Map<String, Object> processNotExist =
+ processInstanceService.deleteProcessInstanceById(loginUser, projectCode, 1);
Review Comment:
## Unread local variable
Variable 'Map<String,Object> processNotExist' is never read.
[Show more details](https://github.com/apache/dolphinscheduler/security/code-scanning/1609)
##########
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java:
##########
@@ -570,11 +615,61 @@
Project project = getProject(projectCode);
Map<String, Object> result = new HashMap<>();
putMsg(result, Status.PROJECT_NOT_FOUND, projectCode);
- // process instance null
- putMsg(result, Status.SUCCESS, projectCode);
+
+ // project auth fail
when(projectMapper.queryByCode(projectCode)).thenReturn(project);
when(projectService.checkProjectAndAuth(loginUser, project, projectCode, INSTANCE_DELETE)).thenReturn(result);
- when(processService.findProcessInstanceDetailById(1)).thenReturn(null);
+ Map<String, Object> projectAuthFailRes =
+ processInstanceService.deleteProcessInstanceById(loginUser, projectCode, 1);
+ Assert.assertEquals(Status.PROJECT_NOT_FOUND, projectAuthFailRes.get(Constants.STATUS));
+
+ // not sub process
+ ProcessInstance processInstance = getProcessInstance();
+ processInstance.setIsSubProcess(Flag.NO);
+ processInstance.setState(WorkflowExecutionStatus.RUNNING_EXECUTION);
+ putMsg(result, Status.SUCCESS, projectCode);
+ when(processService.findProcessInstanceDetailById(1)).thenReturn(Optional.ofNullable(processInstance));
+ try {
+ Map<String, Object> processNotFinished =
+ processInstanceService.deleteProcessInstanceById(loginUser, projectCode, 1);
+ Assert.fail();
+ } catch (ServiceException ex) {
+ Assert.assertEquals(Status.PROCESS_INSTANCE_STATE_OPERATION_ERROR.getCode(), ex.getCode());
+ }
+
+ processInstance.setState(WorkflowExecutionStatus.SUCCESS);
+ processInstance.setState(WorkflowExecutionStatus.SUCCESS);
+ processInstance.setTimeout(3000);
+ processInstance.setCommandType(CommandType.STOP);
+ processInstance.setProcessDefinitionCode(46L);
+ processInstance.setProcessDefinitionVersion(1);
+ ProcessDefinition processDefinition = getProcessDefinition();
+ processDefinition.setId(1);
+ processDefinition.setUserId(1);
+ processDefinition.setProjectCode(0L);
+ when(processDefineMapper.queryByCode(46L)).thenReturn(processDefinition);
+ try {
+ Map<String, Object> processNotExist =
+ processInstanceService.deleteProcessInstanceById(loginUser, projectCode, 1);
+ Assert.fail();
+ } catch (ServiceException ex) {
+ Assert.assertEquals(Status.PROCESS_INSTANCE_NOT_EXIST.getCode(), ex.getCode());
+ }
+
+ processDefinition.setProjectCode(projectCode);
+ when(processService.deleteWorkProcessInstanceById(1)).thenReturn(1);
+ Map<String, Object> successRes =
+ processInstanceService.deleteProcessInstanceById(loginUser, projectCode, 1);
+ Assert.assertEquals(Status.SUCCESS, successRes.get(Constants.STATUS));
+
+ when(processService.deleteWorkProcessInstanceById(1)).thenReturn(0);
+ try {
+ Map<String, Object> deleteFailed =
+ processInstanceService.deleteProcessInstanceById(loginUser, projectCode, 1);
Review Comment:
## Unread local variable
Variable 'Map<String,Object> deleteFailed' is never read.
[Show more details](https://github.com/apache/dolphinscheduler/security/code-scanning/1610)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@dolphinscheduler.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org