未验证 提交 ad28c651 编写于 作者: C CalvinKirs 提交者: GitHub

[BUG_FIX]fix multi-threaded tests error. (#3044)

* fix  test mock error

* fix  test mock error
上级 40bbef5e
...@@ -75,9 +75,9 @@ public class TaskPriorityQueueConsumerTest { ...@@ -75,9 +75,9 @@ public class TaskPriorityQueueConsumerTest {
tenant.setCreateTime(new Date()); tenant.setCreateTime(new Date());
tenant.setUpdateTime(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 { ...@@ -104,7 +104,7 @@ public class TaskPriorityQueueConsumerTest {
processDefinition.setProjectId(1); processDefinition.setProjectId(1);
taskInstance.setProcessDefine(processDefinition); taskInstance.setProcessDefine(processDefinition);
Mockito.when(processService.getTaskInstanceDetailByTaskId(1)).thenReturn(taskInstance); Mockito.doReturn(taskInstance).when(processService).getTaskInstanceDetailByTaskId(1);
taskPriorityQueue.put("2_1_2_1_default"); taskPriorityQueue.put("2_1_2_1_default");
Thread.sleep(10000); Thread.sleep(10000);
...@@ -133,8 +133,7 @@ public class TaskPriorityQueueConsumerTest { ...@@ -133,8 +133,7 @@ public class TaskPriorityQueueConsumerTest {
processDefinition.setUserId(2); processDefinition.setUserId(2);
processDefinition.setProjectId(1); processDefinition.setProjectId(1);
taskInstance.setProcessDefine(processDefinition); taskInstance.setProcessDefine(processDefinition);
Mockito.doReturn(taskInstance).when(processService).getTaskInstanceDetailByTaskId(1);
Mockito.when(processService.getTaskInstanceDetailByTaskId(1)).thenReturn(taskInstance);
taskPriorityQueue.put("2_1_2_1_default"); taskPriorityQueue.put("2_1_2_1_default");
DataSource dataSource = new DataSource(); DataSource dataSource = new DataSource();
...@@ -146,7 +145,7 @@ public class TaskPriorityQueueConsumerTest { ...@@ -146,7 +145,7 @@ public class TaskPriorityQueueConsumerTest {
dataSource.setCreateTime(new Date()); dataSource.setCreateTime(new Date());
dataSource.setUpdateTime(new Date()); dataSource.setUpdateTime(new Date());
Mockito.when(processService.findDataSourceById(1)).thenReturn(dataSource); Mockito.doReturn(dataSource).when(processService).findDataSourceById(1);
Thread.sleep(10000); Thread.sleep(10000);
} }
...@@ -174,8 +173,7 @@ public class TaskPriorityQueueConsumerTest { ...@@ -174,8 +173,7 @@ public class TaskPriorityQueueConsumerTest {
processDefinition.setUserId(2); processDefinition.setUserId(2);
processDefinition.setProjectId(1); processDefinition.setProjectId(1);
taskInstance.setProcessDefine(processDefinition); taskInstance.setProcessDefine(processDefinition);
Mockito.doReturn(taskInstance).when(processService).getTaskInstanceDetailByTaskId(1);
Mockito.when(processService.getTaskInstanceDetailByTaskId(1)).thenReturn(taskInstance);
taskPriorityQueue.put("2_1_2_1_default"); taskPriorityQueue.put("2_1_2_1_default");
...@@ -188,9 +186,7 @@ public class TaskPriorityQueueConsumerTest { ...@@ -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.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.setCreateTime(new Date());
dataSource.setUpdateTime(new Date()); dataSource.setUpdateTime(new Date());
Mockito.doReturn(dataSource).when(processService).findDataSourceById(80);
Mockito.when(processService.findDataSourceById(80)).thenReturn(dataSource);
Thread.sleep(10000); Thread.sleep(10000);
} }
...@@ -217,12 +213,10 @@ public class TaskPriorityQueueConsumerTest { ...@@ -217,12 +213,10 @@ public class TaskPriorityQueueConsumerTest {
processDefinition.setUserId(2); processDefinition.setUserId(2);
processDefinition.setProjectId(1); processDefinition.setProjectId(1);
taskInstance.setProcessDefine(processDefinition); taskInstance.setProcessDefine(processDefinition);
Mockito.doReturn(taskInstance).when(processService).getTaskInstanceDetailByTaskId(1);
Mockito.when(processService.getTaskInstanceDetailByTaskId(1)).thenReturn(taskInstance);
taskPriorityQueue.put("2_1_2_1_default"); taskPriorityQueue.put("2_1_2_1_default");
DataSource dataSource = new DataSource(); DataSource dataSource = new DataSource();
dataSource.setId(1); dataSource.setId(1);
dataSource.setName("datax"); dataSource.setName("datax");
...@@ -250,7 +244,7 @@ public class TaskPriorityQueueConsumerTest { ...@@ -250,7 +244,7 @@ public class TaskPriorityQueueConsumerTest {
taskInstance.setExecutorId(2); taskInstance.setExecutorId(2);
Mockito.when( processService.findTaskInstanceById(1)).thenReturn(taskInstance); Mockito.doReturn(taskInstance).when(processService).findTaskInstanceById(1);
taskPriorityQueueConsumer.taskInstanceIsFinalState(1); taskPriorityQueueConsumer.taskInstanceIsFinalState(1);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册