You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/06/22 09:15:46 UTC
[shardingsphere-elasticjob-lite] branch master updated: Use runner
instead of MockitoAnnotations.initMocks(this) (#819)
This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob-lite.git
The following commit(s) were added to refs/heads/master by this push:
new ee7d656 Use runner instead of MockitoAnnotations.initMocks(this) (#819)
ee7d656 is described below
commit ee7d6560d31ed190593d046e3b4ad32e3442f5bd
Author: Liang Zhang <te...@163.com>
AuthorDate: Mon Jun 22 17:15:39 2020 +0800
Use runner instead of MockitoAnnotations.initMocks(this) (#819)
* Use runner instead of MockitoAnnotations.initMocks(this)for JobOperateAPIImplTest
* Use runner instead of MockitoAnnotations.initMocks(this) for ShardingOperateAPIImplTest
* Use runner instead of MockitoAnnotations.initMocks(this) for JobSettingsAPIImplTest
* Use runner instead of MockitoAnnotations.initMocks(this) for JobStatisticsAPIImplTest
* Use runner instead of MockitoAnnotations.initMocks(this) for ServerStatisticsAPIImplTest
* Use runner instead of MockitoAnnotations.initMocks(this) for JobSchedulerTest
* Use runner instead of MockitoAnnotations.initMocks(this) for DistributeOnceElasticJobListenerTest
* Use runner instead of MockitoAnnotations.initMocks(this) for RescheduleListenerManagerTest
* Use runner instead of MockitoAnnotations.initMocks(this) for ConfigurationServiceTest
* Use runner instead of MockitoAnnotations.initMocks(this) for ServerServiceTest
* Use runner instead of MockitoAnnotations.initMocks(this) for JobNodeStorageTest
* Use runner instead of MockitoAnnotations.initMocks(this) for ElectionListenerManagerTest
* Use runner instead of MockitoAnnotations.initMocks(this) for LeaderServiceTest
* Use runner instead of MockitoAnnotations.initMocks(this) for ExecutionContextServiceTest
* Use runner instead of MockitoAnnotations.initMocks(this) for FailoverListenerManagerTest
* Use runner instead of MockitoAnnotations.initMocks(this) for FailoverServiceTest
* Use runner instead of MockitoAnnotations.initMocks(this) for InstanceServiceTest
* Use runner instead of MockitoAnnotations.initMocks(this) for ShutdownListenerManagerTest
* Use runner instead of MockitoAnnotations.initMocks(this) for TriggerListenerManagerTest
* Use runner instead of MockitoAnnotations.initMocks(this) for RegistryCenterConnectionStateListenerTest
* Use runner instead of MockitoAnnotations.initMocks(this) for ListenerManagerTest
* Use runner instead of MockitoAnnotations.initMocks(this) for JobTriggerListenerTest
* Use runner instead of MockitoAnnotations.initMocks(this) for JobScheduleControllerTest
* Use runner instead of MockitoAnnotations.initMocks(this) for SchedulerFacadeTest
* Use runner instead of MockitoAnnotations.initMocks(this) for LiteJobFacadeTest
* Use runner instead of MockitoAnnotations.initMocks(this) for MonitorExecutionListenerManagerTest
* Use runner instead of MockitoAnnotations.initMocks(this) for ExecutionServiceTest
* Use runner instead of MockitoAnnotations.initMocks(this) for ShardingListenerManagerTest
* Use runner instead of MockitoAnnotations.initMocks(this) for ShardingServiceTest
* Use runner instead of MockitoAnnotations.initMocks(this) for GuaranteeListenerManagerTest
* Use runner instead of MockitoAnnotations.initMocks(this) for GuaranteeServiceTest
* Use runner instead of MockitoAnnotations.initMocks(this) for ReconcileServiceTest
* rename initMocks to setUp
* Use static import for Mocktio
* Use static import for Is
* Use static import for CoreMatchers.is
---
.../elasticjob/lite/api/JobSchedulerTest.java | 9 ++++---
.../DistributeOnceElasticJobListenerTest.java | 5 ++--
.../lite/handler/sharding/JobInstanceTest.java | 3 +--
.../lite/integrate/AbstractBaseStdJobTest.java | 7 +++---
.../internal/config/ConfigurationServiceTest.java | 8 +++---
.../LiteJobConfigurationGsonFactoryTest.java | 3 +--
.../config/RescheduleListenerManagerTest.java | 11 +++-----
.../election/ElectionListenerManagerTest.java | 7 +++---
.../lite/internal/election/LeaderServiceTest.java | 5 ++--
.../failover/FailoverListenerManagerTest.java | 8 +++---
.../internal/failover/FailoverServiceTest.java | 5 ++--
.../guarantee/GuaranteeListenerManagerTest.java | 5 ++--
.../internal/guarantee/GuaranteeServiceTest.java | 7 +++---
.../internal/instance/InstanceServiceTest.java | 5 ++--
.../instance/ShutdownListenerManagerTest.java | 5 ++--
.../instance/TriggerListenerManagerTest.java | 5 ++--
.../internal/listener/ListenerManagerTest.java | 7 +++---
.../RegistryCenterConnectionStateListenerTest.java | 7 +++---
.../internal/reconcile/ReconcileServiceTest.java | 29 ++++++++++++----------
.../schedule/JobScheduleControllerTest.java | 23 ++++++++---------
.../internal/schedule/JobTriggerListenerTest.java | 6 ++---
.../lite/internal/schedule/LiteJobFacadeTest.java | 7 +++---
.../internal/schedule/SchedulerFacadeTest.java | 13 ++++------
.../lite/internal/server/ServerServiceTest.java | 5 ++--
.../sharding/ExecutionContextServiceTest.java | 7 +++---
.../internal/sharding/ExecutionServiceTest.java | 10 +++-----
.../MonitorExecutionListenerManagerTest.java | 5 ++--
.../sharding/ShardingListenerManagerTest.java | 7 +++---
.../internal/sharding/ShardingServiceTest.java | 8 +++---
.../lite/internal/storage/JobNodeStorageTest.java | 15 +++++------
.../lite/util/env/HostExceptionTest.java | 4 +--
.../internal/operate/JobOperateAPIImplTest.java | 11 +++-----
.../operate/ShardingOperateAPIImplTest.java | 12 +++------
.../internal/settings/JobSettingsAPIImplTest.java | 9 +++----
.../statistics/JobStatisticsAPIImplTest.java | 18 +++-----------
.../statistics/ServerStatisticsAPIImplTest.java | 5 ++--
.../statistics/ShardingStatisticsAPIImplTest.java | 6 ++---
.../lite/lifecycle/restful/RestfulServerTest.java | 24 ++++++++++--------
38 files changed, 156 insertions(+), 180 deletions(-)
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/api/JobSchedulerTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/api/JobSchedulerTest.java
index b9bdeb8..3c3bd8e 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/api/JobSchedulerTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/api/JobSchedulerTest.java
@@ -17,11 +17,11 @@
package org.apache.shardingsphere.elasticjob.lite.api;
-import org.apache.shardingsphere.elasticjob.lite.handler.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.lite.config.JobCoreConfiguration;
import org.apache.shardingsphere.elasticjob.lite.config.LiteJobConfiguration;
import org.apache.shardingsphere.elasticjob.lite.config.simple.SimpleJobConfiguration;
import org.apache.shardingsphere.elasticjob.lite.fixture.TestSimpleJob;
+import org.apache.shardingsphere.elasticjob.lite.handler.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobScheduleController;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobTriggerListener;
@@ -30,8 +30,9 @@ import org.apache.shardingsphere.elasticjob.lite.reg.base.CoordinatorRegistryCen
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import org.quartz.Scheduler;
import org.quartz.SchedulerException;
import org.unitils.util.ReflectionUtils;
@@ -42,6 +43,7 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
public final class JobSchedulerTest {
@Mock
@@ -55,11 +57,10 @@ public final class JobSchedulerTest {
private JobScheduler jobScheduler;
@Before
- public void initMocks() throws NoSuchFieldException {
+ public void setUp() throws NoSuchFieldException {
JobRegistry.getInstance().addJobInstance("test_job", new JobInstance("127.0.0.1@-@0"));
liteJobConfig = LiteJobConfiguration.newBuilder(new SimpleJobConfiguration(JobCoreConfiguration.newBuilder("test_job", "* * 0/10 * * ? 2050", 3).build())).build();
jobScheduler = new JobScheduler(regCenter, new TestSimpleJob(), liteJobConfig);
- MockitoAnnotations.initMocks(this);
ReflectionUtils.setFieldValue(jobScheduler, "regCenter", regCenter);
ReflectionUtils.setFieldValue(jobScheduler, "schedulerFacade", schedulerFacade);
}
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/api/listener/DistributeOnceElasticJobListenerTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/api/listener/DistributeOnceElasticJobListenerTest.java
index 1595a75..f17ff7d 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/api/listener/DistributeOnceElasticJobListenerTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/api/listener/DistributeOnceElasticJobListenerTest.java
@@ -26,8 +26,9 @@ import org.apache.shardingsphere.elasticjob.lite.internal.guarantee.GuaranteeSer
import org.apache.shardingsphere.elasticjob.lite.util.env.TimeService;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import org.unitils.util.ReflectionUtils;
import java.util.Arrays;
@@ -38,6 +39,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
public final class DistributeOnceElasticJobListenerTest {
@Mock
@@ -55,7 +57,6 @@ public final class DistributeOnceElasticJobListenerTest {
@Before
public void setUp() {
- MockitoAnnotations.initMocks(this);
distributeOnceElasticJobListener = new TestDistributeOnceElasticJobListener(elasticJobListenerCaller);
ReflectionUtils.setFieldValue(distributeOnceElasticJobListener, ReflectionUtils.getFieldWithName(AbstractDistributeOnceElasticJobListener.class, "guaranteeService", false), guaranteeService);
ReflectionUtils.setFieldValue(distributeOnceElasticJobListener, ReflectionUtils.getFieldWithName(AbstractDistributeOnceElasticJobListener.class, "timeService", false), timeService);
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/handler/sharding/JobInstanceTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/handler/sharding/JobInstanceTest.java
index 49498e6..7171309 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/handler/sharding/JobInstanceTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/handler/sharding/JobInstanceTest.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.elasticjob.lite.handler.sharding;
import org.apache.shardingsphere.elasticjob.lite.util.env.IpUtils;
-import org.hamcrest.CoreMatchers;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
@@ -33,6 +32,6 @@ public final class JobInstanceTest {
@Test
public void assertGetIp() {
- assertThat(new JobInstance().getIp(), CoreMatchers.is(IpUtils.getIp()));
+ assertThat(new JobInstance().getIp(), is(IpUtils.getIp()));
}
}
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/AbstractBaseStdJobTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/AbstractBaseStdJobTest.java
index a6d7fb9..ec99ff8 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/AbstractBaseStdJobTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/AbstractBaseStdJobTest.java
@@ -43,7 +43,6 @@ import org.apache.shardingsphere.elasticjob.lite.reg.zookeeper.ZookeeperConfigur
import org.apache.shardingsphere.elasticjob.lite.reg.zookeeper.ZookeeperRegistryCenter;
import org.apache.shardingsphere.elasticjob.lite.util.concurrent.BlockUtils;
import org.apache.shardingsphere.elasticjob.lite.util.env.IpUtils;
-import org.hamcrest.CoreMatchers;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -162,20 +161,20 @@ public abstract class AbstractBaseStdJobTest {
private void assertRegCenterCommonInfo() {
assertThat(JobRegistry.getInstance().getCurrentShardingTotalCount(jobName), is(3));
- assertThat(JobRegistry.getInstance().getJobInstance(jobName).getIp(), CoreMatchers.is(IpUtils.getIp()));
+ assertThat(JobRegistry.getInstance().getJobInstance(jobName).getIp(), is(IpUtils.getIp()));
LiteJobConfiguration liteJobConfig = LiteJobConfigurationGsonFactory.fromJson(regCenter.get("/" + jobName + "/config"));
assertThat(liteJobConfig.getTypeConfig().getCoreConfig().getShardingTotalCount(), is(3));
assertThat(liteJobConfig.getTypeConfig().getCoreConfig().getShardingItemParameters(), is("0=A,1=B,2=C"));
assertThat(liteJobConfig.getTypeConfig().getCoreConfig().getCron(), is("0/1 * * * * ?"));
if (disabled) {
- assertThat(regCenter.get("/" + jobName + "/servers/" + JobRegistry.getInstance().getJobInstance(jobName).getIp()), CoreMatchers.is(ServerStatus.DISABLED.name()));
+ assertThat(regCenter.get("/" + jobName + "/servers/" + JobRegistry.getInstance().getJobInstance(jobName).getIp()), is(ServerStatus.DISABLED.name()));
while (null != regCenter.get("/" + jobName + "/leader/election/instance")) {
BlockUtils.waitingShortTime();
}
regCenter.persist("/" + jobName + "/servers/" + JobRegistry.getInstance().getJobInstance(jobName).getIp(), "");
} else {
assertThat(regCenter.get("/" + jobName + "/servers/" + JobRegistry.getInstance().getJobInstance(jobName).getIp()), is(""));
- assertThat(regCenter.get("/" + jobName + "/leader/election/instance"), CoreMatchers.is(JobRegistry.getInstance().getJobInstance(jobName).getJobInstanceId()));
+ assertThat(regCenter.get("/" + jobName + "/leader/election/instance"), is(JobRegistry.getInstance().getJobInstance(jobName).getJobInstanceId()));
}
assertTrue(regCenter.isExisted("/" + jobName + "/instances/" + JobRegistry.getInstance().getJobInstance(jobName).getJobInstanceId()));
regCenter.remove("/" + jobName + "/leader/election");
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/ConfigurationServiceTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/ConfigurationServiceTest.java
index 256fcff..eb0d98f 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/ConfigurationServiceTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/ConfigurationServiceTest.java
@@ -26,8 +26,9 @@ import org.apache.shardingsphere.elasticjob.lite.fixture.util.JobConfigurationUt
import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import org.unitils.util.ReflectionUtils;
import static org.hamcrest.CoreMatchers.is;
@@ -35,6 +36,7 @@ import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
public final class ConfigurationServiceTest {
@Mock
@@ -43,8 +45,7 @@ public final class ConfigurationServiceTest {
private final ConfigurationService configService = new ConfigurationService(null, "test_job");
@Before
- public void initMocks() throws NoSuchFieldException {
- MockitoAnnotations.initMocks(this);
+ public void setUp() throws NoSuchFieldException {
ReflectionUtils.setFieldValue(configService, "jobNodeStorage", jobNodeStorage);
}
@@ -98,7 +99,6 @@ public final class ConfigurationServiceTest {
@Test
public void assertPersistExistedJobConfiguration() {
when(jobNodeStorage.isJobNodeExisted(ConfigurationNode.ROOT)).thenReturn(true);
- when(jobNodeStorage.getJobNodeDataDirectly(ConfigurationNode.ROOT)).thenReturn(LiteJsonConstants.getJobJson());
LiteJobConfiguration liteJobConfig = JobConfigurationUtil.createSimpleLiteJobConfiguration(true);
configService.persist(TestSimpleJob.class.getName(), liteJobConfig);
verify(jobNodeStorage).replaceJobNode("config", LiteJobConfigurationGsonFactory.toJson(liteJobConfig));
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/LiteJobConfigurationGsonFactoryTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/LiteJobConfigurationGsonFactoryTest.java
index 6035fbc..4d2285b 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/LiteJobConfigurationGsonFactoryTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/LiteJobConfigurationGsonFactoryTest.java
@@ -23,7 +23,6 @@ import org.apache.shardingsphere.elasticjob.lite.config.LiteJobConfiguration;
import org.apache.shardingsphere.elasticjob.lite.config.dataflow.DataflowJobConfiguration;
import org.apache.shardingsphere.elasticjob.lite.config.script.ScriptJobConfiguration;
import org.apache.shardingsphere.elasticjob.lite.config.simple.SimpleJobConfiguration;
-import org.hamcrest.CoreMatchers;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
@@ -75,7 +74,7 @@ public final class LiteJobConfigurationGsonFactoryTest {
public void assertFromJsonForSimpleJob() {
LiteJobConfiguration actual = LiteJobConfigurationGsonFactory.fromJson(simpleJobJson);
assertThat(actual.getJobName(), is("test_job"));
- assertThat(actual.getTypeConfig().getJobType(), CoreMatchers.is(JobType.SIMPLE));
+ assertThat(actual.getTypeConfig().getJobType(), is(JobType.SIMPLE));
assertThat(actual.getTypeConfig().getCoreConfig().getCron(), is("0/1 * * * * ?"));
assertThat(actual.getTypeConfig().getCoreConfig().getShardingTotalCount(), is(3));
assertThat(actual.getTypeConfig().getCoreConfig().getShardingItemParameters(), is(""));
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/RescheduleListenerManagerTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/RescheduleListenerManagerTest.java
index f03ed38..f5bede5 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/RescheduleListenerManagerTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/RescheduleListenerManagerTest.java
@@ -18,23 +18,24 @@
package org.apache.shardingsphere.elasticjob.lite.internal.config;
import org.apache.curator.framework.recipes.cache.TreeCacheEvent.Type;
-import org.apache.shardingsphere.elasticjob.lite.handler.sharding.JobInstance;
-import org.apache.shardingsphere.elasticjob.lite.event.JobEventBus;
import org.apache.shardingsphere.elasticjob.lite.fixture.LiteJsonConstants;
+import org.apache.shardingsphere.elasticjob.lite.handler.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobScheduleController;
import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage;
import org.apache.shardingsphere.elasticjob.lite.reg.base.CoordinatorRegistryCenter;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import org.unitils.util.ReflectionUtils;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
+@RunWith(MockitoJUnitRunner.class)
public final class RescheduleListenerManagerTest {
@Mock
@@ -46,14 +47,10 @@ public final class RescheduleListenerManagerTest {
@Mock
private JobScheduleController jobScheduleController;
- @Mock
- private JobEventBus jobEventBus;
-
private final RescheduleListenerManager rescheduleListenerManager = new RescheduleListenerManager(null, "test_job");
@Before
public void setUp() throws NoSuchFieldException {
- MockitoAnnotations.initMocks(this);
ReflectionUtils.setFieldValue(rescheduleListenerManager, rescheduleListenerManager.getClass().getSuperclass().getDeclaredField("jobNodeStorage"), jobNodeStorage);
}
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/election/ElectionListenerManagerTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/election/ElectionListenerManagerTest.java
index 43aeb8e..9009063 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/election/ElectionListenerManagerTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/election/ElectionListenerManagerTest.java
@@ -27,15 +27,17 @@ import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage
import org.apache.shardingsphere.elasticjob.lite.reg.base.CoordinatorRegistryCenter;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import org.unitils.util.ReflectionUtils;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
public final class ElectionListenerManagerTest {
@Mock
@@ -58,7 +60,6 @@ public final class ElectionListenerManagerTest {
@Before
public void setUp() throws NoSuchFieldException {
JobRegistry.getInstance().addJobInstance("test_job", new JobInstance("127.0.0.1@-@0"));
- MockitoAnnotations.initMocks(this);
ReflectionUtils.setFieldValue(electionListenerManager, electionListenerManager.getClass().getSuperclass().getDeclaredField("jobNodeStorage"), jobNodeStorage);
ReflectionUtils.setFieldValue(electionListenerManager, "leaderService", leaderService);
ReflectionUtils.setFieldValue(electionListenerManager, "serverService", serverService);
@@ -90,7 +91,6 @@ public final class ElectionListenerManagerTest {
@Test
public void assertLeaderElectionWhenRemoveLeaderInstancePathWithAvailableServerButJobInstanceIsShutdown() {
- when(serverService.isAvailableServer("127.0.0.1")).thenReturn(true);
electionListenerManager.new LeaderElectionJobListener().dataChanged("/test_job/leader/election/instance", Type.NODE_REMOVED, "127.0.0.1");
verify(leaderService, times(0)).electLeader();
}
@@ -112,7 +112,6 @@ public final class ElectionListenerManagerTest {
@Test
public void assertLeaderElectionWhenServerEnableWithLeader() {
- when(leaderService.hasLeader()).thenReturn(true);
electionListenerManager.new LeaderElectionJobListener().dataChanged("/test_job/servers/127.0.0.1", Type.NODE_UPDATED, "");
verify(leaderService, times(0)).electLeader();
}
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/election/LeaderServiceTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/election/LeaderServiceTest.java
index c619233..30e0bde 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/election/LeaderServiceTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/election/LeaderServiceTest.java
@@ -26,9 +26,10 @@ import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage
import org.apache.shardingsphere.elasticjob.lite.reg.base.CoordinatorRegistryCenter;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import org.unitils.util.ReflectionUtils;
import static org.junit.Assert.assertFalse;
@@ -38,6 +39,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
public final class LeaderServiceTest {
@Mock
@@ -58,7 +60,6 @@ public final class LeaderServiceTest {
public void setUp() throws NoSuchFieldException {
JobRegistry.getInstance().addJobInstance("test_job", new JobInstance("127.0.0.1@-@0"));
leaderService = new LeaderService(null, "test_job");
- MockitoAnnotations.initMocks(this);
ReflectionUtils.setFieldValue(leaderService, "jobNodeStorage", jobNodeStorage);
ReflectionUtils.setFieldValue(leaderService, "serverService", serverService);
}
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverListenerManagerTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverListenerManagerTest.java
index 1b1ba79..f434879 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverListenerManagerTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverListenerManagerTest.java
@@ -18,11 +18,11 @@
package org.apache.shardingsphere.elasticjob.lite.internal.failover;
import org.apache.curator.framework.recipes.cache.TreeCacheEvent.Type;
-import org.apache.shardingsphere.elasticjob.lite.handler.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.lite.config.JobCoreConfiguration;
import org.apache.shardingsphere.elasticjob.lite.config.LiteJobConfiguration;
import org.apache.shardingsphere.elasticjob.lite.config.simple.SimpleJobConfiguration;
import org.apache.shardingsphere.elasticjob.lite.fixture.LiteJsonConstants;
+import org.apache.shardingsphere.elasticjob.lite.handler.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.lite.internal.config.ConfigurationService;
import org.apache.shardingsphere.elasticjob.lite.internal.listener.AbstractJobListener;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry;
@@ -30,9 +30,10 @@ import org.apache.shardingsphere.elasticjob.lite.internal.sharding.ShardingServi
import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import org.unitils.util.ReflectionUtils;
import java.util.Arrays;
@@ -42,6 +43,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
public final class FailoverListenerManagerTest {
@Mock
@@ -60,7 +62,6 @@ public final class FailoverListenerManagerTest {
@Before
public void setUp() throws NoSuchFieldException {
- MockitoAnnotations.initMocks(this);
ReflectionUtils.setFieldValue(failoverListenerManager, failoverListenerManager.getClass().getSuperclass().getDeclaredField("jobNodeStorage"), jobNodeStorage);
ReflectionUtils.setFieldValue(failoverListenerManager, "configService", configService);
ReflectionUtils.setFieldValue(failoverListenerManager, "shardingService", shardingService);
@@ -124,7 +125,6 @@ public final class FailoverListenerManagerTest {
when(configService.load(true)).thenReturn(
LiteJobConfiguration.newBuilder(new SimpleJobConfiguration(JobCoreConfiguration.newBuilder("test_job", "0/1 * * * * ?", 3).failover(true).build())).build());
when(failoverService.getFailoverItems("127.0.0.1@-@1")).thenReturn(Collections.singletonList(1));
- when(shardingService.getShardingItems("127.0.0.1@-@1")).thenReturn(Arrays.asList(0, 2));
failoverListenerManager.new JobCrashedJobListener().dataChanged("/test_job/instances/127.0.0.1@-@1", Type.NODE_REMOVED, "");
verify(failoverService).setCrashedFailoverFlag(1);
verify(failoverService).failoverIfNecessary();
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverServiceTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverServiceTest.java
index 98066d0..aaafd11 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverServiceTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverServiceTest.java
@@ -25,9 +25,10 @@ import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage
import org.apache.shardingsphere.elasticjob.lite.reg.base.CoordinatorRegistryCenter;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import org.unitils.util.ReflectionUtils;
import java.util.Arrays;
@@ -40,6 +41,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
public final class FailoverServiceTest {
@Mock
@@ -58,7 +60,6 @@ public final class FailoverServiceTest {
@Before
public void setUp() throws NoSuchFieldException {
- MockitoAnnotations.initMocks(this);
ReflectionUtils.setFieldValue(failoverService, "jobNodeStorage", jobNodeStorage);
ReflectionUtils.setFieldValue(failoverService, "shardingService", shardingService);
ReflectionUtils.setFieldValue(failoverService, "jobName", "test_job");
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/guarantee/GuaranteeListenerManagerTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/guarantee/GuaranteeListenerManagerTest.java
index 7ce3cf5..da745cc 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/guarantee/GuaranteeListenerManagerTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/guarantee/GuaranteeListenerManagerTest.java
@@ -24,9 +24,10 @@ import org.apache.shardingsphere.elasticjob.lite.internal.listener.AbstractJobLi
import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import org.unitils.util.ReflectionUtils;
import java.util.Arrays;
@@ -34,6 +35,7 @@ import java.util.Arrays;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
+@RunWith(MockitoJUnitRunner.class)
public final class GuaranteeListenerManagerTest {
@Mock
@@ -49,7 +51,6 @@ public final class GuaranteeListenerManagerTest {
@Before
public void setUp() throws NoSuchFieldException {
- MockitoAnnotations.initMocks(this);
guaranteeListenerManager = new GuaranteeListenerManager(null, "test_job", Arrays.asList(elasticJobListener, distributeOnceElasticJobListener));
ReflectionUtils.setFieldValue(guaranteeListenerManager, guaranteeListenerManager.getClass().getSuperclass().getDeclaredField("jobNodeStorage"), jobNodeStorage);
}
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/guarantee/GuaranteeServiceTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/guarantee/GuaranteeServiceTest.java
index eb6416e..615aba7 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/guarantee/GuaranteeServiceTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/guarantee/GuaranteeServiceTest.java
@@ -25,8 +25,9 @@ import org.apache.shardingsphere.elasticjob.lite.internal.config.ConfigurationSe
import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import org.unitils.util.ReflectionUtils;
import java.util.Arrays;
@@ -36,6 +37,7 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
public final class GuaranteeServiceTest {
@Mock
@@ -48,7 +50,6 @@ public final class GuaranteeServiceTest {
@Before
public void setUp() throws NoSuchFieldException {
- MockitoAnnotations.initMocks(this);
ReflectionUtils.setFieldValue(guaranteeService, "jobNodeStorage", jobNodeStorage);
ReflectionUtils.setFieldValue(guaranteeService, "configService", configService);
}
@@ -104,9 +105,7 @@ public final class GuaranteeServiceTest {
@Test
public void assertIsNotAllCompleted() {
- when(configService.load(false)).thenReturn(LiteJobConfiguration.newBuilder(new SimpleJobConfiguration(JobCoreConfiguration.newBuilder("test_job", "0/1 * * * * ?", 10).build())).build());
when(jobNodeStorage.isJobNodeExisted("guarantee/completed")).thenReturn(false);
- when(jobNodeStorage.getJobNodeChildrenKeys("guarantee/completed")).thenReturn(Arrays.asList("0", "1"));
assertFalse(guaranteeService.isAllCompleted());
}
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/InstanceServiceTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/InstanceServiceTest.java
index 020a6aa..af18541 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/InstanceServiceTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/InstanceServiceTest.java
@@ -23,8 +23,9 @@ import org.apache.shardingsphere.elasticjob.lite.internal.server.ServerService;
import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import org.unitils.util.ReflectionUtils;
import java.util.Arrays;
@@ -36,6 +37,7 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
public final class InstanceServiceTest {
@Mock
@@ -50,7 +52,6 @@ public final class InstanceServiceTest {
public void setUp() throws NoSuchFieldException {
JobRegistry.getInstance().addJobInstance("test_job", new JobInstance("127.0.0.1@-@0"));
instanceService = new InstanceService(null, "test_job");
- MockitoAnnotations.initMocks(this);
InstanceNode instanceNode = new InstanceNode("test_job");
ReflectionUtils.setFieldValue(instanceService, "instanceNode", instanceNode);
ReflectionUtils.setFieldValue(instanceService, "jobNodeStorage", jobNodeStorage);
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/ShutdownListenerManagerTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/ShutdownListenerManagerTest.java
index a3c216d..5d6f545 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/ShutdownListenerManagerTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/ShutdownListenerManagerTest.java
@@ -27,15 +27,17 @@ import org.apache.shardingsphere.elasticjob.lite.reg.base.CoordinatorRegistryCen
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import org.unitils.util.ReflectionUtils;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
public final class ShutdownListenerManagerTest {
@Mock
@@ -59,7 +61,6 @@ public final class ShutdownListenerManagerTest {
public void setUp() throws NoSuchFieldException {
JobRegistry.getInstance().addJobInstance("test_job", new JobInstance("127.0.0.1@-@0"));
shutdownListenerManager = new ShutdownListenerManager(null, "test_job");
- MockitoAnnotations.initMocks(this);
ReflectionUtils.setFieldValue(shutdownListenerManager, "instanceService", instanceService);
ReflectionUtils.setFieldValue(shutdownListenerManager, "schedulerFacade", schedulerFacade);
ReflectionUtils.setFieldValue(shutdownListenerManager, shutdownListenerManager.getClass().getSuperclass().getDeclaredField("jobNodeStorage"), jobNodeStorage);
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/TriggerListenerManagerTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/TriggerListenerManagerTest.java
index 30df330..67d5410 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/TriggerListenerManagerTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/TriggerListenerManagerTest.java
@@ -25,14 +25,16 @@ import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage
import org.apache.shardingsphere.elasticjob.lite.reg.base.CoordinatorRegistryCenter;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import org.unitils.util.ReflectionUtils;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
+@RunWith(MockitoJUnitRunner.class)
public final class TriggerListenerManagerTest {
@Mock
@@ -53,7 +55,6 @@ public final class TriggerListenerManagerTest {
public void setUp() throws NoSuchFieldException {
JobRegistry.getInstance().addJobInstance("test_job", new JobInstance("127.0.0.1@-@0"));
triggerListenerManager = new TriggerListenerManager(null, "test_job");
- MockitoAnnotations.initMocks(this);
ReflectionUtils.setFieldValue(triggerListenerManager, "instanceService", instanceService);
ReflectionUtils.setFieldValue(triggerListenerManager, triggerListenerManager.getClass().getSuperclass().getDeclaredField("jobNodeStorage"), jobNodeStorage);
}
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/ListenerManagerTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/ListenerManagerTest.java
index 58f6b40..4c3b998 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/ListenerManagerTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/ListenerManagerTest.java
@@ -28,15 +28,17 @@ import org.apache.shardingsphere.elasticjob.lite.internal.sharding.ShardingListe
import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import org.unitils.util.ReflectionUtils;
import java.util.Collections;
import static org.mockito.Mockito.verify;
-public class ListenerManagerTest {
+@RunWith(MockitoJUnitRunner.class)
+public final class ListenerManagerTest {
@Mock
private JobNodeStorage jobNodeStorage;
@@ -72,7 +74,6 @@ public class ListenerManagerTest {
@Before
public void setUp() throws NoSuchFieldException {
- MockitoAnnotations.initMocks(this);
ReflectionUtils.setFieldValue(listenerManager, "jobNodeStorage", jobNodeStorage);
ReflectionUtils.setFieldValue(listenerManager, "electionListenerManager", electionListenerManager);
ReflectionUtils.setFieldValue(listenerManager, "shardingListenerManager", shardingListenerManager);
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/RegistryCenterConnectionStateListenerTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/RegistryCenterConnectionStateListenerTest.java
index 0985468..79012cc 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/RegistryCenterConnectionStateListenerTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/RegistryCenterConnectionStateListenerTest.java
@@ -28,8 +28,9 @@ import org.apache.shardingsphere.elasticjob.lite.internal.sharding.ShardingServi
import org.apache.shardingsphere.elasticjob.lite.reg.base.CoordinatorRegistryCenter;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import org.unitils.util.ReflectionUtils;
import java.util.Arrays;
@@ -38,6 +39,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
public final class RegistryCenterConnectionStateListenerTest {
@Mock
@@ -64,7 +66,6 @@ public final class RegistryCenterConnectionStateListenerTest {
public void setUp() throws NoSuchFieldException {
JobRegistry.getInstance().addJobInstance("test_job", new JobInstance("127.0.0.1@-@0"));
regCenterConnectionStateListener = new RegistryCenterConnectionStateListener(null, "test_job");
- MockitoAnnotations.initMocks(this);
ReflectionUtils.setFieldValue(regCenterConnectionStateListener, "serverService", serverService);
ReflectionUtils.setFieldValue(regCenterConnectionStateListener, "instanceService", instanceService);
ReflectionUtils.setFieldValue(regCenterConnectionStateListener, "shardingService", shardingService);
@@ -100,8 +101,6 @@ public final class RegistryCenterConnectionStateListenerTest {
@Test
public void assertConnectionLostListenerWhenConnectionStateIsReconnectedButIsShutdown() {
- when(shardingService.getLocalShardingItems()).thenReturn(Arrays.asList(0, 1));
- when(serverService.isEnableServer("127.0.0.1")).thenReturn(true);
regCenterConnectionStateListener.stateChanged(null, ConnectionState.RECONNECTED);
verify(jobScheduleController, times(0)).pauseJob();
verify(jobScheduleController, times(0)).resumeJob();
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/reconcile/ReconcileServiceTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/reconcile/ReconcileServiceTest.java
index 6da1fe8..52aea5f 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/reconcile/ReconcileServiceTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/reconcile/ReconcileServiceTest.java
@@ -17,22 +17,26 @@
package org.apache.shardingsphere.elasticjob.lite.internal.reconcile;
-import org.apache.shardingsphere.elasticjob.lite.handler.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.lite.config.JobCoreConfiguration;
import org.apache.shardingsphere.elasticjob.lite.config.LiteJobConfiguration;
import org.apache.shardingsphere.elasticjob.lite.config.simple.SimpleJobConfiguration;
+import org.apache.shardingsphere.elasticjob.lite.handler.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.lite.internal.config.ConfigurationService;
import org.apache.shardingsphere.elasticjob.lite.internal.election.LeaderService;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry;
import org.apache.shardingsphere.elasticjob.lite.internal.sharding.ShardingService;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import org.unitils.util.ReflectionUtils;
-public class ReconcileServiceTest {
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public final class ReconcileServiceTest {
@Mock
private ConfigurationService configService;
@@ -49,7 +53,6 @@ public class ReconcileServiceTest {
public void setup() throws NoSuchFieldException {
JobRegistry.getInstance().addJobInstance("test_job", new JobInstance("127.0.0.1@-@0"));
reconcileService = new ReconcileService(null, "test_job");
- MockitoAnnotations.initMocks(this);
ReflectionUtils.setFieldValue(reconcileService, "lastReconcileTime", 1L);
ReflectionUtils.setFieldValue(reconcileService, "configService", configService);
ReflectionUtils.setFieldValue(reconcileService, "shardingService", shardingService);
@@ -58,15 +61,15 @@ public class ReconcileServiceTest {
@Test
public void assertReconcile() {
- Mockito.when(configService.load(true)).thenReturn(LiteJobConfiguration.newBuilder(
+ when(configService.load(true)).thenReturn(LiteJobConfiguration.newBuilder(
new SimpleJobConfiguration(JobCoreConfiguration.newBuilder("test_job", "0/1 * * * * ?", 3).build())).reconcileIntervalMinutes(1).build());
- Mockito.when(shardingService.isNeedSharding()).thenReturn(false);
- Mockito.when(shardingService.hasShardingInfoInOfflineServers()).thenReturn(true);
- Mockito.when(leaderService.isLeaderUntilBlock()).thenReturn(true);
+ when(shardingService.isNeedSharding()).thenReturn(false);
+ when(shardingService.hasShardingInfoInOfflineServers()).thenReturn(true);
+ when(leaderService.isLeaderUntilBlock()).thenReturn(true);
reconcileService.runOneIteration();
- Mockito.verify(shardingService).isNeedSharding();
- Mockito.verify(shardingService).hasShardingInfoInOfflineServers();
- Mockito.verify(shardingService).setReshardingFlag();
- Mockito.verify(leaderService).isLeaderUntilBlock();
+ verify(shardingService).isNeedSharding();
+ verify(shardingService).hasShardingInfoInOfflineServers();
+ verify(shardingService).setReshardingFlag();
+ verify(leaderService).isLeaderUntilBlock();
}
}
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/JobScheduleControllerTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/JobScheduleControllerTest.java
index 975fde7..8803851 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/JobScheduleControllerTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/JobScheduleControllerTest.java
@@ -20,9 +20,9 @@ package org.apache.shardingsphere.elasticjob.lite.internal.schedule;
import org.apache.shardingsphere.elasticjob.lite.exception.JobSystemException;
import org.junit.Before;
import org.junit.Test;
-import org.mockito.ArgumentMatchers;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import org.quartz.JobDetail;
import org.quartz.JobKey;
import org.quartz.Scheduler;
@@ -34,12 +34,14 @@ import org.unitils.util.ReflectionUtils;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
public final class JobScheduleControllerTest {
@Mock
@@ -51,8 +53,7 @@ public final class JobScheduleControllerTest {
private JobScheduleController jobScheduleController;
@Before
- public void initMocks() {
- MockitoAnnotations.initMocks(this);
+ public void setUp() {
jobScheduleController = new JobScheduleController(scheduler, jobDetail, "test_job_Trigger");
}
@@ -142,14 +143,12 @@ public final class JobScheduleControllerTest {
@Test
public void assertTriggerJobIfShutdown() throws NoSuchFieldException, SchedulerException {
- JobKey jobKey = new JobKey("test_job");
- when(jobDetail.getKey()).thenReturn(jobKey);
when(scheduler.isShutdown()).thenReturn(true);
ReflectionUtils.setFieldValue(jobScheduleController, "scheduler", scheduler);
ReflectionUtils.setFieldValue(jobScheduleController, "jobDetail", jobDetail);
jobScheduleController.triggerJob();
verify(jobDetail, times(0)).getKey();
- verify(scheduler, times(0)).triggerJob(jobKey);
+ verify(scheduler, times(0)).triggerJob(any());
}
@Test(expected = JobSystemException.class)
@@ -209,18 +208,18 @@ public final class JobScheduleControllerTest {
ReflectionUtils.setFieldValue(jobScheduleController, "scheduler", scheduler);
when(scheduler.isShutdown()).thenReturn(true);
jobScheduleController.rescheduleJob("0/1 * * * * ?");
- verify(scheduler, times(0)).rescheduleJob(eq(TriggerKey.triggerKey("test_job_Trigger")), ArgumentMatchers.any());
+ verify(scheduler, times(0)).rescheduleJob(eq(TriggerKey.triggerKey("test_job_Trigger")), any());
}
@Test(expected = JobSystemException.class)
public void assertRescheduleJobFailure() throws NoSuchFieldException, SchedulerException {
when(scheduler.getTrigger(TriggerKey.triggerKey("test_job_Trigger"))).thenReturn(new CronTriggerImpl());
- doThrow(SchedulerException.class).when(scheduler).rescheduleJob(eq(TriggerKey.triggerKey("test_job_Trigger")), ArgumentMatchers.any());
+ doThrow(SchedulerException.class).when(scheduler).rescheduleJob(eq(TriggerKey.triggerKey("test_job_Trigger")), any());
ReflectionUtils.setFieldValue(jobScheduleController, "scheduler", scheduler);
try {
jobScheduleController.rescheduleJob("0/1 * * * * ?");
} finally {
- verify(scheduler).rescheduleJob(eq(TriggerKey.triggerKey("test_job_Trigger")), ArgumentMatchers.any());
+ verify(scheduler).rescheduleJob(eq(TriggerKey.triggerKey("test_job_Trigger")), any());
}
}
@@ -229,13 +228,13 @@ public final class JobScheduleControllerTest {
when(scheduler.getTrigger(TriggerKey.triggerKey("test_job_Trigger"))).thenReturn(new CronTriggerImpl());
ReflectionUtils.setFieldValue(jobScheduleController, "scheduler", scheduler);
jobScheduleController.rescheduleJob("0/1 * * * * ?");
- verify(scheduler).rescheduleJob(eq(TriggerKey.triggerKey("test_job_Trigger")), ArgumentMatchers.any());
+ verify(scheduler).rescheduleJob(eq(TriggerKey.triggerKey("test_job_Trigger")), any());
}
@Test
public void assertRescheduleJobWhenTriggerIsNull() throws NoSuchFieldException, SchedulerException {
ReflectionUtils.setFieldValue(jobScheduleController, "scheduler", scheduler);
jobScheduleController.rescheduleJob("0/1 * * * * ?");
- verify(scheduler, times(0)).rescheduleJob(eq(TriggerKey.triggerKey("test_job_Trigger")), ArgumentMatchers.any());
+ verify(scheduler, times(0)).rescheduleJob(eq(TriggerKey.triggerKey("test_job_Trigger")), any());
}
}
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/JobTriggerListenerTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/JobTriggerListenerTest.java
index 3d0650a..fb5787d 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/JobTriggerListenerTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/JobTriggerListenerTest.java
@@ -21,8 +21,9 @@ import org.apache.shardingsphere.elasticjob.lite.internal.sharding.ExecutionServ
import org.apache.shardingsphere.elasticjob.lite.internal.sharding.ShardingService;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import org.quartz.Trigger;
import java.util.Collections;
@@ -34,6 +35,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
public final class JobTriggerListenerTest {
@Mock
@@ -49,7 +51,6 @@ public final class JobTriggerListenerTest {
@Before
public void setUp() {
- MockitoAnnotations.initMocks(this);
jobTriggerListener = new JobTriggerListener(executionService, shardingService);
}
@@ -60,7 +61,6 @@ public final class JobTriggerListenerTest {
@Test
public void assertTriggerMisfiredWhenPreviousFireTimeIsNull() {
- when(shardingService.getLocalShardingItems()).thenReturn(Collections.singletonList(0));
jobTriggerListener.triggerMisfired(trigger);
verify(executionService, times(0)).setMisfire(Collections.singletonList(0));
}
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/LiteJobFacadeTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/LiteJobFacadeTest.java
index d9d25f1..1fe8849 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/LiteJobFacadeTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/LiteJobFacadeTest.java
@@ -34,8 +34,9 @@ import org.apache.shardingsphere.elasticjob.lite.internal.sharding.ExecutionServ
import org.apache.shardingsphere.elasticjob.lite.internal.sharding.ShardingService;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import org.unitils.util.ReflectionUtils;
import java.util.Arrays;
@@ -47,7 +48,8 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-public class LiteJobFacadeTest {
+@RunWith(MockitoJUnitRunner.class)
+public final class LiteJobFacadeTest {
@Mock
private ConfigurationService configService;
@@ -74,7 +76,6 @@ public class LiteJobFacadeTest {
@Before
public void setUp() throws NoSuchFieldException {
- MockitoAnnotations.initMocks(this);
liteJobFacade = new LiteJobFacade(null, "test_job", Collections.singletonList(new TestElasticJobListener(caller)), eventBus);
ReflectionUtils.setFieldValue(liteJobFacade, "configService", configService);
ReflectionUtils.setFieldValue(liteJobFacade, "shardingService", shardingService);
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/SchedulerFacadeTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/SchedulerFacadeTest.java
index 258ec31..58a1929 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/SchedulerFacadeTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/SchedulerFacadeTest.java
@@ -17,11 +17,11 @@
package org.apache.shardingsphere.elasticjob.lite.internal.schedule;
-import org.apache.shardingsphere.elasticjob.lite.handler.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.lite.config.JobCoreConfiguration;
import org.apache.shardingsphere.elasticjob.lite.config.LiteJobConfiguration;
import org.apache.shardingsphere.elasticjob.lite.config.dataflow.DataflowJobConfiguration;
import org.apache.shardingsphere.elasticjob.lite.fixture.TestDataflowJob;
+import org.apache.shardingsphere.elasticjob.lite.handler.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.lite.internal.config.ConfigurationService;
import org.apache.shardingsphere.elasticjob.lite.internal.election.LeaderService;
import org.apache.shardingsphere.elasticjob.lite.internal.instance.InstanceService;
@@ -33,8 +33,9 @@ import org.apache.shardingsphere.elasticjob.lite.internal.sharding.ShardingServi
import org.apache.shardingsphere.elasticjob.lite.reg.base.CoordinatorRegistryCenter;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import org.unitils.util.ReflectionUtils;
import java.util.Collections;
@@ -45,7 +46,8 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-public class SchedulerFacadeTest {
+@RunWith(MockitoJUnitRunner.class)
+public final class SchedulerFacadeTest {
@Mock
private CoordinatorRegistryCenter regCenter;
@@ -82,10 +84,7 @@ public class SchedulerFacadeTest {
@Before
public void setUp() throws NoSuchFieldException {
JobRegistry.getInstance().addJobInstance("test_job", new JobInstance("127.0.0.1@-@0"));
- MockitoAnnotations.initMocks(this);
schedulerFacade = new SchedulerFacade(null, "test_job", Collections.emptyList());
- when(configService.load(true)).thenReturn(
- LiteJobConfiguration.newBuilder(new DataflowJobConfiguration(JobCoreConfiguration.newBuilder("test_job", "0/1 * * * * ?", 3).build(), false)).build());
ReflectionUtils.setFieldValue(schedulerFacade, "configService", configService);
ReflectionUtils.setFieldValue(schedulerFacade, "leaderService", leaderService);
ReflectionUtils.setFieldValue(schedulerFacade, "serverService", serverService);
@@ -106,8 +105,6 @@ public class SchedulerFacadeTest {
@Test
public void assertRegisterStartUpInfo() {
- when(configService.load(false)).thenReturn(
- LiteJobConfiguration.newBuilder(new DataflowJobConfiguration(JobCoreConfiguration.newBuilder("test_job", "0/1 * * * * ?", 3).build(), false)).build());
schedulerFacade.registerStartUpInfo(true);
verify(listenerManager).startAllListeners();
verify(leaderService).electLeader();
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/server/ServerServiceTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/server/ServerServiceTest.java
index bb28ed3..59cc1eb 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/server/ServerServiceTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/server/ServerServiceTest.java
@@ -24,8 +24,9 @@ import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage
import org.apache.shardingsphere.elasticjob.lite.reg.base.CoordinatorRegistryCenter;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import org.unitils.util.ReflectionUtils;
import java.util.Arrays;
@@ -37,6 +38,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
public final class ServerServiceTest {
@Mock
@@ -54,7 +56,6 @@ public final class ServerServiceTest {
public void setUp() throws NoSuchFieldException {
JobRegistry.getInstance().addJobInstance("test_job", new JobInstance("127.0.0.1@-@0"));
serverService = new ServerService(null, "test_job");
- MockitoAnnotations.initMocks(this);
ServerNode serverNode = new ServerNode("test_job");
ReflectionUtils.setFieldValue(serverService, "serverNode", serverNode);
ReflectionUtils.setFieldValue(serverService, "jobNodeStorage", jobNodeStorage);
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ExecutionContextServiceTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ExecutionContextServiceTest.java
index e0407bc..5100457 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ExecutionContextServiceTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ExecutionContextServiceTest.java
@@ -18,18 +18,19 @@
package org.apache.shardingsphere.elasticjob.lite.internal.sharding;
import com.google.common.collect.Lists;
-import org.apache.shardingsphere.elasticjob.lite.handler.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.lite.config.JobCoreConfiguration;
import org.apache.shardingsphere.elasticjob.lite.config.LiteJobConfiguration;
import org.apache.shardingsphere.elasticjob.lite.config.dataflow.DataflowJobConfiguration;
import org.apache.shardingsphere.elasticjob.lite.executor.ShardingContexts;
+import org.apache.shardingsphere.elasticjob.lite.handler.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.lite.internal.config.ConfigurationService;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry;
import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import org.unitils.util.ReflectionUtils;
import java.util.Arrays;
@@ -42,6 +43,7 @@ import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
public final class ExecutionContextServiceTest {
@Mock
@@ -54,7 +56,6 @@ public final class ExecutionContextServiceTest {
@Before
public void setUp() throws NoSuchFieldException {
- MockitoAnnotations.initMocks(this);
ReflectionUtils.setFieldValue(executionContextService, "jobNodeStorage", jobNodeStorage);
ReflectionUtils.setFieldValue(executionContextService, "configService", configService);
JobRegistry.getInstance().addJobInstance("test_job", new JobInstance("127.0.0.1@-@0"));
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ExecutionServiceTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ExecutionServiceTest.java
index db7cc4e..c8eba4a 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ExecutionServiceTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ExecutionServiceTest.java
@@ -23,13 +23,13 @@ import org.apache.shardingsphere.elasticjob.lite.config.simple.SimpleJobConfigur
import org.apache.shardingsphere.elasticjob.lite.executor.ShardingContexts;
import org.apache.shardingsphere.elasticjob.lite.internal.config.ConfigurationService;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry;
-import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobScheduleController;
import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import org.unitils.util.ReflectionUtils;
import java.util.Arrays;
@@ -46,6 +46,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
public final class ExecutionServiceTest {
@Mock
@@ -54,14 +55,10 @@ public final class ExecutionServiceTest {
@Mock
private ConfigurationService configService;
- @Mock
- private JobScheduleController jobScheduleController;
-
private final ExecutionService executionService = new ExecutionService(null, "test_job");
@Before
public void setUp() throws NoSuchFieldException {
- MockitoAnnotations.initMocks(this);
ReflectionUtils.setFieldValue(executionService, "jobNodeStorage", jobNodeStorage);
ReflectionUtils.setFieldValue(executionService, "configService", configService);
}
@@ -160,7 +157,6 @@ public final class ExecutionServiceTest {
@Test
public void assertHasRunningItemsForAll() {
when(configService.load(true)).thenReturn(LiteJobConfiguration.newBuilder(new SimpleJobConfiguration(JobCoreConfiguration.newBuilder("test_job", "0/1 * * * * ?", 3).build())).build());
- when(jobNodeStorage.getJobNodeChildrenKeys("sharding")).thenReturn(Arrays.asList("0", "1", "2"));
when(jobNodeStorage.isJobNodeExisted("sharding/0/running")).thenReturn(false);
when(jobNodeStorage.isJobNodeExisted("sharding/1/running")).thenReturn(true);
assertTrue(executionService.hasRunningItems());
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/MonitorExecutionListenerManagerTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/MonitorExecutionListenerManagerTest.java
index 6d267ac..d9046cc 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/MonitorExecutionListenerManagerTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/MonitorExecutionListenerManagerTest.java
@@ -22,13 +22,15 @@ import org.apache.shardingsphere.elasticjob.lite.fixture.LiteJsonConstants;
import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import org.unitils.util.ReflectionUtils;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
+@RunWith(MockitoJUnitRunner.class)
public final class MonitorExecutionListenerManagerTest {
@Mock
@@ -41,7 +43,6 @@ public final class MonitorExecutionListenerManagerTest {
@Before
public void setUp() throws NoSuchFieldException {
- MockitoAnnotations.initMocks(this);
ReflectionUtils.setFieldValue(monitorExecutionListenerManager, monitorExecutionListenerManager.getClass().getSuperclass().getDeclaredField("jobNodeStorage"), jobNodeStorage);
ReflectionUtils.setFieldValue(monitorExecutionListenerManager, "executionService", executionService);
}
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingListenerManagerTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingListenerManagerTest.java
index dde5ca8..7f5abe6 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingListenerManagerTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingListenerManagerTest.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.elasticjob.lite.internal.sharding;
import org.apache.curator.framework.recipes.cache.TreeCacheEvent.Type;
-import org.apache.shardingsphere.elasticjob.lite.handler.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.lite.fixture.LiteJsonConstants;
+import org.apache.shardingsphere.elasticjob.lite.handler.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.lite.internal.listener.AbstractJobListener;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry;
import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobScheduleController;
@@ -27,14 +27,16 @@ import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage
import org.apache.shardingsphere.elasticjob.lite.reg.base.CoordinatorRegistryCenter;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import org.unitils.util.ReflectionUtils;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
+@RunWith(MockitoJUnitRunner.class)
public final class ShardingListenerManagerTest {
@Mock
@@ -55,7 +57,6 @@ public final class ShardingListenerManagerTest {
public void setUp() throws NoSuchFieldException {
JobRegistry.getInstance().addJobInstance("test_job", new JobInstance("127.0.0.1@-@0"));
shardingListenerManager = new ShardingListenerManager(null, "test_job");
- MockitoAnnotations.initMocks(this);
ReflectionUtils.setFieldValue(shardingListenerManager, shardingListenerManager.getClass().getSuperclass().getDeclaredField("jobNodeStorage"), jobNodeStorage);
ReflectionUtils.setFieldValue(shardingListenerManager, "shardingService", shardingService);
}
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingServiceTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingServiceTest.java
index d09122b..b3fd725 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingServiceTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingServiceTest.java
@@ -21,10 +21,10 @@ import org.apache.curator.framework.api.transaction.CuratorTransactionBridge;
import org.apache.curator.framework.api.transaction.CuratorTransactionFinal;
import org.apache.curator.framework.api.transaction.TransactionCreateBuilder;
import org.apache.curator.framework.api.transaction.TransactionDeleteBuilder;
-import org.apache.shardingsphere.elasticjob.lite.handler.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.lite.config.JobCoreConfiguration;
import org.apache.shardingsphere.elasticjob.lite.config.LiteJobConfiguration;
import org.apache.shardingsphere.elasticjob.lite.config.simple.SimpleJobConfiguration;
+import org.apache.shardingsphere.elasticjob.lite.handler.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.lite.internal.config.ConfigurationService;
import org.apache.shardingsphere.elasticjob.lite.internal.election.LeaderService;
import org.apache.shardingsphere.elasticjob.lite.internal.instance.InstanceNode;
@@ -37,8 +37,9 @@ import org.apache.shardingsphere.elasticjob.lite.internal.storage.TransactionExe
import org.apache.shardingsphere.elasticjob.lite.reg.base.CoordinatorRegistryCenter;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import org.unitils.util.ReflectionUtils;
import java.util.Arrays;
@@ -57,6 +58,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
public final class ShardingServiceTest {
@Mock
@@ -87,7 +89,6 @@ public final class ShardingServiceTest {
@Before
public void setUp() throws NoSuchFieldException {
- MockitoAnnotations.initMocks(this);
ReflectionUtils.setFieldValue(shardingService, "jobNodeStorage", jobNodeStorage);
ReflectionUtils.setFieldValue(shardingService, "leaderService", leaderService);
ReflectionUtils.setFieldValue(shardingService, "configService", configService);
@@ -242,7 +243,6 @@ public final class ShardingServiceTest {
TransactionDeleteBuilder transactionDeleteBuilder = mock(TransactionDeleteBuilder.class);
CuratorTransactionBridge curatorTransactionBridge = mock(CuratorTransactionBridge.class);
when(curatorTransactionFinal.create()).thenReturn(transactionCreateBuilder);
- when(configService.load(true)).thenReturn(LiteJobConfiguration.newBuilder(new SimpleJobConfiguration(JobCoreConfiguration.newBuilder("test_job", "0/1 * * * * ?", 3).build())).build());
when(transactionCreateBuilder.forPath("/test_job/sharding/0/instance", "host0@-@0".getBytes())).thenReturn(curatorTransactionBridge);
when(transactionCreateBuilder.forPath("/test_job/sharding/1/instance", "host0@-@0".getBytes())).thenReturn(curatorTransactionBridge);
when(transactionCreateBuilder.forPath("/test_job/sharding/2/instance", "host0@-@0".getBytes())).thenReturn(curatorTransactionBridge);
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/storage/JobNodeStorageTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/storage/JobNodeStorageTest.java
index bf9178b..683ca9b 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/storage/JobNodeStorageTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/storage/JobNodeStorageTest.java
@@ -30,8 +30,9 @@ import org.apache.curator.framework.state.ConnectionStateListener;
import org.apache.shardingsphere.elasticjob.lite.reg.base.CoordinatorRegistryCenter;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import org.unitils.util.ReflectionUtils;
import java.util.Arrays;
@@ -44,16 +45,17 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
public final class JobNodeStorageTest {
@Mock
private CoordinatorRegistryCenter regCenter;
- private JobNodeStorage jobNodeStorage = new JobNodeStorage(regCenter, "test_job");
+ private JobNodeStorage jobNodeStorage;
@Before
- public void initMocks() throws NoSuchFieldException {
- MockitoAnnotations.initMocks(this);
+ public void setUp() throws NoSuchFieldException {
+ jobNodeStorage = new JobNodeStorage(regCenter, "test_job");
ReflectionUtils.setFieldValue(jobNodeStorage, "regCenter", regCenter);
}
@@ -98,7 +100,6 @@ public final class JobNodeStorageTest {
@Test
public void assertCreateJobNodeIfRootJobNodeIsNotExist() {
when(regCenter.isExisted("/test_job")).thenReturn(false);
- when(regCenter.isExisted("/test_job/config")).thenReturn(true);
jobNodeStorage.createJobNodeIfNeeded("config");
verify(regCenter).isExisted("/test_job");
verify(regCenter, times(0)).isExisted("/test_job/config");
@@ -194,9 +195,6 @@ public final class JobNodeStorageTest {
when(curatorTransaction.check()).thenReturn(transactionCheckBuilder);
when(transactionCheckBuilder.forPath("/")).thenReturn(curatorTransactionBridge);
when(curatorTransactionBridge.and()).thenReturn(curatorTransactionFinal);
- TransactionCreateBuilder transactionCreateBuilder = mock(TransactionCreateBuilder.class);
- when(curatorTransactionFinal.create()).thenReturn(transactionCreateBuilder);
- when(transactionCreateBuilder.forPath("/test_transaction")).thenReturn(curatorTransactionBridge);
when(curatorTransactionBridge.and()).thenThrow(new RuntimeException());
jobNodeStorage.executeInTransaction(curatorTransactionFinalForCallback -> curatorTransactionFinalForCallback.create().forPath("/test_transaction").and());
verify(regCenter).getRawClient();
@@ -205,7 +203,6 @@ public final class JobNodeStorageTest {
verify(transactionCheckBuilder).forPath("/");
verify(curatorTransactionBridge, times(2)).and();
verify(curatorTransactionFinal).create();
- verify(transactionCreateBuilder).forPath("/test_transaction");
verify(curatorTransactionFinal, times(0)).commit();
}
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/util/env/HostExceptionTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/util/env/HostExceptionTest.java
index a05db7f..cbc370f 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/util/env/HostExceptionTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/util/env/HostExceptionTest.java
@@ -17,11 +17,11 @@
package org.apache.shardingsphere.elasticjob.lite.util.env;
-import org.hamcrest.core.Is;
import org.junit.Test;
import java.io.IOException;
+import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
public final class HostExceptionTest {
@@ -29,6 +29,6 @@ public final class HostExceptionTest {
@Test
public void assertGetCause() {
IOException cause = new IOException();
- assertThat(new HostException(cause).getCause(), Is.is(cause));
+ assertThat(new HostException(cause).getCause(), is(cause));
}
}
diff --git a/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/operate/JobOperateAPIImplTest.java b/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/operate/JobOperateAPIImplTest.java
index 799d412..4a37d4c 100644
--- a/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/operate/JobOperateAPIImplTest.java
+++ b/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/operate/JobOperateAPIImplTest.java
@@ -21,8 +21,9 @@ import org.apache.shardingsphere.elasticjob.lite.lifecycle.api.JobOperateAPI;
import org.apache.shardingsphere.elasticjob.lite.reg.base.CoordinatorRegistryCenter;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import java.util.Arrays;
import java.util.Collections;
@@ -32,6 +33,7 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
public final class JobOperateAPIImplTest {
private JobOperateAPI jobOperateAPI;
@@ -41,13 +43,11 @@ public final class JobOperateAPIImplTest {
@Before
public void setUp() {
- MockitoAnnotations.initMocks(this);
jobOperateAPI = new JobOperateAPIImpl(regCenter);
}
@Test
public void assertTriggerWithJobName() {
- when(regCenter.getChildrenKeys("/test_job/servers")).thenReturn(Arrays.asList("ip1", "ip2"));
when(regCenter.getChildrenKeys("/test_job/instances")).thenReturn(Arrays.asList("ip1@-@defaultInstance", "ip2@-@defaultInstance"));
jobOperateAPI.trigger("test_job");
verify(regCenter).getChildrenKeys("/test_job/instances");
@@ -109,7 +109,6 @@ public final class JobOperateAPIImplTest {
@Test
public void assertShutdownWithJobNameAndServerIp() {
- when(regCenter.getChildrenKeys("/test_job/servers")).thenReturn(Collections.singletonList("localhost"));
when(regCenter.getChildrenKeys("/test_job/instances")).thenReturn(Collections.singletonList("localhost@-@defaultInstance"));
jobOperateAPI.shutdown("test_job", "localhost");
verify(regCenter).remove("/test_job/instances/localhost@-@defaultInstance");
@@ -117,7 +116,6 @@ public final class JobOperateAPIImplTest {
@Test
public void assertShutdownWithJobName() {
- when(regCenter.getChildrenKeys("/test_job/servers")).thenReturn(Arrays.asList("ip1", "ip2"));
when(regCenter.getChildrenKeys("/test_job/instances")).thenReturn(Arrays.asList("ip1@-@defaultInstance", "ip2@-@defaultInstance"));
jobOperateAPI.shutdown("test_job", null);
verify(regCenter).getChildrenKeys("/test_job/instances");
@@ -137,7 +135,6 @@ public final class JobOperateAPIImplTest {
@Test
public void assertRemoveWithJobNameAndServerIp() {
- when(regCenter.getChildrenKeys("/test_job/servers")).thenReturn(Arrays.asList("ip1", "ip2"));
jobOperateAPI.remove("test_job", "ip1");
verify(regCenter).remove("/test_job/servers/ip1");
assertFalse(regCenter.isExisted("/test_job/servers/ip1"));
@@ -159,8 +156,6 @@ public final class JobOperateAPIImplTest {
@Test
public void assertRemoveWithServerIp() {
when(regCenter.getChildrenKeys("/")).thenReturn(Arrays.asList("test_job1", "test_job2"));
- when(regCenter.getChildrenKeys("/test_job1/servers")).thenReturn(Arrays.asList("ip1", "ip2"));
- when(regCenter.getChildrenKeys("/test_job2/servers")).thenReturn(Arrays.asList("ip1", "ip2"));
jobOperateAPI.remove(null, "ip1");
assertFalse(regCenter.isExisted("/test_job1/servers/ip1"));
assertFalse(regCenter.isExisted("/test_job2/servers/ip1"));
diff --git a/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/operate/ShardingOperateAPIImplTest.java b/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/operate/ShardingOperateAPIImplTest.java
index 541b44e..53ed385 100644
--- a/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/operate/ShardingOperateAPIImplTest.java
+++ b/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/operate/ShardingOperateAPIImplTest.java
@@ -21,14 +21,13 @@ import org.apache.shardingsphere.elasticjob.lite.lifecycle.api.ShardingOperateAP
import org.apache.shardingsphere.elasticjob.lite.reg.base.CoordinatorRegistryCenter;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.util.Arrays;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
public final class ShardingOperateAPIImplTest {
private ShardingOperateAPI shardingOperateAPI;
@@ -38,22 +37,17 @@ public final class ShardingOperateAPIImplTest {
@Before
public void setUp() {
- MockitoAnnotations.initMocks(this);
shardingOperateAPI = new ShardingOperateAPIImpl(regCenter);
}
@Test
public void assertDisableSharding() {
- when(regCenter.getChildrenKeys("/test_job/servers")).thenReturn(Arrays.asList("ip1", "ip2"));
- when(regCenter.getChildrenKeys("/test_job/sharding")).thenReturn(Arrays.asList("0", "1"));
shardingOperateAPI.disable("test_job", "0");
verify(regCenter).persist("/test_job/sharding/0/disabled", "");
}
@Test
public void assertEnableSharding() {
- when(regCenter.getChildrenKeys("/test_job/servers")).thenReturn(Arrays.asList("ip1", "ip2"));
- when(regCenter.getChildrenKeys("/test_job/sharding")).thenReturn(Arrays.asList("0", "1"));
shardingOperateAPI.enable("test_job", "0");
verify(regCenter).remove("/test_job/sharding/0/disabled");
}
diff --git a/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/settings/JobSettingsAPIImplTest.java b/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/settings/JobSettingsAPIImplTest.java
index 95f38a9..a4c1b04 100644
--- a/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/settings/JobSettingsAPIImplTest.java
+++ b/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/settings/JobSettingsAPIImplTest.java
@@ -23,8 +23,9 @@ import org.apache.shardingsphere.elasticjob.lite.lifecycle.fixture.LifecycleJson
import org.apache.shardingsphere.elasticjob.lite.reg.base.CoordinatorRegistryCenter;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertFalse;
@@ -33,7 +34,8 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-public class JobSettingsAPIImplTest {
+@RunWith(MockitoJUnitRunner.class)
+public final class JobSettingsAPIImplTest {
private JobSettingsAPI jobSettingsAPI;
@@ -42,7 +44,6 @@ public class JobSettingsAPIImplTest {
@Before
public void setUp() {
- MockitoAnnotations.initMocks(this);
jobSettingsAPI = new JobSettingsAPIImpl(regCenter);
}
@@ -87,7 +88,6 @@ public class JobSettingsAPIImplTest {
@Test
public void assertUpdateJobSettings() {
- when(regCenter.get("/test_job/config")).thenReturn(LifecycleJsonConstants.getDataflowJobJson());
JobSettings jobSettings = new JobSettings();
jobSettings.setJobName("test_job");
jobSettings.setShardingTotalCount(10);
@@ -130,7 +130,6 @@ public class JobSettingsAPIImplTest {
@Test
public void assertRemoveJobSettings() {
- when(regCenter.get("/test_job/config")).thenReturn(LifecycleJsonConstants.getScriptJobJson());
jobSettingsAPI.removeJobSettings("test_job");
verify(regCenter).remove("/test_job");
}
diff --git a/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/statistics/JobStatisticsAPIImplTest.java b/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/statistics/JobStatisticsAPIImplTest.java
index c1da7be..6fd23c8 100644
--- a/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/statistics/JobStatisticsAPIImplTest.java
+++ b/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/statistics/JobStatisticsAPIImplTest.java
@@ -21,11 +21,11 @@ import org.apache.shardingsphere.elasticjob.lite.lifecycle.api.JobStatisticsAPI;
import org.apache.shardingsphere.elasticjob.lite.lifecycle.domain.JobBriefInfo;
import org.apache.shardingsphere.elasticjob.lite.lifecycle.fixture.LifecycleJsonConstants;
import org.apache.shardingsphere.elasticjob.lite.reg.base.CoordinatorRegistryCenter;
-import com.google.common.collect.Lists;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import java.util.Arrays;
import java.util.Collections;
@@ -34,6 +34,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
public final class JobStatisticsAPIImplTest {
private JobStatisticsAPI jobStatisticsAPI;
@@ -43,7 +44,6 @@ public final class JobStatisticsAPIImplTest {
@Before
public void setUp() {
- MockitoAnnotations.initMocks(this);
jobStatisticsAPI = new JobStatisticsAPIImpl(regCenter);
}
@@ -55,7 +55,6 @@ public final class JobStatisticsAPIImplTest {
@Test
public void assertGetOKJobBriefInfo() {
- when(regCenter.getChildrenKeys("/")).thenReturn(Lists.newArrayList("test_job"));
when(regCenter.get("/test_job/config")).thenReturn(LifecycleJsonConstants.getSimpleJobJson("test_job", "desc"));
when(regCenter.getChildrenKeys("/test_job/servers")).thenReturn(Arrays.asList("ip1", "ip2"));
when(regCenter.getChildrenKeys("/test_job/instances")).thenReturn(Arrays.asList("ip1@-@defaultInstance", "ip2@-@defaultInstance"));
@@ -75,7 +74,6 @@ public final class JobStatisticsAPIImplTest {
@Test
public void assertGetOKJobBriefInfoWithPartialDisabledServer() {
- when(regCenter.getChildrenKeys("/")).thenReturn(Lists.newArrayList("test_job"));
when(regCenter.get("/test_job/config")).thenReturn(LifecycleJsonConstants.getSimpleJobJson("test_job", "desc"));
when(regCenter.getChildrenKeys("/test_job/servers")).thenReturn(Arrays.asList("ip1", "ip2"));
when(regCenter.get("/test_job/servers/ip1")).thenReturn("DISABLED");
@@ -89,22 +87,17 @@ public final class JobStatisticsAPIImplTest {
@Test
public void assertGetDisabledJobBriefInfo() {
- when(regCenter.getChildrenKeys("/")).thenReturn(Lists.newArrayList("test_job"));
when(regCenter.get("/test_job/config")).thenReturn(LifecycleJsonConstants.getSimpleJobJson("test_job", "desc"));
when(regCenter.getChildrenKeys("/test_job/servers")).thenReturn(Arrays.asList("ip1", "ip2"));
when(regCenter.get("/test_job/servers/ip1")).thenReturn("DISABLED");
when(regCenter.get("/test_job/servers/ip2")).thenReturn("DISABLED");
when(regCenter.getChildrenKeys("/test_job/instances")).thenReturn(Arrays.asList("ip1@-@defaultInstance", "ip2@-@defaultInstance"));
- when(regCenter.getChildrenKeys("/test_job/sharding")).thenReturn(Arrays.asList("0", "1"));
- when(regCenter.get("/test_job/sharding/0/instance")).thenReturn("ip1@-@defaultInstance");
- when(regCenter.get("/test_job/sharding/1/instance")).thenReturn("ip2@-@defaultInstance");
JobBriefInfo jobBrief = jobStatisticsAPI.getJobBriefInfo("test_job");
assertThat(jobBrief.getStatus(), is(JobBriefInfo.JobStatus.DISABLED));
}
@Test
public void assertGetShardingErrorJobBriefInfo() {
- when(regCenter.getChildrenKeys("/")).thenReturn(Lists.newArrayList("test_job"));
when(regCenter.get("/test_job/config")).thenReturn(LifecycleJsonConstants.getSimpleJobJson("test_job", "desc"));
when(regCenter.getChildrenKeys("/test_job/servers")).thenReturn(Arrays.asList("ip1", "ip2"));
when(regCenter.getChildrenKeys("/test_job/instances")).thenReturn(Arrays.asList("ip1@-@defaultInstance", "ip2@-@defaultInstance"));
@@ -118,9 +111,7 @@ public final class JobStatisticsAPIImplTest {
@Test
public void assertGetCrashedJobBriefInfo() {
- when(regCenter.getChildrenKeys("/")).thenReturn(Lists.newArrayList("test_job"));
when(regCenter.get("/test_job/config")).thenReturn(LifecycleJsonConstants.getSimpleJobJson("test_job", "desc"));
- when(regCenter.getChildrenKeys("/test_job/servers")).thenReturn(Arrays.asList("ip1", "ip2"));
JobBriefInfo jobBrief = jobStatisticsAPI.getJobBriefInfo("test_job");
assertThat(jobBrief.getStatus(), is(JobBriefInfo.JobStatus.CRASHED));
}
@@ -161,9 +152,6 @@ public final class JobStatisticsAPIImplTest {
@Test
public void assertGetJobsBriefInfoByIp() {
when(regCenter.getChildrenKeys("/")).thenReturn(Arrays.asList("test_job_1", "test_job_2", "test_job_3"));
- when(regCenter.getChildrenKeys("/test_job_1/servers")).thenReturn(Collections.singletonList("ip1"));
- when(regCenter.getChildrenKeys("/test_job_2/servers")).thenReturn(Collections.singletonList("ip1"));
- when(regCenter.getChildrenKeys("/test_job_3/servers")).thenReturn(Collections.singletonList("ip1"));
when(regCenter.isExisted("/test_job_1/servers/ip1")).thenReturn(true);
when(regCenter.isExisted("/test_job_2/servers/ip1")).thenReturn(true);
when(regCenter.get("/test_job_2/servers/ip1")).thenReturn("DISABLED");
diff --git a/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/statistics/ServerStatisticsAPIImplTest.java b/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/statistics/ServerStatisticsAPIImplTest.java
index 1c90f9a..f9b94a3 100644
--- a/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/statistics/ServerStatisticsAPIImplTest.java
+++ b/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/statistics/ServerStatisticsAPIImplTest.java
@@ -22,8 +22,9 @@ import org.apache.shardingsphere.elasticjob.lite.lifecycle.domain.ServerBriefInf
import org.apache.shardingsphere.elasticjob.lite.reg.base.CoordinatorRegistryCenter;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import java.util.Arrays;
import java.util.Collections;
@@ -33,6 +34,7 @@ import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
public final class ServerStatisticsAPIImplTest {
private ServerStatisticsAPI serverStatisticsAPI;
@@ -42,7 +44,6 @@ public final class ServerStatisticsAPIImplTest {
@Before
public void setUp() {
- MockitoAnnotations.initMocks(this);
serverStatisticsAPI = new ServerStatisticsAPIImpl(regCenter);
}
diff --git a/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/statistics/ShardingStatisticsAPIImplTest.java b/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/statistics/ShardingStatisticsAPIImplTest.java
index 036f29a..0d3ca4e 100644
--- a/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/statistics/ShardingStatisticsAPIImplTest.java
+++ b/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/statistics/ShardingStatisticsAPIImplTest.java
@@ -22,8 +22,9 @@ import org.apache.shardingsphere.elasticjob.lite.lifecycle.domain.ShardingInfo;
import org.apache.shardingsphere.elasticjob.lite.reg.base.CoordinatorRegistryCenter;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import java.util.Arrays;
@@ -32,6 +33,7 @@ import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
public final class ShardingStatisticsAPIImplTest {
private ShardingStatisticsAPI shardingStatisticsAPI;
@@ -41,13 +43,11 @@ public final class ShardingStatisticsAPIImplTest {
@Before
public void setUp() {
- MockitoAnnotations.initMocks(this);
shardingStatisticsAPI = new ShardingStatisticsAPIImpl(regCenter);
}
@Test
public void assertGetShardingInfo() {
- when(regCenter.isExisted("/test_job/sharding")).thenReturn(true);
when(regCenter.getChildrenKeys("/test_job/sharding")).thenReturn(Arrays.asList("0", "1", "2", "3"));
when(regCenter.get("/test_job/sharding/0/instance")).thenReturn("ip1@-@1234");
when(regCenter.get("/test_job/sharding/1/instance")).thenReturn("ip2@-@2341");
diff --git a/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/restful/RestfulServerTest.java b/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/restful/RestfulServerTest.java
index 4966127..510b130 100644
--- a/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/restful/RestfulServerTest.java
+++ b/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/restful/RestfulServerTest.java
@@ -23,19 +23,21 @@ import org.apache.shardingsphere.elasticjob.lite.lifecycle.restful.fixture.TestR
import org.eclipse.jetty.client.ContentExchange;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.io.ByteArrayBuffer;
-import org.hamcrest.core.Is;
import org.hamcrest.core.StringStartsWith;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Mockito;
+import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import javax.ws.rs.core.MediaType;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.verify;
+
@RunWith(MockitoJUnitRunner.class)
public final class RestfulServerTest {
@@ -43,6 +45,7 @@ public final class RestfulServerTest {
private static RESTfulAPIServer server;
+ @Mock
private Caller caller;
@BeforeClass
@@ -59,25 +62,24 @@ public final class RestfulServerTest {
@Before
public void setUp() {
- caller = Mockito.mock(Caller.class);
TestRESTfulApi.setCaller(caller);
}
@Test
public void assertCallSuccess() throws Exception {
ContentExchange actual = sentRequest("{\"string\":\"test\",\"integer\":1}");
- Assert.assertThat(actual.getResponseStatus(), Is.is(200));
- Assert.assertThat(actual.getResponseContent(), Is.is("{\"string\":\"test_processed\",\"integer\":\"1_processed\"}"));
- Mockito.verify(caller).call("test");
- Mockito.verify(caller).call(1);
+ assertThat(actual.getResponseStatus(), is(200));
+ assertThat(actual.getResponseContent(), is("{\"string\":\"test_processed\",\"integer\":\"1_processed\"}"));
+ verify(caller).call("test");
+ verify(caller).call(1);
}
@Test
public void assertCallFailure() throws Exception {
ContentExchange actual = sentRequest("{\"string\":\"test\",\"integer\":\"invalid_number\"}");
- Assert.assertThat(actual.getResponseStatus(), Is.is(500));
- Assert.assertThat(actual.getResponseContent(), StringStartsWith.startsWith("java.lang.NumberFormatException"));
- Mockito.verify(caller).call("test");
+ assertThat(actual.getResponseStatus(), is(500));
+ assertThat(actual.getResponseContent(), StringStartsWith.startsWith("java.lang.NumberFormatException"));
+ verify(caller).call("test");
}
private static ContentExchange sentRequest(final String content) throws Exception {