From ad28c65160c63ea82768d72780c8e9bba495e218 Mon Sep 17 00:00:00 2001 From: CalvinKirs Date: Tue, 23 Jun 2020 22:35:12 +0800 Subject: [PATCH] [BUG_FIX]fix multi-threaded tests error. (#3044) * fix test mock error * fix test mock error --- .../TaskPriorityQueueConsumerTest.java | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumerTest.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumerTest.java index 180688edd..b2a48d4ed 100644 --- a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumerTest.java +++ b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumerTest.java @@ -75,9 +75,9 @@ public class TaskPriorityQueueConsumerTest { tenant.setCreateTime(new Date()); tenant.setUpdateTime(new Date()); - Mockito.when(processService.getTenantForProcess(1,2)).thenReturn(tenant); + Mockito.doReturn(tenant).when(processService).getTenantForProcess(1,2); - Mockito.when(processService.queryUserQueueByProcessInstanceId(1)).thenReturn("default"); + Mockito.doReturn("default").when(processService).queryUserQueueByProcessInstanceId(1); } @@ -104,7 +104,7 @@ public class TaskPriorityQueueConsumerTest { processDefinition.setProjectId(1); taskInstance.setProcessDefine(processDefinition); - Mockito.when(processService.getTaskInstanceDetailByTaskId(1)).thenReturn(taskInstance); + Mockito.doReturn(taskInstance).when(processService).getTaskInstanceDetailByTaskId(1); taskPriorityQueue.put("2_1_2_1_default"); Thread.sleep(10000); @@ -133,8 +133,7 @@ public class TaskPriorityQueueConsumerTest { processDefinition.setUserId(2); processDefinition.setProjectId(1); taskInstance.setProcessDefine(processDefinition); - - Mockito.when(processService.getTaskInstanceDetailByTaskId(1)).thenReturn(taskInstance); + Mockito.doReturn(taskInstance).when(processService).getTaskInstanceDetailByTaskId(1); taskPriorityQueue.put("2_1_2_1_default"); DataSource dataSource = new DataSource(); @@ -146,7 +145,7 @@ public class TaskPriorityQueueConsumerTest { dataSource.setCreateTime(new Date()); dataSource.setUpdateTime(new Date()); - Mockito.when(processService.findDataSourceById(1)).thenReturn(dataSource); + Mockito.doReturn(dataSource).when(processService).findDataSourceById(1); Thread.sleep(10000); } @@ -174,8 +173,7 @@ public class TaskPriorityQueueConsumerTest { processDefinition.setUserId(2); processDefinition.setProjectId(1); taskInstance.setProcessDefine(processDefinition); - - Mockito.when(processService.getTaskInstanceDetailByTaskId(1)).thenReturn(taskInstance); + Mockito.doReturn(taskInstance).when(processService).getTaskInstanceDetailByTaskId(1); taskPriorityQueue.put("2_1_2_1_default"); @@ -188,9 +186,7 @@ public class TaskPriorityQueueConsumerTest { dataSource.setConnectionParams("{\"address\":\"jdbc:mysql://192.168.221.185:3306\",\"database\":\"dolphinscheduler_qiaozhanwei\",\"jdbcUrl\":\"jdbc:mysql://192.168.221.185:3306/dolphinscheduler_qiaozhanwei\",\"user\":\"root\",\"password\":\"root@123\"}"); dataSource.setCreateTime(new Date()); dataSource.setUpdateTime(new Date()); - - Mockito.when(processService.findDataSourceById(80)).thenReturn(dataSource); - + Mockito.doReturn(dataSource).when(processService).findDataSourceById(80); Thread.sleep(10000); } @@ -217,12 +213,10 @@ public class TaskPriorityQueueConsumerTest { processDefinition.setUserId(2); processDefinition.setProjectId(1); taskInstance.setProcessDefine(processDefinition); - - Mockito.when(processService.getTaskInstanceDetailByTaskId(1)).thenReturn(taskInstance); + Mockito.doReturn(taskInstance).when(processService).getTaskInstanceDetailByTaskId(1); taskPriorityQueue.put("2_1_2_1_default"); - DataSource dataSource = new DataSource(); dataSource.setId(1); dataSource.setName("datax"); @@ -250,7 +244,7 @@ public class TaskPriorityQueueConsumerTest { taskInstance.setExecutorId(2); - Mockito.when( processService.findTaskInstanceById(1)).thenReturn(taskInstance); + Mockito.doReturn(taskInstance).when(processService).findTaskInstanceById(1); taskPriorityQueueConsumer.taskInstanceIsFinalState(1); } -- GitLab