natas_hw
/
dolphinscheduler0701
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fix-14123] remove the equals and hashcode in Project pojo (#14167) 

* [fix] remove the equals and hashcode in Project pojo

* [fix]fix the Strict Problem in Mockito by using `doReturn()` instead of `when()` functionw

---------

Co-authored-by: xuankun zheng <zhxuankun@gmail.com>
This commit is contained in:
xuankun zheng 2023-06-13 11:19:04 +08:00 committed by GitHub
parent 1cd5070b5d
commit 61118d4467
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
View File

@ -383,8 +383,9 @@ public class ProcessDefinitionServiceTest extends BaseServiceTestTool {
Mockito.when(projectMapper.queryByCode(projectCode)).thenReturn(getProject(projectCode));
Map<String, Object> result = new HashMap<>();
putMsg(result, Status.SUCCESS, projectCode);
Mockito.when(projectService.checkProjectAndAuth(user, project, projectCode, WORKFLOW_BATCH_COPY))
.thenReturn(result);
Mockito.doReturn(result)
.when(projectService)
.checkProjectAndAuth(user, project, projectCode, WORKFLOW_BATCH_COPY);
// copy project definition ids empty test
Map<String, Object> map =
@ -402,8 +403,9 @@ public class ProcessDefinitionServiceTest extends BaseServiceTestTool {
// project check auth success, target project name not equal project name, check auth target project fail
Project project1 = getProject(projectCodeOther);
Mockito.when(projectMapper.queryByCode(projectCodeOther)).thenReturn(project1);
Mockito.when(projectService.checkProjectAndAuth(user, project, projectCodeOther, WORKFLOW_BATCH_COPY))
.thenReturn(result);
Mockito.doReturn(result)
.when(projectService)
.checkProjectAndAuth(user, project1, projectCodeOther, WORKFLOW_BATCH_COPY);
putMsg(result, Status.SUCCESS, projectCodeOther);
ProcessDefinition definition = getProcessDefinition();

25
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Project.java
View File

@ -96,29 +96,4 @@ public class Project {
*/
@TableField(exist = false)
private int instRunningCount;
@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
Project project = (Project) o;
if (id != project.id) {
return false;
}
return name.equals(project.name);
}
@Override
public int hashCode() {
int result = id;
result = 31 * result + name.hashCode();
return result;
}
}