Skip to content

Commit c2487a1

Browse files
luxlruanwenjun
luxl
authored andcommitted
fix unit test
1 parent f5f0bfe commit c2487a1

File tree

1 file changed

+9
-22
lines changed

1 file changed

+9
-22
lines changed

Diff for: dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/runner/WorkerGroupTaskDispatcherManagerTest.java

+9-22
Original file line numberDiff line numberDiff line change
@@ -17,60 +17,47 @@
1717

1818
package org.apache.dolphinscheduler.server.master.runner;
1919

20-
import static org.junit.Assert.assertTrue;
20+
import static org.junit.jupiter.api.Assertions.assertTrue;
2121
import static org.mockito.Mockito.doNothing;
2222
import static org.mockito.Mockito.mock;
2323
import static org.mockito.Mockito.times;
2424
import static org.mockito.Mockito.verify;
2525

26-
import org.apache.dolphinscheduler.server.master.engine.task.client.ITaskExecutorClient;
2726
import org.apache.dolphinscheduler.server.master.engine.task.runnable.ITaskExecutionRunnable;
2827

2928
import java.util.concurrent.ConcurrentHashMap;
3029

31-
import org.junit.jupiter.api.BeforeEach;
3230
import org.junit.jupiter.api.Test;
33-
import org.junit.runner.RunWith;
31+
import org.junit.jupiter.api.extension.ExtendWith;
3432
import org.mockito.InjectMocks;
3533
import org.mockito.Mock;
36-
import org.mockito.junit.MockitoJUnitRunner;
34+
import org.mockito.junit.jupiter.MockitoExtension;
3735
import org.springframework.test.util.ReflectionTestUtils;
3836

39-
@RunWith(MockitoJUnitRunner.class)
40-
public class WorkerGroupTaskDispatcherManagerTest {
37+
@ExtendWith(MockitoExtension.class)
38+
class WorkerGroupTaskDispatcherManagerTest {
4139

4240
@InjectMocks
4341
private WorkerGroupTaskDispatcherManager workerGroupTaskDispatcherManager;
4442

45-
@Mock
46-
private ITaskExecutorClient taskExecutorClient;
47-
4843
@Mock
4944
private ITaskExecutionRunnable taskExecutionRunnable;
5045

51-
@BeforeEach
52-
public void setUp() {
53-
workerGroupTaskDispatcherManager = new WorkerGroupTaskDispatcherManager();
54-
ReflectionTestUtils.setField(workerGroupTaskDispatcherManager, "taskExecutorClient", taskExecutorClient);
55-
}
56-
5746
@Test
58-
public void addTaskToWorkerGroup_NewWorkerGroup_ShouldAddTask() {
47+
void addTaskToWorkerGroup_NewWorkerGroup_ShouldAddTask() {
5948
String workerGroup = "newGroup";
6049
long delayTimeMills = 1000;
6150

6251
workerGroupTaskDispatcherManager.addTaskToWorkerGroup(workerGroup, taskExecutionRunnable, delayTimeMills);
6352

6453
ConcurrentHashMap<String, WorkerGroupTaskDispatcher> dispatchWorkerMap =
65-
(ConcurrentHashMap<String, WorkerGroupTaskDispatcher>) ReflectionTestUtils
66-
.getField(workerGroupTaskDispatcherManager, "dispatchWorkerMap");
54+
workerGroupTaskDispatcherManager.getDispatchWorkerMap();
6755

68-
assert dispatchWorkerMap != null;
6956
assertTrue(dispatchWorkerMap.containsKey(workerGroup));
7057
}
7158

7259
@Test
73-
public void addTaskToWorkerGroup_ExistingWorkerGroup_ShouldAddTask() {
60+
void addTaskToWorkerGroup_ExistingWorkerGroup_ShouldAddTask() {
7461
String workerGroup = "existingGroup";
7562
long delayTimeMills = 1000;
7663

@@ -87,7 +74,7 @@ public void addTaskToWorkerGroup_ExistingWorkerGroup_ShouldAddTask() {
8774
}
8875

8976
@Test
90-
public void close_ShouldCloseAllWorkerGroups() throws Exception {
77+
void close_ShouldCloseAllWorkerGroups() throws Exception {
9178
WorkerGroupTaskDispatcher mockDispatcher1 = mock(WorkerGroupTaskDispatcher.class);
9279
WorkerGroupTaskDispatcher mockDispatcher2 = mock(WorkerGroupTaskDispatcher.class);
9380

0 commit comments

Comments
 (0)