diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java index 3cdd21f195..f1a0a66213 100644 --- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java @@ -383,8 +383,9 @@ public class ProcessDefinitionServiceTest extends BaseServiceTestTool { Mockito.when(projectMapper.queryByCode(projectCode)).thenReturn(getProject(projectCode)); Map 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 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(); diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Project.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Project.java index 962a9ba6d6..f3a626f5cd 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Project.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Project.java @@ -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; - } }