github-code-scanning[bot] commented on code in PR #11912:
URL: https://github.com/apache/dolphinscheduler/pull/11912#discussion_r971494379
##########
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java:
##########
@@ -226,359 +252,329 @@
Mockito.eq(project.getCode()))).thenReturn(pageListingResult);
PageInfo<ProcessDefinition> pageInfo =
processDefinitionService.queryProcessDefinitionListPaging(
- loginUser, project.getCode(), "", "", 1, 0, 10);
+ user, project.getCode(), "", "", 1, 0, 10);
Assert.assertNotNull(pageInfo);
}
@Test
public void testQueryProcessDefinitionByCode() {
- long projectCode = 1L;
Mockito.when(projectMapper.queryByCode(projectCode)).thenReturn(getProject(projectCode));
Project project = getProject(projectCode);
- User loginUser = new User();
- loginUser.setId(-1);
- loginUser.setUserType(UserType.GENERAL_USER);
Tenant tenant = new Tenant();
tenant.setId(1);
tenant.setTenantCode("root");
Map<String, Object> result = new HashMap<>();
putMsg(result, Status.PROJECT_NOT_FOUND, projectCode);
// project check auth fail
- Mockito.when(projectService.checkProjectAndAuth(loginUser, project,
projectCode, WORKFLOW_DEFINITION))
+ Mockito.when(projectService.checkProjectAndAuth(user, project,
projectCode, WORKFLOW_DEFINITION))
.thenReturn(result);
- Map<String, Object> map =
processDefinitionService.queryProcessDefinitionByCode(loginUser, 1L, 1L);
+ Map<String, Object> map =
processDefinitionService.queryProcessDefinitionByCode(user, 1L, 1L);
Assert.assertEquals(Status.PROJECT_NOT_FOUND,
map.get(Constants.STATUS));
// project check auth success, instance not exist
putMsg(result, Status.SUCCESS, projectCode);
- Mockito.when(projectService.checkProjectAndAuth(loginUser, project,
projectCode, WORKFLOW_DEFINITION))
+ Mockito.when(projectService.checkProjectAndAuth(user, project,
projectCode, WORKFLOW_DEFINITION))
.thenReturn(result);
DagData dagData = new DagData(getProcessDefinition(), null, null);
Mockito.when(processService.genDagData(Mockito.any())).thenReturn(dagData);
Map<String, Object> instanceNotexitRes =
-
processDefinitionService.queryProcessDefinitionByCode(loginUser, projectCode,
1L);
+ processDefinitionService.queryProcessDefinitionByCode(user,
projectCode, 1L);
Assert.assertEquals(Status.PROCESS_DEFINE_NOT_EXIST,
instanceNotexitRes.get(Constants.STATUS));
// instance exit
-
Mockito.when(processDefineMapper.queryByCode(46L)).thenReturn(getProcessDefinition());
+
Mockito.when(processDefinitionMapper.queryByCode(46L)).thenReturn(getProcessDefinition());
putMsg(result, Status.SUCCESS, projectCode);
- Mockito.when(projectService.checkProjectAndAuth(loginUser, project,
projectCode, WORKFLOW_DEFINITION))
+ Mockito.when(projectService.checkProjectAndAuth(user, project,
projectCode, WORKFLOW_DEFINITION))
.thenReturn(result);
Mockito.when(tenantMapper.queryById(1)).thenReturn(tenant);
Map<String, Object> successRes =
-
processDefinitionService.queryProcessDefinitionByCode(loginUser, projectCode,
46L);
+ processDefinitionService.queryProcessDefinitionByCode(user,
projectCode, 46L);
Assert.assertEquals(Status.SUCCESS, successRes.get(Constants.STATUS));
}
@Test
public void testQueryProcessDefinitionByName() {
- long projectCode = 1L;
Mockito.when(projectMapper.queryByCode(projectCode)).thenReturn(getProject(projectCode));
Project project = getProject(projectCode);
- User loginUser = new User();
- loginUser.setId(-1);
- loginUser.setUserType(UserType.GENERAL_USER);
-
Map<String, Object> result = new HashMap<>();
putMsg(result, Status.PROJECT_NOT_FOUND, projectCode);
// project check auth fail
- Mockito.when(projectService.checkProjectAndAuth(loginUser, project,
projectCode, WORKFLOW_DEFINITION))
+ Mockito.when(projectService.checkProjectAndAuth(user, project,
projectCode, WORKFLOW_DEFINITION))
.thenReturn(result);
Map<String, Object> map =
-
processDefinitionService.queryProcessDefinitionByName(loginUser, projectCode,
"test_def");
+ processDefinitionService.queryProcessDefinitionByName(user,
projectCode, "test_def");
Assert.assertEquals(Status.PROJECT_NOT_FOUND,
map.get(Constants.STATUS));
// project check auth success, instance not exist
putMsg(result, Status.SUCCESS, projectCode);
- Mockito.when(projectService.checkProjectAndAuth(loginUser, project,
projectCode, WORKFLOW_DEFINITION))
+ Mockito.when(projectService.checkProjectAndAuth(user, project,
projectCode, WORKFLOW_DEFINITION))
.thenReturn(result);
- Mockito.when(processDefineMapper.queryByDefineName(project.getCode(),
"test_def")).thenReturn(null);
+
Mockito.when(processDefinitionMapper.queryByDefineName(project.getCode(),
"test_def")).thenReturn(null);
Map<String, Object> instanceNotExitRes =
-
processDefinitionService.queryProcessDefinitionByName(loginUser, projectCode,
"test_def");
+ processDefinitionService.queryProcessDefinitionByName(user,
projectCode, "test_def");
Assert.assertEquals(Status.PROCESS_DEFINE_NOT_EXIST,
instanceNotExitRes.get(Constants.STATUS));
// instance exit
- Mockito.when(processDefineMapper.queryByDefineName(project.getCode(),
"test"))
+
Mockito.when(processDefinitionMapper.queryByDefineName(project.getCode(),
"test"))
.thenReturn(getProcessDefinition());
putMsg(result, Status.SUCCESS, projectCode);
- Mockito.when(projectService.checkProjectAndAuth(loginUser, project,
projectCode, WORKFLOW_DEFINITION))
+ Mockito.when(projectService.checkProjectAndAuth(user, project,
projectCode, WORKFLOW_DEFINITION))
.thenReturn(result);
Map<String, Object> successRes =
-
processDefinitionService.queryProcessDefinitionByName(loginUser, projectCode,
"test");
+ processDefinitionService.queryProcessDefinitionByName(user,
projectCode, "test");
Assert.assertEquals(Status.SUCCESS, successRes.get(Constants.STATUS));
}
@Test
public void testBatchCopyProcessDefinition() {
- long projectCode = 1L;
Project project = getProject(projectCode);
- User loginUser = new User();
- loginUser.setId(1);
- loginUser.setUserType(UserType.GENERAL_USER);
+
Mockito.when(projectMapper.queryByCode(projectCode)).thenReturn(getProject(projectCode));
Map<String, Object> result = new HashMap<>();
putMsg(result, Status.SUCCESS, projectCode);
- Mockito.when(projectService.checkProjectAndAuth(loginUser, project,
projectCode, WORKFLOW_BATCH_COPY))
+ Mockito.when(projectService.checkProjectAndAuth(user, project,
projectCode, WORKFLOW_BATCH_COPY))
.thenReturn(result);
// copy project definition ids empty test
Map<String, Object> map =
- processDefinitionService.batchCopyProcessDefinition(loginUser,
projectCode, StringUtils.EMPTY, 2L);
+ processDefinitionService.batchCopyProcessDefinition(user,
projectCode, StringUtils.EMPTY, 2L);
Assert.assertEquals(Status.PROCESS_DEFINITION_CODES_IS_EMPTY,
map.get(Constants.STATUS));
// project check auth fail
putMsg(result, Status.PROJECT_NOT_FOUND, projectCode);
- Mockito.when(projectService.checkProjectAndAuth(loginUser, project,
projectCode, WORKFLOW_BATCH_COPY))
+ Mockito.when(projectService.checkProjectAndAuth(user, project,
projectCode, WORKFLOW_BATCH_COPY))
.thenReturn(result);
Map<String, Object> map1 =
processDefinitionService.batchCopyProcessDefinition(
- loginUser, projectCode, String.valueOf(project.getId()), 2L);
+ user, projectCode, String.valueOf(project.getId()), 2L);
Assert.assertEquals(Status.PROJECT_NOT_FOUND,
map1.get(Constants.STATUS));
// project check auth success, target project name not equal project
name, check auth target project fail
- projectCode = 2L;
- Project project1 = getProject(projectCode);
-
Mockito.when(projectMapper.queryByCode(projectCode)).thenReturn(project1);
- Mockito.when(projectService.checkProjectAndAuth(loginUser, project,
projectCode, WORKFLOW_BATCH_COPY))
+ Project project1 = getProject(projectCodeOther);
+
Mockito.when(projectMapper.queryByCode(projectCodeOther)).thenReturn(project1);
+ Mockito.when(projectService.checkProjectAndAuth(user, project,
projectCodeOther, WORKFLOW_BATCH_COPY))
.thenReturn(result);
- putMsg(result, Status.SUCCESS, projectCode);
+ putMsg(result, Status.SUCCESS, projectCodeOther);
ProcessDefinition definition = getProcessDefinition();
List<ProcessDefinition> processDefinitionList = new ArrayList<>();
processDefinitionList.add(definition);
Set<Long> definitionCodes =
Arrays.stream("46".split(Constants.COMMA)).map(Long::parseLong).collect(Collectors.toSet());
-
Mockito.when(processDefineMapper.queryByCodes(definitionCodes)).thenReturn(processDefinitionList);
- Mockito.when(processService.saveProcessDefine(loginUser, definition,
Boolean.TRUE, Boolean.TRUE)).thenReturn(2);
+
Mockito.when(processDefinitionMapper.queryByCodes(definitionCodes)).thenReturn(processDefinitionList);
+ Mockito.when(processService.saveProcessDefine(user, definition,
Boolean.TRUE, Boolean.TRUE)).thenReturn(2);
Map<String, Object> map3 =
processDefinitionService.batchCopyProcessDefinition(
- loginUser, projectCode, "46", 1L);
+ user, projectCodeOther, String.valueOf(processDefinitionCode),
projectCode);
Assert.assertEquals(Status.SUCCESS, map3.get(Constants.STATUS));
}
@Test
public void testBatchMoveProcessDefinition() {
- long projectCode = 1L;
Project project1 = getProject(projectCode);
Mockito.when(projectMapper.queryByCode(projectCode)).thenReturn(project1);
- long projectCode2 = 2L;
- Project project2 = getProject(projectCode2);
-
Mockito.when(projectMapper.queryByCode(projectCode2)).thenReturn(project2);
-
- User loginUser = new User();
- loginUser.setId(-1);
- loginUser.setUserType(UserType.GENERAL_USER);
+ Project project2 = getProject(projectCodeOther);
+
Mockito.when(projectMapper.queryByCode(projectCodeOther)).thenReturn(project2);
Map<String, Object> result = new HashMap<>();
putMsg(result, Status.SUCCESS, projectCode);
- Mockito.when(projectService.checkProjectAndAuth(loginUser, project1,
projectCode, TASK_DEFINITION_MOVE))
+ Mockito.when(projectService.checkProjectAndAuth(user, project1,
projectCode, TASK_DEFINITION_MOVE))
.thenReturn(result);
- Mockito.when(projectService.checkProjectAndAuth(loginUser, project2,
projectCode2, TASK_DEFINITION_MOVE))
+ Mockito.when(projectService.checkProjectAndAuth(user, project2,
projectCodeOther, TASK_DEFINITION_MOVE))
.thenReturn(result);
ProcessDefinition definition = getProcessDefinition();
definition.setVersion(1);
List<ProcessDefinition> processDefinitionList = new ArrayList<>();
processDefinitionList.add(definition);
- Set<Long> definitionCodes =
-
Arrays.stream("46".split(Constants.COMMA)).map(Long::parseLong).collect(Collectors.toSet());
-
Mockito.when(processDefineMapper.queryByCodes(definitionCodes)).thenReturn(processDefinitionList);
- Mockito.when(processService.saveProcessDefine(loginUser, definition,
Boolean.TRUE, Boolean.TRUE)).thenReturn(2);
- Mockito.when(processTaskRelationMapper.queryByProcessCode(projectCode,
46L))
+ Set<Long> definitionCodes =
Arrays.stream(String.valueOf(processDefinitionCode).split(Constants.COMMA))
+ .map(Long::parseLong).collect(Collectors.toSet());
Review Comment:
## Missing catch of NumberFormatException
Potential uncaught 'java.lang.NumberFormatException'.
[Show more
details](https://github.com/apache/dolphinscheduler/security/code-scanning/1271)
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
