This is an automated email from the ASF dual-hosted git repository.
wuweijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob.git
The following commit(s) were added to refs/heads/master by this push:
new bf9bf756c Remove when entries for mockito that are not used in unit
tests (#2179)
bf9bf756c is described below
commit bf9bf756c0c8c0a05d48d91e0907f4509a535741
Author: Ling Hengqian <[email protected]>
AuthorDate: Sat Jan 28 16:23:19 2023 +0800
Remove when entries for mockito that are not used in unit tests (#2179)
---
.../elasticjob/lite/internal/failover/FailoverServiceTest.java | 5 +++--
.../elasticjob/lite/internal/sharding/ExecutionServiceTest.java | 5 +++--
.../elasticjob/lite/internal/sharding/ShardingServiceTest.java | 5 +++--
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git
a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverServiceTest.java
b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverServiceTest.java
index a346a72ba..d946078d4 100644
---
a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverServiceTest.java
+++
b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverServiceTest.java
@@ -40,11 +40,12 @@ import java.util.Map;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
public final class FailoverServiceTest {
@Mock
@@ -253,7 +254,7 @@ public final class FailoverServiceTest {
when(configService.load(true)).thenReturn(JobConfiguration.newBuilder("test_job",
3).build());
String jobInstanceId = "127.0.0.1@-@1";
when(jobNodeStorage.getJobNodeData("sharding/0/failovering")).thenReturn(jobInstanceId);
-
when(jobNodeStorage.getJobNodeData("sharding/2/failovering")).thenReturn(jobInstanceId);
+
lenient().when(jobNodeStorage.getJobNodeData("sharding/2/failovering")).thenReturn(jobInstanceId);
Map<Integer, JobInstance> actual =
failoverService.getAllFailoveringItems();
assertThat(actual.size(), is(2));
assertThat(actual.get(0), is(new JobInstance(jobInstanceId)));
diff --git
a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ExecutionServiceTest.java
b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ExecutionServiceTest.java
index 2f88cd353..aeed473fa 100644
---
a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ExecutionServiceTest.java
+++
b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ExecutionServiceTest.java
@@ -41,11 +41,12 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
public final class ExecutionServiceTest {
@Mock
@@ -181,7 +182,7 @@ public final class ExecutionServiceTest {
when(configService.load(true)).thenReturn(JobConfiguration.newBuilder("test_job",
3).build());
String jobInstanceId = "127.0.0.1@-@1";
when(jobNodeStorage.getJobNodeData("sharding/0/running")).thenReturn(jobInstanceId);
-
when(jobNodeStorage.getJobNodeData("sharding/2/running")).thenReturn(jobInstanceId);
+
lenient().when(jobNodeStorage.getJobNodeData("sharding/2/running")).thenReturn(jobInstanceId);
Map<Integer, JobInstance> actual =
executionService.getAllRunningItems();
assertThat(actual.size(), is(2));
assertThat(actual.get(0), is(new JobInstance(jobInstanceId)));
diff --git
a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingServiceTest.java
b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingServiceTest.java
index 2a353669e..75b38b9f1 100644
---
a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingServiceTest.java
+++
b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingServiceTest.java
@@ -44,11 +44,12 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
public final class ShardingServiceTest {
@Mock
@@ -252,7 +253,7 @@ public final class ShardingServiceTest {
when(jobNodeStorage.getJobNodeData("sharding/0/instance")).thenReturn("127.0.0.1@-@0");
when(jobNodeStorage.isJobNodeExisted("sharding/0/running")).thenReturn(true);
when(jobNodeStorage.getJobNodeData("sharding/2/instance")).thenReturn("127.0.0.1@-@0");
-
when(jobNodeStorage.isJobNodeExisted("sharding/2/running")).thenReturn(true);
+
lenient().when(jobNodeStorage.isJobNodeExisted("sharding/2/running")).thenReturn(true);
assertThat(shardingService.getCrashedShardingItems("127.0.0.1@-@0"),
is(Arrays.asList(0, 2)));
JobRegistry.getInstance().shutdown("test_job");
}
