Unverified Commit 5fe31546 authored by zixi0825's avatar zixi0825 Committed by GitHub
Browse files

[Fix][all] fix spell error (#3289) 



* fix spell error

* test unit test

Co-authored-by: default avatarsunchaohe <sunzhaohe@linklogis.com>
parent 583a6155

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/TaskCountDto.java

+2 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ public class TaskCountDto { 
                case SUBMITTED_SUCCESS:

                    submittedSuccess += taskInstanceStateCount.getCount();

                    break;

                case RUNNING_EXEUTION:

                case RUNNING_EXECUTION:

                    runningExeution += taskInstanceStateCount.getCount();

                    break;

                case READY_PAUSE:
@@ -99,7 +99,7 @@ public class TaskCountDto { 
        }

        this.taskCountDtos = new ArrayList<>();

        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.SUBMITTED_SUCCESS, submittedSuccess));

        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.RUNNING_EXEUTION, runningExeution));

        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.RUNNING_EXECUTION, runningExeution));

        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.READY_PAUSE, readyPause));

        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.PAUSE, pause));

        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.READY_STOP, readyStop));

dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataAnalysisServiceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ public class DataAnalysisServiceTest { 


        List<ExecuteStatusCount> taskInstanceStateCounts = new ArrayList<>(1);

        ExecuteStatusCount executeStatusCount = new ExecuteStatusCount();

        executeStatusCount.setExecutionStatus(ExecutionStatus.RUNNING_EXEUTION);

        executeStatusCount.setExecutionStatus(ExecutionStatus.RUNNING_EXECUTION);

        taskInstanceStateCounts.add(executeStatusCount);



        return  taskInstanceStateCounts;

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

+2 −2
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ public class ProcessDefinitionServiceTest { 
        ProcessInstance processInstance = new ProcessInstance();

        processInstance.setId(1);

        processInstance.setName("test_instance");

        processInstance.setState(ExecutionStatus.RUNNING_EXEUTION);

        processInstance.setState(ExecutionStatus.RUNNING_EXECUTION);

        processInstance.setHost("192.168.xx.xx");

        processInstance.setStartTime(new Date());

        processInstance.setEndTime(new Date());
@@ -486,7 +486,7 @@ public class ProcessDefinitionServiceTest { 
        taskInstance.setTaskType("SHELL");

        taskInstance.setId(1);

        taskInstance.setName("test_task_instance");

        taskInstance.setState(ExecutionStatus.RUNNING_EXEUTION);

        taskInstance.setState(ExecutionStatus.RUNNING_EXECUTION);

        taskInstance.setHost("192.168.xx.xx");



        //task instance not exist

dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java

+2 −2
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ public class ProcessInstanceServiceTest { 


        //process instance not finish

        when(processService.findProcessInstanceDetailById(1)).thenReturn(processInstance);

        processInstance.setState(ExecutionStatus.RUNNING_EXEUTION);

        processInstance.setState(ExecutionStatus.RUNNING_EXECUTION);

        Map<String, Object> processInstanceNotFinishRes = processInstanceService.updateProcessInstance(loginUser, projectName, 1,

                shellJson, "2020-02-21 00:00:00", true, Flag.YES, "", "");

        Assert.assertEquals(Status.PROCESS_INSTANCE_STATE_OPERATION_ERROR, processInstanceNotFinishRes.get(Constants.STATUS));
@@ -414,7 +414,7 @@ public class ProcessInstanceServiceTest { 
        ProcessInstance processInstance = getProcessInstance();

        processInstance.setProcessInstanceJson(shellJson);

        TaskInstance taskInstance = getTaskInstance();

        taskInstance.setState(ExecutionStatus.RUNNING_EXEUTION);

        taskInstance.setState(ExecutionStatus.RUNNING_EXECUTION);

        taskInstance.setStartTime(new Date());

        when(processInstanceMapper.queryDetailById(1)).thenReturn(processInstance);

        when(taskInstanceMapper.queryByInstanceIdAndName(Mockito.anyInt(), Mockito.any())).thenReturn(taskInstance);

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java

+1 −1
Original line number Diff line number Diff line
@@ -831,7 +831,7 @@ public final class Constants { 


    public static final int[] NOT_TERMINATED_STATES = new int[]{

            ExecutionStatus.SUBMITTED_SUCCESS.ordinal(),

            ExecutionStatus.RUNNING_EXEUTION.ordinal(),

            ExecutionStatus.RUNNING_EXECUTION.ordinal(),

            ExecutionStatus.READY_PAUSE.ordinal(),

            ExecutionStatus.READY_STOP.ordinal(),

            ExecutionStatus.NEED_FAULT_TOLERANCE.ordinal(),