@ -25,6 +25,7 @@ import org.apache.dolphinscheduler.api.ApiApplicationServer;
import org.apache.dolphinscheduler.api.enums.Status ;
import org.apache.dolphinscheduler.api.enums.Status ;
import org.apache.dolphinscheduler.api.service.impl.ProjectServiceImpl ;
import org.apache.dolphinscheduler.api.service.impl.ProjectServiceImpl ;
import org.apache.dolphinscheduler.api.service.impl.TaskInstanceServiceImpl ;
import org.apache.dolphinscheduler.api.service.impl.TaskInstanceServiceImpl ;
import org.apache.dolphinscheduler.api.utils.Result ;
import org.apache.dolphinscheduler.common.Constants ;
import org.apache.dolphinscheduler.common.Constants ;
import org.apache.dolphinscheduler.common.enums.ExecutionStatus ;
import org.apache.dolphinscheduler.common.enums.ExecutionStatus ;
import org.apache.dolphinscheduler.common.enums.UserType ;
import org.apache.dolphinscheduler.common.enums.UserType ;
@ -91,17 +92,17 @@ public class TaskInstanceServiceTest {
//project auth fail
//project auth fail
when ( projectMapper . queryByCode ( projectCode ) ) . thenReturn ( project ) ;
when ( projectMapper . queryByCode ( projectCode ) ) . thenReturn ( project ) ;
when ( projectService . checkProjectAndAuth ( loginUser , project , projectCode ) ) . thenReturn ( result ) ;
when ( projectService . checkProjectAndAuth ( loginUser , project , projectCode ) ) . thenReturn ( result ) ;
Map < String , Object > projectAuthFailRes = taskInstanceService . queryTaskListPaging ( loginUser , projectCode , 0 , "" , "" ,
Result projectAuthFailRes = taskInstanceService . queryTaskListPaging ( loginUser , projectCode , 0 , "" , "" ,
"test_user" , "2019-02-26 19:48:00" , "2019-02-26 19:48:22" , "" , null , "" , 1 , 20 ) ;
"test_user" , "2019-02-26 19:48:00" , "2019-02-26 19:48:22" , "" , null , "" , 1 , 20 ) ;
Assert . assertEquals ( Status . PROJECT_NOT_FOUNT , projectAuthFailRes . get ( Constants . STATUS ) ) ;
Assert . assertEquals ( Status . PROJECT_NOT_FOUNT . getCode ( ) , ( int ) projectAuthFailRes . getCode ( ) ) ;
// data parameter check
// data parameter check
putMsg ( result , Status . SUCCESS , projectCode ) ;
putMsg ( result , Status . SUCCESS , projectCode ) ;
when ( projectMapper . queryByCode ( projectCode ) ) . thenReturn ( project ) ;
when ( projectMapper . queryByCode ( projectCode ) ) . thenReturn ( project ) ;
when ( projectService . checkProjectAndAuth ( loginUser , project , projectCode ) ) . thenReturn ( result ) ;
when ( projectService . checkProjectAndAuth ( loginUser , project , projectCode ) ) . thenReturn ( result ) ;
Map < String , Object > dataParameterRes = taskInstanceService . queryTaskListPaging ( loginUser , projectCode , 1 , "" , "" ,
Result dataParameterRes = taskInstanceService . queryTaskListPaging ( loginUser , projectCode , 1 , "" , "" ,
"test_user" , "20200101 00:00:00" , "2020-01-02 00:00:00" , "" , ExecutionStatus . SUCCESS , "192.168.xx.xx" , 1 , 20 ) ;
"test_user" , "20200101 00:00:00" , "2020-01-02 00:00:00" , "" , ExecutionStatus . SUCCESS , "192.168.xx.xx" , 1 , 20 ) ;
Assert . assertEquals ( Status . REQUEST_PARAMS_NOT_VALID_ERROR , dataParameterRes . get ( Constants . STATUS ) ) ;
Assert . assertEquals ( Status . REQUEST_PARAMS_NOT_VALID_ERROR . getCode ( ) , ( int ) dataParameterRes . getCode ( ) ) ;
//project
//project
putMsg ( result , Status . SUCCESS , projectCode ) ;
putMsg ( result , Status . SUCCESS , projectCode ) ;
@ -122,40 +123,41 @@ public class TaskInstanceServiceTest {
when ( usersService . queryUser ( processInstance . getExecutorId ( ) ) ) . thenReturn ( loginUser ) ;
when ( usersService . queryUser ( processInstance . getExecutorId ( ) ) ) . thenReturn ( loginUser ) ;
when ( processService . findProcessInstanceDetailById ( taskInstance . getProcessInstanceId ( ) ) ) . thenReturn ( processInstance ) ;
when ( processService . findProcessInstanceDetailById ( taskInstance . getProcessInstanceId ( ) ) ) . thenReturn ( processInstance ) ;
Map < String , Object > successRes = taskInstanceService . queryTaskListPaging ( loginUser , projectCode , 1 , "" , "" ,
Result successRes = taskInstanceService . queryTaskListPaging ( loginUser , projectCode , 1 , "" , "" ,
"test_user" , "2020-01-01 00:00:00" , "2020-01-02 00:00:00" , "" , ExecutionStatus . SUCCESS , "192.168.xx.xx" , 1 , 20 ) ;
"test_user" , "2020-01-01 00:00:00" , "2020-01-02 00:00:00" , "" , ExecutionStatus . SUCCESS , "192.168.xx.xx" , 1 , 20 ) ;
Assert . assertEquals ( Status . SUCCESS , successRes . get ( Constants . STATUS ) ) ;
Assert . assertEquals ( Status . SUCCESS . getCode ( ) , ( int ) successRes . getCode ( ) ) ;
//executor name empty
//executor name empty
when ( taskInstanceMapper . queryTaskInstanceListPaging ( Mockito . any ( Page . class ) , eq ( project . getCode ( ) ) , eq ( 1 ) , eq ( "" ) , eq ( "" ) , eq ( "" ) ,
when ( taskInstanceMapper . queryTaskInstanceListPaging ( Mockito . any ( Page . class ) , eq ( project . getCode ( ) ) , eq ( 1 ) , eq ( "" ) , eq ( "" ) , eq ( "" ) ,
eq ( 0 ) , Mockito . any ( ) , eq ( "192.168.xx.xx" ) , eq ( start ) , eq ( end ) ) ) . thenReturn ( pageReturn ) ;
eq ( 0 ) , Mockito . any ( ) , eq ( "192.168.xx.xx" ) , eq ( start ) , eq ( end ) ) ) . thenReturn ( pageReturn ) ;
Map < String , Object > executorEmptyRes = taskInstanceService . queryTaskListPaging ( loginUser , projectCode , 1 , "" , "" ,
Result executorEmptyRes = taskInstanceService . queryTaskListPaging ( loginUser , projectCode , 1 , "" , "" ,
"" , "2020-01-01 00:00:00" , "2020-01-02 00:00:00" , "" , ExecutionStatus . SUCCESS , "192.168.xx.xx" , 1 , 20 ) ;
"" , "2020-01-01 00:00:00" , "2020-01-02 00:00:00" , "" , ExecutionStatus . SUCCESS , "192.168.xx.xx" , 1 , 20 ) ;
Assert . assertEquals ( Status . SUCCESS , executorEmptyRes . get ( Constants . STATUS ) ) ;
Assert . assertEquals ( Status . SUCCESS . getCode ( ) , ( int ) executorEmptyRes . getCode ( ) ) ;
//executor null
//executor null
when ( usersService . queryUser ( loginUser . getId ( ) ) ) . thenReturn ( null ) ;
when ( usersService . queryUser ( loginUser . getId ( ) ) ) . thenReturn ( null ) ;
when ( usersService . getUserIdByName ( loginUser . getUserName ( ) ) ) . thenReturn ( - 1 ) ;
when ( usersService . getUserIdByName ( loginUser . getUserName ( ) ) ) . thenReturn ( - 1 ) ;
Map < String , Object > executorNullRes = taskInstanceService . queryTaskListPaging ( loginUser , projectCode , 1 , "" , "" ,
Result executorNullRes = taskInstanceService . queryTaskListPaging ( loginUser , projectCode , 1 , "" , "" ,
"test_user" , "2020-01-01 00:00:00" , "2020-01-02 00:00:00" , "" , ExecutionStatus . SUCCESS , "192.168.xx.xx" , 1 , 20 ) ;
"test_user" , "2020-01-01 00:00:00" , "2020-01-02 00:00:00" , "" , ExecutionStatus . SUCCESS , "192.168.xx.xx" , 1 , 20 ) ;
Assert . assertEquals ( Status . SUCCESS , executorNullRes . get ( Constants . STATUS ) ) ;
Assert . assertEquals ( Status . SUCCESS . getCode ( ) , ( int ) executorNullRes . getCode ( ) ) ;
//start/end date null
//start/end date null
when ( taskInstanceMapper . queryTaskInstanceListPaging ( Mockito . any ( Page . class ) , eq ( project . getCode ( ) ) , eq ( 1 ) , eq ( "" ) , eq ( "" ) , eq ( "" ) ,
when ( taskInstanceMapper . queryTaskInstanceListPaging ( Mockito . any ( Page . class ) , eq ( project . getCode ( ) ) , eq ( 1 ) , eq ( "" ) , eq ( "" ) , eq ( "" ) ,
eq ( 0 ) , Mockito . any ( ) , eq ( "192.168.xx.xx" ) , any ( ) , any ( ) ) ) . thenReturn ( pageReturn ) ;
eq ( 0 ) , Mockito . any ( ) , eq ( "192.168.xx.xx" ) , any ( ) , any ( ) ) ) . thenReturn ( pageReturn ) ;
Map < String , Object > executorNullDateRes = taskInstanceService . queryTaskListPaging ( loginUser , projectCode , 1 , "" , "" ,
Result executorNullDateRes = taskInstanceService . queryTaskListPaging ( loginUser , projectCode , 1 , "" , "" ,
"" , null , null , "" , ExecutionStatus . SUCCESS , "192.168.xx.xx" , 1 , 20 ) ;
"" , null , null , "" , ExecutionStatus . SUCCESS , "192.168.xx.xx" , 1 , 20 ) ;
Assert . assertEquals ( Status . SUCCESS , executorNullDateRes . get ( Constants . STATUS ) ) ;
Assert . assertEquals ( Status . SUCCESS . getCode ( ) , ( int ) executorNullDateRes . getCode ( ) ) ;
//start date error format
//start date error format
when ( taskInstanceMapper . queryTaskInstanceListPaging ( Mockito . any ( Page . class ) , eq ( project . getCode ( ) ) , eq ( 1 ) , eq ( "" ) , eq ( "" ) , eq ( "" ) ,
when ( taskInstanceMapper . queryTaskInstanceListPaging ( Mockito . any ( Page . class ) , eq ( project . getCode ( ) ) , eq ( 1 ) , eq ( "" ) , eq ( "" ) , eq ( "" ) ,
eq ( 0 ) , Mockito . any ( ) , eq ( "192.168.xx.xx" ) , any ( ) , any ( ) ) ) . thenReturn ( pageReturn ) ;
eq ( 0 ) , Mockito . any ( ) , eq ( "192.168.xx.xx" ) , any ( ) , any ( ) ) ) . thenReturn ( pageReturn ) ;
Map < String , Object > executorErrorStartDateRes = taskInstanceService . queryTaskListPaging ( loginUser , projectCode , 1 , "" , "" ,
Result executorErrorStartDateRes = taskInstanceService . queryTaskListPaging ( loginUser , projectCode , 1 , "" , "" ,
"" , "error date" , null , "" , ExecutionStatus . SUCCESS , "192.168.xx.xx" , 1 , 20 ) ;
"" , "error date" , null , "" , ExecutionStatus . SUCCESS , "192.168.xx.xx" , 1 , 20 ) ;
Assert . assertEquals ( Status . REQUEST_PARAMS_NOT_VALID_ERROR , executorErrorStartDateRes . get ( Constants . STATUS ) ) ;
Assert . assertEquals ( Status . REQUEST_PARAMS_NOT_VALID_ERROR . getCode ( ) , ( int ) executorErrorStartDateRes . getCode ( ) ) ;
Map < String , Object > executorErrorEndDateRes = taskInstanceService . queryTaskListPaging ( loginUser , projectCode , 1 , "" , "" ,
Result executorErrorEndDateRes = taskInstanceService . queryTaskListPaging ( loginUser , projectCode , 1 , "" , "" ,
"" , null , "error date" , "" , ExecutionStatus . SUCCESS , "192.168.xx.xx" , 1 , 20 ) ;
"" , null , "error date" , "" , ExecutionStatus . SUCCESS , "192.168.xx.xx" , 1 , 20 ) ;
Assert . assertEquals ( Status . REQUEST_PARAMS_NOT_VALID_ERROR , executorErrorEndDateRes . get ( Constants . STATUS ) ) ;
Assert . assertEquals ( Status . REQUEST_PARAMS_NOT_VALID_ERROR . getCode ( ) , ( int ) executorErrorEndDateRes . getCode ( ) ) ;
}
}
/ * *
/ * *