diff --git a/elasticjob-api/src/test/java/org/apache/shardingsphere/elasticjob/annotation/ElasticJobConfigurationTest.java b/elasticjob-api/src/test/java/org/apache/shardingsphere/elasticjob/annotation/ElasticJobConfigurationTest.java index 7e0f4ebca1..e7dd40b40e 100644 --- a/elasticjob-api/src/test/java/org/apache/shardingsphere/elasticjob/annotation/ElasticJobConfigurationTest.java +++ b/elasticjob-api/src/test/java/org/apache/shardingsphere/elasticjob/annotation/ElasticJobConfigurationTest.java @@ -17,16 +17,17 @@ package org.apache.shardingsphere.elasticjob.annotation; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertArrayEquals; -import static org.hamcrest.MatcherAssert.assertThat; +import org.apache.shardingsphere.elasticjob.annotation.job.impl.SimpleTestJob; +import org.apache.shardingsphere.elasticjob.api.JobExtraConfigurationFactory; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.LinkedList; import java.util.Queue; -import org.apache.shardingsphere.elasticjob.annotation.job.impl.SimpleTestJob; -import org.apache.shardingsphere.elasticjob.api.JobExtraConfigurationFactory; -import org.junit.Test; + +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; public final class ElasticJobConfigurationTest { diff --git a/elasticjob-api/src/test/java/org/apache/shardingsphere/elasticjob/api/JobConfigurationTest.java b/elasticjob-api/src/test/java/org/apache/shardingsphere/elasticjob/api/JobConfigurationTest.java index 700fdc798c..b275af4120 100644 --- a/elasticjob-api/src/test/java/org/apache/shardingsphere/elasticjob/api/JobConfigurationTest.java +++ b/elasticjob-api/src/test/java/org/apache/shardingsphere/elasticjob/api/JobConfigurationTest.java @@ -17,13 +17,14 @@ package org.apache.shardingsphere.elasticjob.api; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class JobConfigurationTest { @@ -81,13 +82,15 @@ public void assertBuildRequiredProperties() { assertFalse(actual.isOverwrite()); } - @Test(expected = IllegalArgumentException.class) + @Test public void assertBuildWithEmptyJobName() { - JobConfiguration.newBuilder("", 3).cron("0/1 * * * * ?").build(); + assertThrows(IllegalArgumentException.class, () -> + JobConfiguration.newBuilder("", 3).cron("0/1 * * * * ?").build()); } - - @Test(expected = IllegalArgumentException.class) + + @Test public void assertBuildWithInvalidShardingTotalCount() { - JobConfiguration.newBuilder("test_job", -1).cron("0/1 * * * * ?").build(); + assertThrows(IllegalArgumentException.class, () -> + JobConfiguration.newBuilder("test_job", -1).cron("0/1 * * * * ?").build()); } } diff --git a/elasticjob-cloud/elasticjob-cloud-common/pom.xml b/elasticjob-cloud/elasticjob-cloud-common/pom.xml index b7255cf6b4..2b5eb46e0f 100755 --- a/elasticjob-cloud/elasticjob-cloud-common/pom.xml +++ b/elasticjob-cloud/elasticjob-cloud-common/pom.xml @@ -102,14 +102,6 @@ org.apache.curator curator-test - - org.mockito - mockito-core - - - org.mockito - mockito-inline - org.slf4j diff --git a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/config/pojo/CloudJobConfigurationPOJOTest.java b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/config/pojo/CloudJobConfigurationPOJOTest.java index 0d50aef213..eabc0dfe3a 100644 --- a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/config/pojo/CloudJobConfigurationPOJOTest.java +++ b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/config/pojo/CloudJobConfigurationPOJOTest.java @@ -21,13 +21,13 @@ import org.apache.shardingsphere.elasticjob.cloud.config.CloudJobConfiguration; import org.apache.shardingsphere.elasticjob.cloud.config.CloudJobExecutionType; import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class CloudJobConfigurationPOJOTest { diff --git a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/statistics/rdb/StatisticRdbRepositoryTest.java b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/statistics/rdb/StatisticRdbRepositoryTest.java index 97ba36e00f..e18977d85c 100755 --- a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/statistics/rdb/StatisticRdbRepositoryTest.java +++ b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/statistics/rdb/StatisticRdbRepositoryTest.java @@ -23,23 +23,23 @@ import org.apache.shardingsphere.elasticjob.cloud.statistics.type.job.JobRunningStatistics; import org.apache.shardingsphere.elasticjob.cloud.statistics.type.task.TaskResultStatistics; import org.apache.shardingsphere.elasticjob.cloud.statistics.type.task.TaskRunningStatistics; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.sql.SQLException; import java.util.Date; import java.util.Optional; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class StatisticRdbRepositoryTest { private StatisticRdbRepository repository; - @Before + @BeforeEach public void setup() throws SQLException { BasicDataSource dataSource = new BasicDataSource(); dataSource.setDriverClassName(org.h2.Driver.class.getName()); diff --git a/elasticjob-cloud/elasticjob-cloud-executor/pom.xml b/elasticjob-cloud/elasticjob-cloud-executor/pom.xml index 0aec8a88b3..f1d8ccb39e 100755 --- a/elasticjob-cloud/elasticjob-cloud-executor/pom.xml +++ b/elasticjob-cloud/elasticjob-cloud-executor/pom.xml @@ -50,14 +50,6 @@ org.projectlombok lombok - - org.mockito - mockito-core - - - org.mockito - mockito-inline - com.h2database h2 diff --git a/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/facade/CloudJobFacadeTest.java b/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/facade/CloudJobFacadeTest.java index d7436915ba..eae59825fd 100755 --- a/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/facade/CloudJobFacadeTest.java +++ b/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/facade/CloudJobFacadeTest.java @@ -27,21 +27,21 @@ import org.apache.shardingsphere.elasticjob.tracing.JobTracingEventBus; import org.apache.shardingsphere.elasticjob.tracing.event.JobExecutionEvent; import org.apache.shardingsphere.elasticjob.tracing.event.JobStatusTraceEvent.State; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.HashMap; import java.util.Map; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class CloudJobFacadeTest { private ShardingContexts shardingContexts; @@ -51,7 +51,7 @@ public final class CloudJobFacadeTest { private JobFacade jobFacade; - @Before + @BeforeEach public void setUp() { shardingContexts = getShardingContexts(); jobFacade = new CloudJobFacade(shardingContexts, getJobConfiguration(), jobTracingEventBus); diff --git a/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/local/LocalTaskExecutorTest.java b/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/local/LocalTaskExecutorTest.java index c62785d5a9..c01e68fd4f 100755 --- a/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/local/LocalTaskExecutorTest.java +++ b/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/local/LocalTaskExecutorTest.java @@ -23,13 +23,14 @@ import org.apache.shardingsphere.elasticjob.dataflow.props.DataflowJobProperties; import org.apache.shardingsphere.elasticjob.infra.exception.JobConfigurationException; import org.apache.shardingsphere.elasticjob.script.props.ScriptJobProperties; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collections; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; public final class LocalTaskExecutorTest { @@ -56,8 +57,9 @@ public void assertScriptJob() { .cron("*/2 * * * * ?").setProperty(ScriptJobProperties.SCRIPT_KEY, "echo test").build(), 1).execute(); } - @Test(expected = JobConfigurationException.class) + @Test public void assertNotExistsJobType() { - new LocalTaskExecutor("not exist", JobConfiguration.newBuilder("not exist", 3).cron("*/2 * * * * ?").build(), 1).execute(); + assertThrows(JobConfigurationException.class, () -> + new LocalTaskExecutor("not exist", JobConfiguration.newBuilder("not exist", 3).cron("*/2 * * * * ?").build(), 1).execute()); } } diff --git a/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/prod/DaemonTaskSchedulerTest.java b/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/prod/DaemonTaskSchedulerTest.java index e986d344b4..cd0a24a7df 100755 --- a/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/prod/DaemonTaskSchedulerTest.java +++ b/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/prod/DaemonTaskSchedulerTest.java @@ -29,22 +29,22 @@ import org.apache.shardingsphere.elasticjob.infra.context.ExecutionType; import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; import org.apache.shardingsphere.elasticjob.script.props.ScriptJobProperties; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.quartz.JobExecutionContext; import java.lang.reflect.Field; import java.util.concurrent.ConcurrentHashMap; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class DaemonTaskSchedulerTest { @Mock @@ -69,7 +69,7 @@ public final class DaemonTaskSchedulerTest { private DaemonJob daemonJob; - @Before + @BeforeEach public void setUp() { daemonJob = new DaemonJob(); daemonJob.setJobFacade(jobFacade); diff --git a/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/prod/TaskExecutorTest.java b/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/prod/TaskExecutorTest.java index ad486cd282..a623379b8f 100755 --- a/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/prod/TaskExecutorTest.java +++ b/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/prod/TaskExecutorTest.java @@ -28,22 +28,22 @@ import org.apache.mesos.Protos.TaskID; import org.apache.mesos.Protos.TaskInfo; import org.apache.shardingsphere.elasticjob.cloud.executor.fixture.TestSimpleJob; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.lang.reflect.Field; import java.util.HashMap; import java.util.concurrent.ExecutorService; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertNull; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class TaskExecutorTest { @Mock @@ -60,7 +60,7 @@ public final class TaskExecutorTest { private TaskExecutor taskExecutor; - @Before + @BeforeEach public void setUp() { taskExecutor = new TaskExecutor(new TestSimpleJob()); setExecutorService(); diff --git a/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/prod/TaskExecutorThreadTest.java b/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/prod/TaskExecutorThreadTest.java index b958696162..335ffab01b 100755 --- a/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/prod/TaskExecutorThreadTest.java +++ b/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/prod/TaskExecutorThreadTest.java @@ -32,17 +32,17 @@ import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO; import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; import org.apache.shardingsphere.elasticjob.script.props.ScriptJobProperties; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Collections; import java.util.LinkedHashMap; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class TaskExecutorThreadTest { @Mock diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/pom.xml b/elasticjob-cloud/elasticjob-cloud-scheduler/pom.xml index e0443c16db..c2b9c0bb28 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/pom.xml +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/pom.xml @@ -98,14 +98,6 @@ org.apache.curator curator-test - - org.mockito - mockito-core - - - org.mockito - mockito-inline - com.h2database h2 diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/console/AbstractCloudControllerTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/console/AbstractCloudControllerTest.java index 6553ede101..7215f7a570 100644 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/console/AbstractCloudControllerTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/console/AbstractCloudControllerTest.java @@ -32,16 +32,16 @@ import org.apache.shardingsphere.elasticjob.restful.NettyRestfulService; import org.apache.shardingsphere.elasticjob.restful.NettyRestfulServiceConfiguration; import org.apache.shardingsphere.elasticjob.restful.RestfulService; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public abstract class AbstractCloudControllerTest { @Getter(AccessLevel.PROTECTED) @@ -56,7 +56,7 @@ public abstract class AbstractCloudControllerTest { private static RestfulService slaveServer; - @BeforeClass + @BeforeAll public static void setUpClass() { initRestfulServer(); initMesosServer(); @@ -85,7 +85,7 @@ private static void initMesosServer() { slaveServer.startup(); } - @AfterClass + @AfterAll public static void tearDown() { consoleBootstrap.stop(); masterServer.shutdown(); @@ -93,7 +93,7 @@ public static void tearDown() { MesosStateService.deregister(); } - @Before + @BeforeEach public void setUp() { reset(regCenter); reset(jobEventRdbSearch); diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/console/controller/CloudAppControllerTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/console/controller/CloudAppControllerTest.java index e4f4e8c628..65873c4d80 100644 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/console/controller/CloudAppControllerTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/console/controller/CloudAppControllerTest.java @@ -21,9 +21,9 @@ import org.apache.shardingsphere.elasticjob.cloud.console.HttpTestUtil; import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.CloudAppJsonConstants; import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.CloudJsonConstants; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Collections; import java.util.HashMap; @@ -34,7 +34,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class CloudAppControllerTest extends AbstractCloudControllerTest { private static final String YAML = "appCacheEnable: true\n" diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/console/controller/CloudJobControllerTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/console/controller/CloudJobControllerTest.java index 9752437d55..bfa30436cb 100644 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/console/controller/CloudJobControllerTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/console/controller/CloudJobControllerTest.java @@ -32,9 +32,9 @@ import org.apache.shardingsphere.elasticjob.infra.context.TaskContext; import org.apache.shardingsphere.elasticjob.infra.json.GsonFactory; import org.apache.shardingsphere.elasticjob.tracing.event.JobExecutionEvent; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Collection; import java.util.Collections; @@ -48,7 +48,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class CloudJobControllerTest extends AbstractCloudControllerTest { private static final String YAML = "appName: test_app\n" diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/console/controller/CloudLoginTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/console/controller/CloudLoginTest.java index 957dbe38d1..67197221ca 100644 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/console/controller/CloudLoginTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/console/controller/CloudLoginTest.java @@ -25,9 +25,9 @@ import org.apache.shardingsphere.elasticjob.cloud.console.security.AuthenticationConstants; import org.apache.shardingsphere.elasticjob.cloud.console.security.AuthenticationService; import org.apache.shardingsphere.elasticjob.infra.json.GsonFactory; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; import java.io.IOException; import java.util.HashMap; @@ -36,7 +36,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class CloudLoginTest extends AbstractCloudControllerTest { @Test diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/console/controller/CloudOperationControllerTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/console/controller/CloudOperationControllerTest.java index 2dd6ceb86f..d39f9cd0b8 100644 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/console/controller/CloudOperationControllerTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/console/controller/CloudOperationControllerTest.java @@ -19,17 +19,17 @@ import org.apache.shardingsphere.elasticjob.cloud.ReflectionUtils; import org.apache.shardingsphere.elasticjob.cloud.console.AbstractCloudControllerTest; -import org.apache.shardingsphere.elasticjob.cloud.scheduler.ha.HANode; import org.apache.shardingsphere.elasticjob.cloud.console.HttpTestUtil; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.apache.shardingsphere.elasticjob.cloud.scheduler.ha.HANode; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class CloudOperationControllerTest extends AbstractCloudControllerTest { @Test diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/console/controller/search/JobEventRdbSearchTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/console/controller/search/JobEventRdbSearchTest.java index 87d9b0fdca..2d7315acdc 100644 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/console/controller/search/JobEventRdbSearchTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/console/controller/search/JobEventRdbSearchTest.java @@ -20,11 +20,11 @@ import lombok.SneakyThrows; import org.apache.shardingsphere.elasticjob.tracing.event.JobExecutionEvent; import org.apache.shardingsphere.elasticjob.tracing.event.JobStatusTraceEvent; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import javax.sql.DataSource; import java.sql.Connection; @@ -40,7 +40,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class JobEventRdbSearchTest { @Mock @@ -48,8 +48,9 @@ public final class JobEventRdbSearchTest { @Mock private PreparedStatement preparedStatement; - - @Mock + + // TODO We should not use `Mock.Strictness.LENIENT` here, but the default. This is a flaw in the unit test design. + @Mock(strictness = Mock.Strictness.LENIENT) private ResultSet resultSet; @Mock @@ -59,7 +60,7 @@ public final class JobEventRdbSearchTest { private JobEventRdbSearch jobEventRdbSearch; - @Before + @BeforeEach public void setUp() throws Exception { jobEventRdbSearch = new JobEventRdbSearch(dataSource); when(dataSource.getConnection()).thenReturn(conn); diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/config/app/CloudAppConfigurationListenerTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/config/app/CloudAppConfigurationListenerTest.java index 2a5a005871..91ae56658a 100644 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/config/app/CloudAppConfigurationListenerTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/config/app/CloudAppConfigurationListenerTest.java @@ -27,19 +27,19 @@ import org.apache.shardingsphere.elasticjob.cloud.scheduler.producer.ProducerManager; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperConfiguration; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCenter; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentMatchers; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class CloudAppConfigurationListenerTest { private static ZookeeperRegistryCenter regCenter; @@ -53,7 +53,7 @@ public final class CloudAppConfigurationListenerTest { @InjectMocks private CloudAppConfigurationListener cloudAppConfigurationListener; - @Before + @BeforeEach public void setUp() { ReflectionUtils.setFieldValue(cloudAppConfigurationListener, "producerManager", producerManager); ReflectionUtils.setFieldValue(cloudAppConfigurationListener, "mesosStateService", mesosStateService); diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/config/app/CloudAppConfigurationNodeTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/config/app/CloudAppConfigurationNodeTest.java index ca8a814783..fb4372febb 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/config/app/CloudAppConfigurationNodeTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/config/app/CloudAppConfigurationNodeTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.cloud.scheduler.config.app; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/config/app/CloudAppConfigurationServiceTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/config/app/CloudAppConfigurationServiceTest.java index d8e4d6694d..de655e58b8 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/config/app/CloudAppConfigurationServiceTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/config/app/CloudAppConfigurationServiceTest.java @@ -21,24 +21,24 @@ import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.CloudAppConfigurationBuilder; import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.CloudAppJsonConstants; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Arrays; import java.util.Collection; import java.util.Optional; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class CloudAppConfigurationServiceTest { private static final String YAML = "appCacheEnable: true\n" diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/config/app/pojo/CloudAppConfigurationPOJOTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/config/app/pojo/CloudAppConfigurationPOJOTest.java index d5d64edcdf..d9e39339c9 100644 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/config/app/pojo/CloudAppConfigurationPOJOTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/config/app/pojo/CloudAppConfigurationPOJOTest.java @@ -18,11 +18,11 @@ package org.apache.shardingsphere.elasticjob.cloud.scheduler.config.app.pojo; import org.apache.shardingsphere.elasticjob.cloud.scheduler.config.app.CloudAppConfiguration; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class CloudAppConfigurationPOJOTest { diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/config/job/CloudJobConfigurationListenerTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/config/job/CloudJobConfigurationListenerTest.java index 71011aa59e..328e2c09e0 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/config/job/CloudJobConfigurationListenerTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/config/job/CloudJobConfigurationListenerTest.java @@ -27,20 +27,20 @@ import org.apache.shardingsphere.elasticjob.cloud.scheduler.state.ready.ReadyService; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperConfiguration; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCenter; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentMatchers; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Collections; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class CloudJobConfigurationListenerTest { private static ZookeeperRegistryCenter regCenter; @@ -54,7 +54,7 @@ public final class CloudJobConfigurationListenerTest { @InjectMocks private CloudJobConfigurationListener cloudJobConfigurationListener; - @Before + @BeforeEach public void setUp() { ReflectionUtils.setFieldValue(cloudJobConfigurationListener, "producerManager", producerManager); ReflectionUtils.setFieldValue(cloudJobConfigurationListener, "readyService", readyService); diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/config/job/CloudJobConfigurationNodeTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/config/job/CloudJobConfigurationNodeTest.java index c09ceb2460..5045f5e471 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/config/job/CloudJobConfigurationNodeTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/config/job/CloudJobConfigurationNodeTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.cloud.scheduler.config.job; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/config/job/CloudJobConfigurationServiceTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/config/job/CloudJobConfigurationServiceTest.java index 8895e71710..fb7cb50034 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/config/job/CloudJobConfigurationServiceTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/config/job/CloudJobConfigurationServiceTest.java @@ -21,24 +21,24 @@ import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.CloudJobConfigurationBuilder; import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.CloudJsonConstants; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Arrays; import java.util.Collection; import java.util.Optional; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class CloudJobConfigurationServiceTest { private static final String YAML = "appName: test_app\n" diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/context/JobContextTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/context/JobContextTest.java index 1cc83e307d..7d820a004c 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/context/JobContextTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/context/JobContextTest.java @@ -20,7 +20,7 @@ import org.apache.shardingsphere.elasticjob.infra.context.ExecutionType; import org.apache.shardingsphere.elasticjob.cloud.config.CloudJobConfiguration; import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.CloudJobConfigurationBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/env/BootstrapEnvironmentTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/env/BootstrapEnvironmentTest.java index e95d6de01f..1fb00a26a6 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/env/BootstrapEnvironmentTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/env/BootstrapEnvironmentTest.java @@ -20,7 +20,7 @@ import org.apache.commons.dbcp2.BasicDataSource; import org.apache.shardingsphere.elasticjob.cloud.ReflectionUtils; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperConfiguration; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Map; import java.util.Optional; @@ -28,8 +28,8 @@ import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertFalse; public final class BootstrapEnvironmentTest { diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/ha/FrameworkIDServiceTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/ha/FrameworkIDServiceTest.java index 8c1148b5b1..db0cf36921 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/ha/FrameworkIDServiceTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/ha/FrameworkIDServiceTest.java @@ -18,21 +18,21 @@ package org.apache.shardingsphere.elasticjob.cloud.scheduler.ha; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Optional; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class FrameworkIDServiceTest { @Mock @@ -40,7 +40,7 @@ public class FrameworkIDServiceTest { private FrameworkIDService frameworkIDService; - @Before + @BeforeEach public void init() { frameworkIDService = new FrameworkIDService(registryCenter); } diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/AppConstraintEvaluatorTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/AppConstraintEvaluatorTest.java index d7e7dd8ed4..c8db6d3e0f 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/AppConstraintEvaluatorTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/AppConstraintEvaluatorTest.java @@ -31,10 +31,10 @@ import org.apache.shardingsphere.elasticjob.cloud.scheduler.mesos.MesosStateService.ExecutorStateInfo; import org.apache.shardingsphere.elasticjob.infra.context.ExecutionType; import org.apache.shardingsphere.elasticjob.infra.context.TaskContext; -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.stubbing.Answer; import java.util.ArrayList; @@ -45,7 +45,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -63,19 +63,19 @@ public final class AppConstraintEvaluatorTest { private TaskScheduler taskScheduler; - @BeforeClass + @BeforeAll public static void init() { facadeService = mock(FacadeService.class); AppConstraintEvaluator.init(facadeService); } - @Before + @BeforeEach public void setUp() { taskScheduler = new TaskScheduler.Builder().withLeaseOfferExpirySecs(1000000000L).withLeaseRejectAction(virtualMachineLease -> { }).build(); } - @After + @AfterEach public void tearDown() { AppConstraintEvaluator.getInstance().clearAppRunningState(); } diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/FacadeServiceTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/FacadeServiceTest.java index 0c3b321519..21f72f1b59 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/FacadeServiceTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/FacadeServiceTest.java @@ -39,11 +39,11 @@ import org.apache.shardingsphere.elasticjob.infra.context.TaskContext; import org.apache.shardingsphere.elasticjob.infra.context.TaskContext.MetaInfo; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Arrays; import java.util.Collection; @@ -51,14 +51,14 @@ import java.util.Optional; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class FacadeServiceTest { @Mock @@ -90,7 +90,7 @@ public final class FacadeServiceTest { private FacadeService facadeService; - @Before + @BeforeEach public void setUp() { facadeService = new FacadeService(regCenter); ReflectionUtils.setFieldValue(facadeService, "jobConfigService", jobConfigService); diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/JobTaskRequestTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/JobTaskRequestTest.java index accda6d870..7129fdf37e 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/JobTaskRequestTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/JobTaskRequestTest.java @@ -22,13 +22,13 @@ import org.apache.shardingsphere.elasticjob.infra.context.TaskContext; import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.CloudJobConfigurationBuilder; import org.hamcrest.core.StringStartsWith; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collections; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertNull; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertNull; public final class JobTaskRequestTest { diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/LaunchingTasksTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/LaunchingTasksTest.java index 83f8c94b70..290fe0b927 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/LaunchingTasksTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/LaunchingTasksTest.java @@ -27,11 +27,11 @@ import org.apache.shardingsphere.elasticjob.cloud.scheduler.state.running.RunningService; import org.apache.shardingsphere.elasticjob.infra.context.ExecutionType; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Arrays; import java.util.List; @@ -40,7 +40,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class LaunchingTasksTest { @Mock @@ -60,7 +60,7 @@ public final class LaunchingTasksTest { private LaunchingTasks launchingTasks; - @Before + @BeforeEach public void setUp() { FacadeService facadeService = new FacadeService(regCenter); ReflectionUtils.setFieldValue(facadeService, "jobConfigService", jobConfigService); diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/LeasesQueueTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/LeasesQueueTest.java index 2f388e4373..c7e379135e 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/LeasesQueueTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/LeasesQueueTest.java @@ -18,11 +18,11 @@ package org.apache.shardingsphere.elasticjob.cloud.scheduler.mesos; import org.apache.shardingsphere.elasticjob.cloud.scheduler.mesos.fixture.OfferBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class LeasesQueueTest { diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/MesosStateServiceTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/MesosStateServiceTest.java index 4e42760485..54d887969b 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/MesosStateServiceTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/MesosStateServiceTest.java @@ -21,10 +21,10 @@ import org.apache.shardingsphere.elasticjob.cloud.scheduler.ha.HANode; import org.apache.shardingsphere.elasticjob.cloud.scheduler.mesos.MesosStateService.ExecutorStateInfo; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Collection; import java.util.Map; @@ -33,7 +33,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class MesosStateServiceTest extends AbstractCloudControllerTest { @Mock diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/ReconcileServiceTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/ReconcileServiceTest.java index 1842032da7..ced647cba3 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/ReconcileServiceTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/ReconcileServiceTest.java @@ -17,17 +17,17 @@ package org.apache.shardingsphere.elasticjob.cloud.scheduler.mesos; -import org.apache.shardingsphere.elasticjob.infra.context.TaskContext; import com.google.common.collect.Sets; import org.apache.mesos.Protos; import org.apache.mesos.SchedulerDriver; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.apache.shardingsphere.elasticjob.infra.context.TaskContext; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Collection; import java.util.Collections; @@ -40,7 +40,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class ReconcileServiceTest { @Mock @@ -54,7 +54,7 @@ public final class ReconcileServiceTest { @Captor private ArgumentCaptor> taskStatusCaptor; - @Before + @BeforeEach public void setUp() { reconcileService = new ReconcileService(schedulerDriver, facadeService); } diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/SchedulerEngineTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/SchedulerEngineTest.java index 4ec2844af0..316eaafe5d 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/SchedulerEngineTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/SchedulerEngineTest.java @@ -31,12 +31,12 @@ import org.apache.shardingsphere.elasticjob.infra.context.TaskContext; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.tracing.JobTracingEventBus; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentMatchers; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Arrays; import java.util.List; @@ -44,12 +44,13 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class SchedulerEngineTest { @Mock @@ -66,11 +67,11 @@ public final class SchedulerEngineTest { private SchedulerEngine schedulerEngine; - @Before + @BeforeEach public void setUp() { schedulerEngine = new SchedulerEngine(taskScheduler, facadeService, new JobTracingEventBus(), frameworkIDService, statisticManager); ReflectionUtils.setFieldValue(schedulerEngine, "facadeService", facadeService); - when(facadeService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job"))); + lenient().when(facadeService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job"))); new RunningService(mock(CoordinatorRegistryCenter.class)).clear(); } diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/SchedulerServiceTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/SchedulerServiceTest.java index adcf05cb14..d8e5f0854c 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/SchedulerServiceTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/SchedulerServiceTest.java @@ -28,19 +28,19 @@ import org.apache.shardingsphere.elasticjob.cloud.scheduler.state.disable.app.CloudAppDisableListener; import org.apache.shardingsphere.elasticjob.cloud.scheduler.state.disable.job.CloudJobDisableListener; import org.apache.shardingsphere.elasticjob.cloud.scheduler.statistics.StatisticManager; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InOrder; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class SchedulerServiceTest { @Mock @@ -81,7 +81,7 @@ public class SchedulerServiceTest { private SchedulerService schedulerService; - @Before + @BeforeEach public void setUp() { schedulerService = new SchedulerService(env, facadeService, schedulerDriver, producerManager, statisticManager, cloudJobConfigurationListener, diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/SupportedExtractionTypeTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/SupportedExtractionTypeTest.java index 59333cd8d6..4ef76e04af 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/SupportedExtractionTypeTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/SupportedExtractionTypeTest.java @@ -17,10 +17,10 @@ package org.apache.shardingsphere.elasticjob.cloud.scheduler.mesos; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class SupportedExtractionTypeTest { diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/TaskInfoDataTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/TaskInfoDataTest.java index 5f0491142d..bf1dad3f6c 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/TaskInfoDataTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/TaskInfoDataTest.java @@ -20,14 +20,14 @@ import org.apache.commons.lang3.SerializationUtils; import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.CloudJobConfigurationBuilder; import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.Map; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertNotNull; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertNotNull; public final class TaskInfoDataTest { diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/TaskLaunchScheduledServiceTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/TaskLaunchScheduledServiceTest.java index 1c11bc7997..dd78117c0d 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/TaskLaunchScheduledServiceTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/TaskLaunchScheduledServiceTest.java @@ -36,13 +36,13 @@ import org.apache.shardingsphere.elasticjob.infra.context.TaskContext.MetaInfo; import org.apache.shardingsphere.elasticjob.tracing.JobTracingEventBus; import org.apache.shardingsphere.elasticjob.tracing.event.JobStatusTraceEvent; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentMatchers; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Collections; import java.util.HashMap; @@ -53,11 +53,12 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class TaskLaunchScheduledServiceTest { @Mock @@ -74,14 +75,14 @@ public final class TaskLaunchScheduledServiceTest { private TaskLaunchScheduledService taskLaunchScheduledService; - @Before + @BeforeEach public void setUp() { - when(facadeService.loadAppConfig("test_app")).thenReturn(Optional.of(CloudAppConfigurationBuilder.createCloudAppConfiguration("test_app"))); + lenient().when(facadeService.loadAppConfig("test_app")).thenReturn(Optional.of(CloudAppConfigurationBuilder.createCloudAppConfiguration("test_app"))); taskLaunchScheduledService = new TaskLaunchScheduledService(schedulerDriver, taskScheduler, facadeService, jobTracingEventBus); taskLaunchScheduledService.startUp(); } - @After + @AfterEach public void tearDown() { taskLaunchScheduledService.shutDown(); } diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/producer/ProducerJobTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/producer/ProducerJobTest.java index f890ffd902..f06957a58b 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/producer/ProducerJobTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/producer/ProducerJobTest.java @@ -18,11 +18,11 @@ package org.apache.shardingsphere.elasticjob.cloud.scheduler.producer; import org.apache.shardingsphere.elasticjob.cloud.scheduler.state.ready.ReadyService; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.quartz.JobBuilder; import org.quartz.JobExecutionContext; import org.quartz.JobKey; @@ -30,7 +30,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class ProducerJobTest { @Mock @@ -43,7 +43,7 @@ public final class ProducerJobTest { private TransientProducerScheduler.ProducerJob producerJob; - @Before + @BeforeEach public void setUp() { producerJob = new TransientProducerScheduler.ProducerJob(); producerJob.setRepository(repository); diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/producer/ProducerManagerTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/producer/ProducerManagerTest.java index fd3d441d05..982c0ba250 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/producer/ProducerManagerTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/producer/ProducerManagerTest.java @@ -22,10 +22,10 @@ import org.apache.shardingsphere.elasticjob.cloud.ReflectionUtils; import org.apache.shardingsphere.elasticjob.cloud.config.CloudJobExecutionType; import org.apache.shardingsphere.elasticjob.cloud.config.pojo.CloudJobConfigurationPOJO; -import org.apache.shardingsphere.elasticjob.cloud.scheduler.exception.AppConfigurationException; import org.apache.shardingsphere.elasticjob.cloud.scheduler.config.app.CloudAppConfigurationService; import org.apache.shardingsphere.elasticjob.cloud.scheduler.config.app.pojo.CloudAppConfigurationPOJO; import org.apache.shardingsphere.elasticjob.cloud.scheduler.config.job.CloudJobConfigurationService; +import org.apache.shardingsphere.elasticjob.cloud.scheduler.exception.AppConfigurationException; import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.CloudAppConfigurationBuilder; import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.CloudJobConfigurationBuilder; import org.apache.shardingsphere.elasticjob.cloud.scheduler.state.disable.job.DisableJobService; @@ -34,22 +34,23 @@ import org.apache.shardingsphere.elasticjob.infra.context.TaskContext; import org.apache.shardingsphere.elasticjob.infra.exception.JobConfigurationException; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Optional; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class ProducerManagerTest { @Mock @@ -84,7 +85,7 @@ public final class ProducerManagerTest { private final CloudJobConfigurationPOJO daemonJobConfig = CloudJobConfigurationBuilder.createCloudJobConfiguration("daemon_test_job", CloudJobExecutionType.DAEMON); - @Before + @BeforeEach public void setUp() { producerManager = new ProducerManager(schedulerDriver, regCenter); ReflectionUtils.setFieldValue(producerManager, "appConfigService", appConfigService); @@ -104,23 +105,29 @@ public void assertStartup() { verify(readyService).addDaemon("daemon_test_job"); } - @Test(expected = AppConfigurationException.class) + @Test public void assertRegisterJobWithoutApp() { - when(appConfigService.load("test_app")).thenReturn(Optional.empty()); - producerManager.register(transientJobConfig); + assertThrows(AppConfigurationException.class, () -> { + when(appConfigService.load("test_app")).thenReturn(Optional.empty()); + producerManager.register(transientJobConfig); + }); } - @Test(expected = JobConfigurationException.class) + @Test public void assertRegisterExistedJob() { - when(appConfigService.load("test_app")).thenReturn(Optional.of(appConfig)); - when(configService.load("transient_test_job")).thenReturn(Optional.of(transientJobConfig)); - producerManager.register(transientJobConfig); + assertThrows(JobConfigurationException.class, () -> { + when(appConfigService.load("test_app")).thenReturn(Optional.of(appConfig)); + when(configService.load("transient_test_job")).thenReturn(Optional.of(transientJobConfig)); + producerManager.register(transientJobConfig); + }); } - @Test(expected = JobConfigurationException.class) + @Test public void assertRegisterDisabledJob() { - when(disableJobService.isDisabled("transient_test_job")).thenReturn(true); - producerManager.register(transientJobConfig); + assertThrows(JobConfigurationException.class, () -> { + when(disableJobService.isDisabled("transient_test_job")).thenReturn(true); + producerManager.register(transientJobConfig); + }); } @Test @@ -141,10 +148,12 @@ public void assertRegisterDaemonJob() { verify(readyService).addDaemon("daemon_test_job"); } - @Test(expected = JobConfigurationException.class) + @Test public void assertUpdateNotExisted() { - when(configService.load("transient_test_job")).thenReturn(Optional.empty()); - producerManager.update(transientJobConfig); + assertThrows(JobConfigurationException.class, () -> { + when(configService.load("transient_test_job")).thenReturn(Optional.empty()); + producerManager.update(transientJobConfig); + }); } @Test diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/producer/TransientProducerRepositoryTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/producer/TransientProducerRepositoryTest.java index c88dde8162..d5f9178a8d 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/producer/TransientProducerRepositoryTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/producer/TransientProducerRepositoryTest.java @@ -17,17 +17,17 @@ package org.apache.shardingsphere.elasticjob.cloud.scheduler.producer; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; import org.quartz.JobKey; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class TransientProducerRepositoryTest { private final JobKey jobKey = JobKey.jobKey("0/45 * * * * ?"); diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/producer/TransientProducerSchedulerTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/producer/TransientProducerSchedulerTest.java index ce93fe28d4..d3665ff472 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/producer/TransientProducerSchedulerTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/producer/TransientProducerSchedulerTest.java @@ -21,11 +21,11 @@ import org.apache.shardingsphere.elasticjob.cloud.config.pojo.CloudJobConfigurationPOJO; import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.CloudJobConfigurationBuilder; import org.apache.shardingsphere.elasticjob.cloud.scheduler.state.ready.ReadyService; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.quartz.CronScheduleBuilder; import org.quartz.JobBuilder; import org.quartz.JobDetail; @@ -38,7 +38,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class TransientProducerSchedulerTest { @Mock @@ -57,7 +57,7 @@ public final class TransientProducerSchedulerTest { .withSchedule(CronScheduleBuilder.cronSchedule(cloudJobConfig.getCron()) .withMisfireHandlingInstructionDoNothing()).build(); - @Before + @BeforeEach public void setUp() { transientProducerScheduler = new TransientProducerScheduler(readyService); ReflectionUtils.setFieldValue(transientProducerScheduler, "scheduler", scheduler); diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/disable/app/CloudAppDisableListenerTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/disable/app/CloudAppDisableListenerTest.java index cecf197c56..65656321c9 100644 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/disable/app/CloudAppDisableListenerTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/disable/app/CloudAppDisableListenerTest.java @@ -26,18 +26,18 @@ import org.apache.shardingsphere.elasticjob.cloud.scheduler.producer.ProducerManager; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperConfiguration; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCenter; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentMatchers; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class CloudAppDisableListenerTest { private static ZookeeperRegistryCenter regCenter; @@ -51,7 +51,7 @@ public final class CloudAppDisableListenerTest { @InjectMocks private CloudAppDisableListener cloudAppDisableListener; - @Before + @BeforeEach public void setUp() { ReflectionUtils.setFieldValue(cloudAppDisableListener, "producerManager", producerManager); initRegistryCenter(); diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/disable/app/DisableAppNodeTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/disable/app/DisableAppNodeTest.java index 641d853849..e8eab8a26e 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/disable/app/DisableAppNodeTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/disable/app/DisableAppNodeTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.cloud.scheduler.state.disable.app; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/disable/app/DisableAppServiceTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/disable/app/DisableAppServiceTest.java index 1c6da0d73a..46deb83616 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/disable/app/DisableAppServiceTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/disable/app/DisableAppServiceTest.java @@ -18,18 +18,18 @@ package org.apache.shardingsphere.elasticjob.cloud.scheduler.state.disable.app; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class DisableAppServiceTest { @Mock @@ -37,7 +37,7 @@ public final class DisableAppServiceTest { private DisableAppService disableAppService; - @Before + @BeforeEach public void setUp() { disableAppService = new DisableAppService(regCenter); } diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/disable/job/CloudJobDisableListenerTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/disable/job/CloudJobDisableListenerTest.java index a0b51a46a9..22fd4773d6 100644 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/disable/job/CloudJobDisableListenerTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/disable/job/CloudJobDisableListenerTest.java @@ -25,19 +25,19 @@ import org.apache.shardingsphere.elasticjob.cloud.scheduler.producer.ProducerManager; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperConfiguration; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCenter; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentMatchers; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class CloudJobDisableListenerTest { private static ZookeeperRegistryCenter regCenter; @@ -48,7 +48,7 @@ public final class CloudJobDisableListenerTest { @InjectMocks private CloudJobDisableListener cloudJobDisableListener; - @Before + @BeforeEach public void setUp() { ReflectionUtils.setFieldValue(cloudJobDisableListener, "producerManager", producerManager); initRegistryCenter(); diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/disable/job/DisableJobNodeTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/disable/job/DisableJobNodeTest.java index d434f556fe..bf62aad7ba 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/disable/job/DisableJobNodeTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/disable/job/DisableJobNodeTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.cloud.scheduler.state.disable.job; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/disable/job/DisableJobServiceTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/disable/job/DisableJobServiceTest.java index fc9bdd762e..c0c7f41115 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/disable/job/DisableJobServiceTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/disable/job/DisableJobServiceTest.java @@ -18,18 +18,18 @@ package org.apache.shardingsphere.elasticjob.cloud.scheduler.state.disable.job; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class DisableJobServiceTest { @Mock @@ -37,7 +37,7 @@ public final class DisableJobServiceTest { private DisableJobService disableJobService; - @Before + @BeforeEach public void setUp() { disableJobService = new DisableJobService(regCenter); } diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/failover/FailoverNodeTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/failover/FailoverNodeTest.java index 73e13bb11f..56c418729a 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/failover/FailoverNodeTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/failover/FailoverNodeTest.java @@ -19,7 +19,7 @@ import org.apache.shardingsphere.elasticjob.infra.context.ExecutionType; import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.TaskNode; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/failover/FailoverServiceTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/failover/FailoverServiceTest.java index 640b0420ce..c7fc2ecd8d 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/failover/FailoverServiceTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/failover/FailoverServiceTest.java @@ -28,11 +28,11 @@ import org.apache.shardingsphere.elasticjob.infra.context.TaskContext; import org.apache.shardingsphere.elasticjob.infra.context.TaskContext.MetaInfo; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Arrays; import java.util.Collection; @@ -43,12 +43,12 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class FailoverServiceTest { @Mock @@ -62,7 +62,7 @@ public final class FailoverServiceTest { private FailoverService failoverService; - @Before + @BeforeEach public void setUp() { failoverService = new FailoverService(regCenter); ReflectionUtils.setFieldValue(failoverService, "configService", configService); diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/ready/ReadyNodeTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/ready/ReadyNodeTest.java index 5996fdc56f..1f685a12f7 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/ready/ReadyNodeTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/ready/ReadyNodeTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.cloud.scheduler.state.ready; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/ready/ReadyServiceTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/ready/ReadyServiceTest.java index 183266397e..9a60982c01 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/ready/ReadyServiceTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/ready/ReadyServiceTest.java @@ -26,12 +26,12 @@ import org.apache.shardingsphere.elasticjob.cloud.scheduler.state.running.RunningService; import org.apache.shardingsphere.elasticjob.infra.context.ExecutionType; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentMatchers; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Arrays; import java.util.Collections; @@ -40,13 +40,13 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class ReadyServiceTest { @Mock @@ -60,7 +60,7 @@ public final class ReadyServiceTest { private ReadyService readyService; - @Before + @BeforeEach public void setUp() { readyService = new ReadyService(regCenter); ReflectionUtils.setFieldValue(readyService, "configService", configService); diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/running/RunningNodeTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/running/RunningNodeTest.java index db7887fe84..320a806e50 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/running/RunningNodeTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/running/RunningNodeTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.cloud.scheduler.state.running; import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.TaskNode; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/running/RunningServiceTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/running/RunningServiceTest.java index 407bad820c..9e209afe6d 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/running/RunningServiceTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/state/running/RunningServiceTest.java @@ -24,26 +24,26 @@ import org.apache.shardingsphere.elasticjob.infra.context.TaskContext; import org.apache.shardingsphere.elasticjob.infra.context.TaskContext.MetaInfo; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Arrays; import java.util.Collections; import java.util.UUID; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class RunningServiceTest { private TaskContext taskContext; @@ -55,7 +55,7 @@ public final class RunningServiceTest { private RunningService runningService; - @Before + @BeforeEach public void setUp() { when(regCenter.get("/config/job/test_job")).thenReturn(CloudJsonConstants.getJobJson(CloudJobExecutionType.DAEMON)); when(regCenter.get("/config/job/test_job_t")).thenReturn(CloudJsonConstants.getJobJson("test_job_t")); @@ -71,7 +71,7 @@ public void setUp() { verify(regCenter).persist(path, taskContext.getId()); } - @After + @AfterEach public void tearDown() { runningService.clear(); } diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/StatisticManagerTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/StatisticManagerTest.java index 5db25d65a7..14e1af7c6f 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/StatisticManagerTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/StatisticManagerTest.java @@ -28,12 +28,12 @@ import org.apache.shardingsphere.elasticjob.cloud.statistics.type.task.TaskResultStatistics; import org.apache.shardingsphere.elasticjob.cloud.statistics.type.task.TaskRunningStatistics; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Arrays; import java.util.Collections; @@ -42,14 +42,14 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class StatisticManagerTest { @Mock @@ -66,12 +66,12 @@ public final class StatisticManagerTest { private StatisticManager statisticManager; - @Before + @BeforeEach public void setUp() { statisticManager = StatisticManager.getInstance(regCenter, null); } - @After + @AfterEach public void tearDown() { statisticManager.shutdown(); ReflectionUtils.setStaticFieldValue(StatisticManager.class, "instance", null); diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/StatisticsSchedulerTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/StatisticsSchedulerTest.java index 926955fcea..039d60c9b5 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/StatisticsSchedulerTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/StatisticsSchedulerTest.java @@ -20,18 +20,18 @@ import org.apache.shardingsphere.elasticjob.cloud.ReflectionUtils; import org.apache.shardingsphere.elasticjob.cloud.scheduler.statistics.job.StatisticJob; import org.apache.shardingsphere.elasticjob.cloud.scheduler.statistics.job.TestStatisticJob; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.quartz.Scheduler; import org.quartz.SchedulerException; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class StatisticsSchedulerTest { private StatisticsScheduler statisticsScheduler; @@ -39,7 +39,7 @@ public class StatisticsSchedulerTest { @Mock private Scheduler scheduler; - @Before + @BeforeEach public void setUp() { statisticsScheduler = new StatisticsScheduler(); ReflectionUtils.setFieldValue(statisticsScheduler, "scheduler", scheduler); diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/TaskResultMetaDataTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/TaskResultMetaDataTest.java index b2b9a83827..3477a731ea 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/TaskResultMetaDataTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/TaskResultMetaDataTest.java @@ -17,17 +17,17 @@ package org.apache.shardingsphere.elasticjob.cloud.scheduler.statistics; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import org.junit.Before; -import org.junit.Test; - public class TaskResultMetaDataTest { private TaskResultMetaData metaData; - @Before + @BeforeEach public void setUp() { metaData = new TaskResultMetaData(); } diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/job/BaseStatisticJobTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/job/BaseStatisticJobTest.java index 8e36a745e2..78fe5f9a6d 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/job/BaseStatisticJobTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/job/BaseStatisticJobTest.java @@ -17,21 +17,21 @@ package org.apache.shardingsphere.elasticjob.cloud.scheduler.statistics.job; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; +import org.apache.shardingsphere.elasticjob.cloud.scheduler.statistics.util.StatisticTimeUtils; +import org.apache.shardingsphere.elasticjob.cloud.statistics.StatisticInterval; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.Date; -import org.apache.shardingsphere.elasticjob.cloud.scheduler.statistics.util.StatisticTimeUtils; -import org.apache.shardingsphere.elasticjob.cloud.statistics.StatisticInterval; -import org.junit.Before; -import org.junit.Test; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; public class BaseStatisticJobTest { private TestStatisticJob testStatisticJob; - @Before + @BeforeEach public void setUp() { testStatisticJob = new TestStatisticJob(); } diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/job/JobRunningStatisticJobTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/job/JobRunningStatisticJobTest.java index 459da44d7c..82103b9b99 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/job/JobRunningStatisticJobTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/job/JobRunningStatisticJobTest.java @@ -17,7 +17,6 @@ package org.apache.shardingsphere.elasticjob.cloud.scheduler.statistics.job; -import org.apache.shardingsphere.elasticjob.infra.context.TaskContext; import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.TaskNode; import org.apache.shardingsphere.elasticjob.cloud.scheduler.state.running.RunningService; import org.apache.shardingsphere.elasticjob.cloud.scheduler.statistics.util.StatisticTimeUtils; @@ -25,12 +24,13 @@ import org.apache.shardingsphere.elasticjob.cloud.statistics.rdb.StatisticRdbRepository; import org.apache.shardingsphere.elasticjob.cloud.statistics.type.job.JobRunningStatistics; import org.apache.shardingsphere.elasticjob.cloud.statistics.type.task.TaskRunningStatistics; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.apache.shardingsphere.elasticjob.infra.context.TaskContext; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentMatchers; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.quartz.Trigger; import java.util.Collections; @@ -46,7 +46,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class JobRunningStatisticJobTest { @Mock @@ -57,7 +57,7 @@ public class JobRunningStatisticJobTest { private JobRunningStatisticJob jobRunningStatisticJob; - @Before + @BeforeEach public void setUp() { jobRunningStatisticJob = new JobRunningStatisticJob(); jobRunningStatisticJob.setRunningService(runningService); diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/job/RegisteredJobStatisticJobTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/job/RegisteredJobStatisticJobTest.java index 13d286b5c2..db32d5eb90 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/job/RegisteredJobStatisticJobTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/job/RegisteredJobStatisticJobTest.java @@ -23,11 +23,11 @@ import org.apache.shardingsphere.elasticjob.cloud.statistics.StatisticInterval; import org.apache.shardingsphere.elasticjob.cloud.statistics.rdb.StatisticRdbRepository; import org.apache.shardingsphere.elasticjob.cloud.statistics.type.job.JobRegisterStatistics; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.quartz.Trigger; import java.util.Collections; @@ -40,7 +40,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class RegisteredJobStatisticJobTest { @Mock @@ -51,7 +51,7 @@ public class RegisteredJobStatisticJobTest { private RegisteredJobStatisticJob registeredJobStatisticJob; - @Before + @BeforeEach public void setUp() { registeredJobStatisticJob = new RegisteredJobStatisticJob(); registeredJobStatisticJob.setConfigurationService(configurationService); diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/job/TaskResultStatisticJobTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/job/TaskResultStatisticJobTest.java index c260fb8d5b..c06375aeba 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/job/TaskResultStatisticJobTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/job/TaskResultStatisticJobTest.java @@ -22,11 +22,11 @@ import org.apache.shardingsphere.elasticjob.cloud.statistics.StatisticInterval; import org.apache.shardingsphere.elasticjob.cloud.statistics.rdb.StatisticRdbRepository; import org.apache.shardingsphere.elasticjob.cloud.statistics.type.task.TaskResultStatistics; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.quartz.Trigger; import java.util.Optional; @@ -38,7 +38,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class TaskResultStatisticJobTest { private final StatisticInterval statisticInterval = StatisticInterval.MINUTE; @@ -50,7 +50,7 @@ public class TaskResultStatisticJobTest { private TaskResultStatisticJob taskResultStatisticJob; - @Before + @BeforeEach public void setUp() { taskResultStatisticJob = new TaskResultStatisticJob(); sharedData = new TaskResultMetaData(); diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/util/StatisticTimeUtilsTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/util/StatisticTimeUtilsTest.java index 50d006a359..0e92ba7901 100755 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/util/StatisticTimeUtilsTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/statistics/util/StatisticTimeUtilsTest.java @@ -24,7 +24,7 @@ import java.util.Date; import org.apache.shardingsphere.elasticjob.cloud.statistics.StatisticInterval; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class StatisticTimeUtilsTest { diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/util/IOUtilsTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/util/IOUtilsTest.java index eda0de8b2c..79567d986c 100644 --- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/util/IOUtilsTest.java +++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/util/IOUtilsTest.java @@ -22,7 +22,7 @@ import java.io.InputStreamReader; import java.io.Reader; import java.nio.charset.StandardCharsets; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/pom.xml b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/pom.xml index 5fb576fede..bcb712c4b9 100644 --- a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/pom.xml +++ b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/pom.xml @@ -59,10 +59,6 @@ org.apache.httpcomponents httpcore - - org.mockito - mockito-core - ch.qos.logback logback-classic diff --git a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerPropertiesValidatorTest.java b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerPropertiesValidatorTest.java index b5e373c480..ec384a48f3 100644 --- a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerPropertiesValidatorTest.java +++ b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerPropertiesValidatorTest.java @@ -19,17 +19,18 @@ import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandlerPropertiesValidator; import org.apache.shardingsphere.elasticjob.infra.spi.ElasticJobServiceLoader; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.Properties; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; public final class DingtalkJobErrorHandlerPropertiesValidatorTest { - @Before + @BeforeEach public void startup() { ElasticJobServiceLoader.registerTypedService(JobErrorHandlerPropertiesValidator.class); } @@ -44,10 +45,12 @@ public void assertValidateWithNormal() { actual.validate(properties); } - @Test(expected = NullPointerException.class) + @Test public void assertValidateWithPropsIsNull() { - DingtalkJobErrorHandlerPropertiesValidator actual = getValidator(); - actual.validate(null); + assertThrows(NullPointerException.class, () -> { + DingtalkJobErrorHandlerPropertiesValidator actual = getValidator(); + actual.validate(null); + }); } @Test diff --git a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerTest.java b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerTest.java index ec6dc3c8ed..2b78aa26e6 100644 --- a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerTest.java +++ b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerTest.java @@ -26,10 +26,10 @@ import org.apache.shardingsphere.elasticjob.restful.NettyRestfulService; import org.apache.shardingsphere.elasticjob.restful.NettyRestfulServiceConfiguration; import org.apache.shardingsphere.elasticjob.restful.RestfulService; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.slf4j.LoggerFactory; import java.util.List; @@ -49,7 +49,7 @@ public final class DingtalkJobErrorHandlerTest { private static List appenderList; @SuppressWarnings({"unchecked", "rawtypes"}) - @BeforeClass + @BeforeAll public static void init() { NettyRestfulServiceConfiguration config = new NettyRestfulServiceConfiguration(PORT); config.setHost(HOST); @@ -61,12 +61,12 @@ public static void init() { appenderList = appender.list; } - @Before + @BeforeEach public void setUp() { appenderList.clear(); } - @AfterClass + @AfterAll public static void close() { if (null != restfulService) { restfulService.shutdown(); diff --git a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/pom.xml b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/pom.xml index b5963a304e..e90ceb4cf9 100644 --- a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/pom.xml +++ b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/pom.xml @@ -48,16 +48,7 @@ com.sun.mail javax.mail - - - org.mockito - mockito-core - - - - org.mockito - mockito-inline - + ch.qos.logback logback-classic diff --git a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerPropertiesValidatorTest.java b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerPropertiesValidatorTest.java index d2b32adee8..adb0839a41 100644 --- a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerPropertiesValidatorTest.java +++ b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerPropertiesValidatorTest.java @@ -19,17 +19,18 @@ import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandlerPropertiesValidator; import org.apache.shardingsphere.elasticjob.infra.spi.ElasticJobServiceLoader; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.Properties; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; public final class EmailJobErrorHandlerPropertiesValidatorTest { - @Before + @BeforeEach public void startup() { ElasticJobServiceLoader.registerTypedService(JobErrorHandlerPropertiesValidator.class); } @@ -48,10 +49,12 @@ public void assertValidateWithNormal() { actual.validate(properties); } - @Test(expected = NullPointerException.class) + @Test public void assertValidateWithPropsIsNull() { - EmailJobErrorHandlerPropertiesValidator actual = getValidator(); - actual.validate(null); + assertThrows(NullPointerException.class, () -> { + EmailJobErrorHandlerPropertiesValidator actual = getValidator(); + actual.validate(null); + }); } @Test diff --git a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerTest.java b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerTest.java index a22525f4e9..bb2a4b5289 100644 --- a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerTest.java +++ b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerTest.java @@ -23,12 +23,12 @@ import lombok.SneakyThrows; import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandlerFactory; import org.apache.shardingsphere.elasticjob.infra.exception.JobConfigurationException; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.slf4j.LoggerFactory; import javax.mail.Address; @@ -45,7 +45,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class EmailJobErrorHandlerTest { private static List appenderList; @@ -57,14 +57,14 @@ public final class EmailJobErrorHandlerTest { private Transport transport; @SuppressWarnings({"unchecked", "rawtypes"}) - @BeforeClass + @BeforeAll public static void init() { ch.qos.logback.classic.Logger log = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(EmailJobErrorHandler.class); ListAppender appender = (ListAppender) log.getAppender("EmailJobErrorHandlerTestAppender"); appenderList = appender.list; } - @Before + @BeforeEach public void setUp() { appenderList.clear(); } diff --git a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/pom.xml b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/pom.xml index 8886080229..9184609e4a 100644 --- a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/pom.xml +++ b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/pom.xml @@ -46,16 +46,6 @@ org.projectlombok lombok - - - org.mockito - mockito-core - - - - org.mockito - mockito-inline - ch.qos.logback diff --git a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/JobErrorHandlerFactoryTest.java b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/JobErrorHandlerFactoryTest.java index 6ddb60a1a0..7bf5b15b50 100644 --- a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/JobErrorHandlerFactoryTest.java +++ b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/JobErrorHandlerFactoryTest.java @@ -20,12 +20,13 @@ import org.apache.shardingsphere.elasticjob.error.handler.general.LogJobErrorHandler; import org.apache.shardingsphere.elasticjob.error.handler.general.ThrowJobErrorHandler; import org.apache.shardingsphere.elasticjob.infra.exception.JobConfigurationException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Properties; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; public final class JobErrorHandlerFactoryTest { @@ -34,9 +35,10 @@ public void assertGetDefaultHandler() { assertThat(JobErrorHandlerFactory.createHandler("", new Properties()).orElse(null), instanceOf(LogJobErrorHandler.class)); } - @Test(expected = JobConfigurationException.class) + @Test public void assertGetInvalidHandler() { - JobErrorHandlerFactory.createHandler("INVALID", new Properties()).orElseThrow(() -> new JobConfigurationException("")); + assertThrows(JobConfigurationException.class, () -> + JobErrorHandlerFactory.createHandler("INVALID", new Properties()).orElseThrow(() -> new JobConfigurationException(""))); } @Test diff --git a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/JobErrorHandlerReloadableTest.java b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/JobErrorHandlerReloadableTest.java index ddf7e2d6b4..0456d27c48 100644 --- a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/JobErrorHandlerReloadableTest.java +++ b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/JobErrorHandlerReloadableTest.java @@ -21,23 +21,23 @@ import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.error.handler.general.IgnoreJobErrorHandler; import org.apache.shardingsphere.elasticjob.error.handler.general.LogJobErrorHandler; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.lang.reflect.Field; import java.util.Properties; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class JobErrorHandlerReloadableTest { @Mock diff --git a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/general/IgnoreJobErrorHandlerTest.java b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/general/IgnoreJobErrorHandlerTest.java index e82a6b751b..3318cafcc0 100644 --- a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/general/IgnoreJobErrorHandlerTest.java +++ b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/general/IgnoreJobErrorHandlerTest.java @@ -19,7 +19,7 @@ import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandlerFactory; import org.apache.shardingsphere.elasticjob.infra.exception.JobConfigurationException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Properties; diff --git a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/general/LogJobErrorHandlerTest.java b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/general/LogJobErrorHandlerTest.java index df1f7c93d9..a76aa3da5b 100644 --- a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/general/LogJobErrorHandlerTest.java +++ b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/general/LogJobErrorHandlerTest.java @@ -22,9 +22,9 @@ import ch.qos.logback.core.read.ListAppender; import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandlerFactory; import org.apache.shardingsphere.elasticjob.infra.exception.JobConfigurationException; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.slf4j.LoggerFactory; import java.util.List; @@ -38,14 +38,14 @@ public final class LogJobErrorHandlerTest { private static List appenderList; @SuppressWarnings({"unchecked", "rawtypes"}) - @BeforeClass + @BeforeAll public static void setupLogger() { ch.qos.logback.classic.Logger log = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(LogJobErrorHandler.class); ListAppender appender = (ListAppender) log.getAppender("LogJobErrorHandlerTestAppender"); appenderList = appender.list; } - @Before + @BeforeEach public void setUp() { appenderList.clear(); } diff --git a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/general/ThrowJobErrorHandlerTest.java b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/general/ThrowJobErrorHandlerTest.java index e0f8656b0c..7a8b0bbb1c 100644 --- a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/general/ThrowJobErrorHandlerTest.java +++ b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/general/ThrowJobErrorHandlerTest.java @@ -20,15 +20,18 @@ import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandlerFactory; import org.apache.shardingsphere.elasticjob.infra.exception.JobConfigurationException; import org.apache.shardingsphere.elasticjob.infra.exception.JobSystemException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Properties; +import static org.junit.jupiter.api.Assertions.assertThrows; + public final class ThrowJobErrorHandlerTest { - - @Test(expected = JobSystemException.class) + + @Test public void assertHandleException() { - JobErrorHandlerFactory.createHandler("THROW", new Properties()).orElseThrow( - () -> new JobConfigurationException("THROW error handler not found.")).handleException("test_job", new RuntimeException("test")); + assertThrows(JobSystemException.class, () -> + JobErrorHandlerFactory.createHandler("THROW", new Properties()).orElseThrow(() -> + new JobConfigurationException("THROW error handler not found.")).handleException("test_job", new RuntimeException("test"))); } } diff --git a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/pom.xml b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/pom.xml index 8c1dc0b579..5ee5fdd34e 100644 --- a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/pom.xml +++ b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/pom.xml @@ -59,10 +59,6 @@ org.apache.httpcomponents httpcore - - org.mockito - mockito-core - ch.qos.logback logback-classic diff --git a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerPropertiesValidatorTest.java b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerPropertiesValidatorTest.java index fed5e7e735..20e3353f2b 100644 --- a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerPropertiesValidatorTest.java +++ b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerPropertiesValidatorTest.java @@ -19,17 +19,18 @@ import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandlerPropertiesValidator; import org.apache.shardingsphere.elasticjob.infra.spi.ElasticJobServiceLoader; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.Properties; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; public final class WechatJobErrorHandlerPropertiesValidatorTest { - @Before + @BeforeEach public void startup() { ElasticJobServiceLoader.registerTypedService(JobErrorHandlerPropertiesValidator.class); } @@ -44,10 +45,12 @@ public void assertValidateWithNormal() { actual.validate(properties); } - @Test(expected = NullPointerException.class) + @Test public void assertValidateWithPropsIsNull() { - WechatJobErrorHandlerPropertiesValidator actual = getValidator(); - actual.validate(null); + assertThrows(NullPointerException.class, () -> { + WechatJobErrorHandlerPropertiesValidator actual = getValidator(); + actual.validate(null); + }); } @Test diff --git a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerTest.java b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerTest.java index 82291aeb4e..790d19c6e4 100644 --- a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerTest.java +++ b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerTest.java @@ -26,10 +26,10 @@ import org.apache.shardingsphere.elasticjob.restful.NettyRestfulService; import org.apache.shardingsphere.elasticjob.restful.NettyRestfulServiceConfiguration; import org.apache.shardingsphere.elasticjob.restful.RestfulService; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.slf4j.LoggerFactory; import java.util.List; @@ -49,7 +49,7 @@ public final class WechatJobErrorHandlerTest { private static List appenderList; @SuppressWarnings({"unchecked", "rawtypes"}) - @BeforeClass + @BeforeAll public static void init() { NettyRestfulServiceConfiguration configuration = new NettyRestfulServiceConfiguration(PORT); configuration.setHost(HOST); @@ -61,12 +61,12 @@ public static void init() { appenderList = appender.list; } - @Before + @BeforeEach public void setUp() { appenderList.clear(); } - @AfterClass + @AfterAll public static void close() { if (null != restfulService) { restfulService.shutdown(); diff --git a/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-kernel/pom.xml b/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-kernel/pom.xml index 0752e94b35..4e75e64214 100644 --- a/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-kernel/pom.xml +++ b/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-kernel/pom.xml @@ -52,15 +52,6 @@ org.projectlombok lombok - - - org.mockito - mockito-core - - - org.mockito - mockito-inline - ch.qos.logback diff --git a/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-kernel/src/test/java/org/apache/shardingsphere/elasticjob/executor/ElasticJobExecutorTest.java b/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-kernel/src/test/java/org/apache/shardingsphere/elasticjob/executor/ElasticJobExecutorTest.java index 46082ab61d..d8ee2974ea 100644 --- a/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-kernel/src/test/java/org/apache/shardingsphere/elasticjob/executor/ElasticJobExecutorTest.java +++ b/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-kernel/src/test/java/org/apache/shardingsphere/elasticjob/executor/ElasticJobExecutorTest.java @@ -25,26 +25,28 @@ import org.apache.shardingsphere.elasticjob.infra.exception.JobSystemException; import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; import org.apache.shardingsphere.elasticjob.tracing.event.JobStatusTraceEvent.State; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.lang.reflect.Field; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class ElasticJobExecutorTest { @Mock @@ -60,7 +62,7 @@ public final class ElasticJobExecutorTest { private ElasticJobExecutor elasticJobExecutor; - @Before + @BeforeEach public void setUp() { jobConfig = createJobConfiguration(); when(jobFacade.loadJobConfiguration(anyBoolean())).thenReturn(jobConfig); @@ -80,14 +82,16 @@ private void setJobItemExecutor() { field.set(elasticJobExecutor, jobItemExecutor); } - @Test(expected = JobSystemException.class) - public void assertExecuteWhenCheckMaxTimeDiffSecondsIntolerable() throws JobExecutionEnvironmentException { - doThrow(JobExecutionEnvironmentException.class).when(jobFacade).checkJobExecutionEnvironment(); - try { - elasticJobExecutor.execute(); - } finally { - verify(jobItemExecutor, times(0)).process(eq(fooJob), eq(jobConfig), eq(jobFacade), any()); - } + @Test + public void assertExecuteWhenCheckMaxTimeDiffSecondsIntolerable() { + assertThrows(JobSystemException.class, () -> { + doThrow(JobExecutionEnvironmentException.class).when(jobFacade).checkJobExecutionEnvironment(); + try { + elasticJobExecutor.execute(); + } finally { + verify(jobItemExecutor, times(0)).process(eq(fooJob), eq(jobConfig), eq(jobFacade), any()); + } + }); } @Test @@ -111,10 +115,10 @@ public void assertExecuteWhenShardingItemsIsEmpty() { verify(jobFacade).postJobStatusTraceEvent(shardingContexts.getTaskId(), State.TASK_FINISHED, "Sharding item for job 'test_job' is empty."); verify(jobItemExecutor, times(0)).process(eq(fooJob), eq(jobConfig), eq(jobFacade), any()); } - - @Test(expected = JobSystemException.class) + + @Test public void assertExecuteFailureWhenThrowExceptionForSingleShardingItem() { - assertExecuteFailureWhenThrowException(createSingleShardingContexts()); + assertThrows(JobSystemException.class, () -> assertExecuteFailureWhenThrowException(createSingleShardingContexts())); } @Test @@ -195,28 +199,32 @@ public void assertExecuteWithMisfire() { verify(jobFacade, times(2)).registerJobCompleted(shardingContexts); } - @Test(expected = JobSystemException.class) + @Test public void assertBeforeJobExecutedFailure() { - ShardingContexts shardingContexts = createMultipleShardingContexts(); - when(jobFacade.getShardingContexts()).thenReturn(shardingContexts); - doThrow(RuntimeException.class).when(jobFacade).beforeJobExecuted(shardingContexts); - try { - elasticJobExecutor.execute(); - } finally { - verify(jobItemExecutor, times(0)).process(eq(fooJob), eq(jobConfig), eq(jobFacade), any()); - } + assertThrows(JobSystemException.class, () -> { + ShardingContexts shardingContexts = createMultipleShardingContexts(); + when(jobFacade.getShardingContexts()).thenReturn(shardingContexts); + doThrow(RuntimeException.class).when(jobFacade).beforeJobExecuted(shardingContexts); + try { + elasticJobExecutor.execute(); + } finally { + verify(jobItemExecutor, times(0)).process(eq(fooJob), eq(jobConfig), eq(jobFacade), any()); + } + }); } - @Test(expected = JobSystemException.class) + @Test public void assertAfterJobExecutedFailure() { - ShardingContexts shardingContexts = createMultipleShardingContexts(); - when(jobFacade.getShardingContexts()).thenReturn(shardingContexts); - doThrow(RuntimeException.class).when(jobFacade).afterJobExecuted(shardingContexts); - try { - elasticJobExecutor.execute(); - } finally { - verify(jobItemExecutor, times(2)).process(eq(fooJob), eq(jobConfig), eq(jobFacade), any()); - } + assertThrows(JobSystemException.class, () -> { + ShardingContexts shardingContexts = createMultipleShardingContexts(); + when(jobFacade.getShardingContexts()).thenReturn(shardingContexts); + doThrow(RuntimeException.class).when(jobFacade).afterJobExecuted(shardingContexts); + try { + elasticJobExecutor.execute(); + } finally { + verify(jobItemExecutor, times(2)).process(eq(fooJob), eq(jobConfig), eq(jobFacade), any()); + } + }); } private ShardingContexts createSingleShardingContexts() { @@ -235,7 +243,7 @@ private ShardingContexts createMultipleShardingContexts() { private void prepareForIsNotMisfire(final JobFacade jobFacade, final ShardingContexts shardingContexts) { when(jobFacade.getShardingContexts()).thenReturn(shardingContexts); when(jobFacade.misfireIfRunning(shardingContexts.getShardingItemParameters().keySet())).thenReturn(false); - when(jobFacade.isExecuteMisfired(shardingContexts.getShardingItemParameters().keySet())).thenReturn(false); + lenient().when(jobFacade.isExecuteMisfired(shardingContexts.getShardingItemParameters().keySet())).thenReturn(false); } private void verifyForIsNotMisfire(final JobFacade jobFacade, final ShardingContexts shardingContexts) { diff --git a/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-kernel/src/test/java/org/apache/shardingsphere/elasticjob/executor/item/JobItemExecutorFactoryTest.java b/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-kernel/src/test/java/org/apache/shardingsphere/elasticjob/executor/item/JobItemExecutorFactoryTest.java index 6eeab3635e..7bacb85b86 100644 --- a/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-kernel/src/test/java/org/apache/shardingsphere/elasticjob/executor/item/JobItemExecutorFactoryTest.java +++ b/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-kernel/src/test/java/org/apache/shardingsphere/elasticjob/executor/item/JobItemExecutorFactoryTest.java @@ -23,16 +23,18 @@ import org.apache.shardingsphere.elasticjob.executor.fixture.job.FailedJob; import org.apache.shardingsphere.elasticjob.executor.fixture.job.FooJob; import org.apache.shardingsphere.elasticjob.infra.exception.JobConfigurationException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; public final class JobItemExecutorFactoryTest { - @Test(expected = JobConfigurationException.class) + @Test public void assertGetExecutorByClassFailureWithInvalidType() { - JobItemExecutorFactory.getExecutor(FailedJob.class); + assertThrows(JobConfigurationException.class, () -> + JobItemExecutorFactory.getExecutor(FailedJob.class)); } @Test @@ -45,9 +47,10 @@ public void assertGetExecutorByClassSuccessWithSubClass() { assertThat(JobItemExecutorFactory.getExecutor(DetailedFooJob.class), instanceOf(ClassedFooJobExecutor.class)); } - @Test(expected = JobConfigurationException.class) + @Test public void assertGetExecutorByTypeFailureWithInvalidType() { - JobItemExecutorFactory.getExecutor("FAIL"); + assertThrows(JobConfigurationException.class, () -> + JobItemExecutorFactory.getExecutor("FAIL")); } @Test diff --git a/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-type/elasticjob-dataflow-executor/src/test/java/org/apache/shardingsphere/elasticjob/dataflow/executor/DataflowJobExecutorTest.java b/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-type/elasticjob-dataflow-executor/src/test/java/org/apache/shardingsphere/elasticjob/dataflow/executor/DataflowJobExecutorTest.java index 4cccb4244e..7f1ed741f5 100644 --- a/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-type/elasticjob-dataflow-executor/src/test/java/org/apache/shardingsphere/elasticjob/dataflow/executor/DataflowJobExecutorTest.java +++ b/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-type/elasticjob-dataflow-executor/src/test/java/org/apache/shardingsphere/elasticjob/dataflow/executor/DataflowJobExecutorTest.java @@ -22,11 +22,11 @@ import org.apache.shardingsphere.elasticjob.dataflow.job.DataflowJob; import org.apache.shardingsphere.elasticjob.dataflow.props.DataflowJobProperties; import org.apache.shardingsphere.elasticjob.executor.JobFacade; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Arrays; import java.util.List; @@ -38,7 +38,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class DataflowJobExecutorTest { private DataflowJobExecutor jobExecutor; @@ -58,7 +58,7 @@ public final class DataflowJobExecutorTest { @Mock private Properties properties; - @Before + @BeforeEach public void createJobExecutor() { jobExecutor = new DataflowJobExecutor(); } diff --git a/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-type/elasticjob-http-executor/src/test/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutorTest.java b/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-type/elasticjob-http-executor/src/test/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutorTest.java index 371c504370..29d37f6e15 100644 --- a/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-type/elasticjob-http-executor/src/test/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutorTest.java +++ b/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-type/elasticjob-http-executor/src/test/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutorTest.java @@ -28,21 +28,23 @@ import org.apache.shardingsphere.elasticjob.restful.NettyRestfulService; import org.apache.shardingsphere.elasticjob.restful.NettyRestfulServiceConfiguration; import org.apache.shardingsphere.elasticjob.restful.RestfulService; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Properties; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class HttpJobExecutorTest { private static final int PORT = 9876; @@ -59,8 +61,9 @@ public final class HttpJobExecutorTest { @Mock private JobFacade jobFacade; - - @Mock + + // TODO We should not use `Mock.Strictness.LENIENT` here, but the default. This is a flaw in the unit test design. + @Mock(strictness = Mock.Strictness.LENIENT) private Properties properties; @Mock @@ -68,7 +71,7 @@ public final class HttpJobExecutorTest { private HttpJobExecutor jobExecutor; - @BeforeClass + @BeforeAll public static void init() { NettyRestfulServiceConfiguration configuration = new NettyRestfulServiceConfiguration(PORT); configuration.setHost(HOST); @@ -77,30 +80,34 @@ public static void init() { restfulService.startup(); } - @Before + @BeforeEach public void setUp() { - when(jobConfig.getProps()).thenReturn(properties); + lenient().when(jobConfig.getProps()).thenReturn(properties); jobExecutor = new HttpJobExecutor(); } - @AfterClass + @AfterAll public static void close() { if (null != restfulService) { restfulService.shutdown(); } } - @Test(expected = JobConfigurationException.class) + @Test public void assertUrlEmpty() { - when(jobConfig.getProps().getProperty(HttpJobProperties.URI_KEY)).thenReturn(""); - jobExecutor.process(elasticJob, jobConfig, jobFacade, shardingContext); + assertThrows(JobConfigurationException.class, () -> { + when(jobConfig.getProps().getProperty(HttpJobProperties.URI_KEY)).thenReturn(""); + jobExecutor.process(elasticJob, jobConfig, jobFacade, shardingContext); + }); } - @Test(expected = JobConfigurationException.class) + @Test public void assertMethodEmpty() { - when(jobConfig.getProps().getProperty(HttpJobProperties.URI_KEY)).thenReturn(getRequestUri("/getName")); - when(jobConfig.getProps().getProperty(HttpJobProperties.METHOD_KEY)).thenReturn(""); - jobExecutor.process(elasticJob, jobConfig, jobFacade, shardingContext); + assertThrows(JobConfigurationException.class, () -> { + when(jobConfig.getProps().getProperty(HttpJobProperties.URI_KEY)).thenReturn(getRequestUri("/getName")); + when(jobConfig.getProps().getProperty(HttpJobProperties.METHOD_KEY)).thenReturn(""); + jobExecutor.process(elasticJob, jobConfig, jobFacade, shardingContext); + }); } @Test @@ -143,14 +150,16 @@ public void assertProcessWithPost() { jobExecutor.process(elasticJob, jobConfig, jobFacade, shardingContext); } - @Test(expected = JobExecutionException.class) + @Test public void assertProcessWithIOException() { - when(jobConfig.getProps().getProperty(HttpJobProperties.URI_KEY)).thenReturn(getRequestUri("/postWithTimeout")); - when(jobConfig.getProps().getProperty(HttpJobProperties.METHOD_KEY)).thenReturn("POST"); - when(jobConfig.getProps().getProperty(HttpJobProperties.DATA_KEY)).thenReturn("name=elasticjob"); - when(jobConfig.getProps().getProperty(HttpJobProperties.CONNECT_TIMEOUT_KEY, "3000")).thenReturn("1"); - when(jobConfig.getProps().getProperty(HttpJobProperties.READ_TIMEOUT_KEY, "5000")).thenReturn("1"); - jobExecutor.process(elasticJob, jobConfig, jobFacade, shardingContext); + assertThrows(JobExecutionException.class, () -> { + when(jobConfig.getProps().getProperty(HttpJobProperties.URI_KEY)).thenReturn(getRequestUri("/postWithTimeout")); + when(jobConfig.getProps().getProperty(HttpJobProperties.METHOD_KEY)).thenReturn("POST"); + when(jobConfig.getProps().getProperty(HttpJobProperties.DATA_KEY)).thenReturn("name=elasticjob"); + when(jobConfig.getProps().getProperty(HttpJobProperties.CONNECT_TIMEOUT_KEY, "3000")).thenReturn("1"); + when(jobConfig.getProps().getProperty(HttpJobProperties.READ_TIMEOUT_KEY, "5000")).thenReturn("1"); + jobExecutor.process(elasticJob, jobConfig, jobFacade, shardingContext); + }); } @Test diff --git a/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-type/elasticjob-script-executor/src/test/java/org/apache/shardingsphere/elasticjob/script/ScriptJobExecutorTest.java b/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-type/elasticjob-script-executor/src/test/java/org/apache/shardingsphere/elasticjob/script/ScriptJobExecutorTest.java index c1ccb680fd..d6e7366a8f 100644 --- a/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-type/elasticjob-script-executor/src/test/java/org/apache/shardingsphere/elasticjob/script/ScriptJobExecutorTest.java +++ b/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-type/elasticjob-script-executor/src/test/java/org/apache/shardingsphere/elasticjob/script/ScriptJobExecutorTest.java @@ -26,19 +26,20 @@ import org.apache.shardingsphere.elasticjob.infra.exception.JobSystemException; import org.apache.shardingsphere.elasticjob.script.executor.ScriptJobExecutor; import org.apache.shardingsphere.elasticjob.script.props.ScriptJobProperties; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Properties; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class ScriptJobExecutorTest { @Mock @@ -58,22 +59,26 @@ public final class ScriptJobExecutorTest { private ScriptJobExecutor jobExecutor; - @Before + @BeforeEach public void setUp() { jobExecutor = new ScriptJobExecutor(); } - @Test(expected = JobConfigurationException.class) + @Test public void assertProcessWithJobConfigurationException() { - when(jobConfig.getProps()).thenReturn(properties); - jobExecutor.process(elasticJob, jobConfig, jobFacade, shardingContext); + assertThrows(JobConfigurationException.class, () -> { + when(jobConfig.getProps()).thenReturn(properties); + jobExecutor.process(elasticJob, jobConfig, jobFacade, shardingContext); + }); } - @Test(expected = JobSystemException.class) + @Test public void assertProcessWithJobSystemException() { - when(jobConfig.getProps()).thenReturn(properties); - when(properties.getProperty(ScriptJobProperties.SCRIPT_KEY)).thenReturn("demo.sh"); - jobExecutor.process(elasticJob, jobConfig, jobFacade, shardingContext); + assertThrows(JobSystemException.class, () -> { + when(jobConfig.getProps()).thenReturn(properties); + when(properties.getProperty(ScriptJobProperties.SCRIPT_KEY)).thenReturn("demo.sh"); + jobExecutor.process(elasticJob, jobConfig, jobFacade, shardingContext); + }); } @Test diff --git a/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-type/elasticjob-simple-executor/src/test/java/org/apache/shardingsphere/elasticjob/simple/executor/SimpleJobExecutorTest.java b/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-type/elasticjob-simple-executor/src/test/java/org/apache/shardingsphere/elasticjob/simple/executor/SimpleJobExecutorTest.java index e8152bd7ce..a0cd5667a0 100644 --- a/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-type/elasticjob-simple-executor/src/test/java/org/apache/shardingsphere/elasticjob/simple/executor/SimpleJobExecutorTest.java +++ b/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-type/elasticjob-simple-executor/src/test/java/org/apache/shardingsphere/elasticjob/simple/executor/SimpleJobExecutorTest.java @@ -21,11 +21,11 @@ import org.apache.shardingsphere.elasticjob.executor.JobFacade; import org.apache.shardingsphere.elasticjob.simple.job.FooSimpleJob; import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -33,7 +33,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class SimpleJobExecutorTest { @Mock @@ -47,7 +47,7 @@ public final class SimpleJobExecutorTest { private SimpleJobExecutor jobExecutor; - @Before + @BeforeEach public void setUp() { jobExecutor = new SimpleJobExecutor(); } diff --git a/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-type/pom.xml b/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-type/pom.xml index 2c6aecb8eb..bf34d52d97 100644 --- a/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-type/pom.xml +++ b/elasticjob-ecosystem/elasticjob-executor/elasticjob-executor-type/pom.xml @@ -39,13 +39,5 @@ org.projectlombok lombok - - org.mockito - mockito-core - - - org.mockito - mockito-inline - diff --git a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-api/pom.xml b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-api/pom.xml index c405795ff0..a549e4f6f5 100644 --- a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-api/pom.xml +++ b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-api/pom.xml @@ -57,14 +57,6 @@ lombok - - org.mockito - mockito-core - - - org.mockito - mockito-inline - org.slf4j jcl-over-slf4j diff --git a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/JobTracingEventBusTest.java b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/JobTracingEventBusTest.java index 0bf72652aa..b8a5d1f759 100644 --- a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/JobTracingEventBusTest.java +++ b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/JobTracingEventBusTest.java @@ -24,11 +24,11 @@ import org.apache.shardingsphere.elasticjob.tracing.event.JobExecutionEvent; import org.apache.shardingsphere.elasticjob.tracing.fixture.JobEventCaller; import org.apache.shardingsphere.elasticjob.tracing.fixture.TestTracingListener; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentMatchers; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.lang.reflect.Field; @@ -37,7 +37,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class JobTracingEventBusTest { @Mock diff --git a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/event/JobExecutionEventTest.java b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/event/JobExecutionEventTest.java index a0b6740f89..e14a49cf7b 100644 --- a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/event/JobExecutionEventTest.java +++ b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/event/JobExecutionEventTest.java @@ -17,14 +17,14 @@ package org.apache.shardingsphere.elasticjob.tracing.event; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class JobExecutionEventTest { diff --git a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/listener/TracingListenerFactoryTest.java b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/listener/TracingListenerFactoryTest.java index 73ad659d0c..56fa18eeca 100644 --- a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/listener/TracingListenerFactoryTest.java +++ b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/listener/TracingListenerFactoryTest.java @@ -21,21 +21,24 @@ import org.apache.shardingsphere.elasticjob.tracing.exception.TracingConfigurationException; import org.apache.shardingsphere.elasticjob.tracing.fixture.JobEventCallerConfiguration; import org.apache.shardingsphere.elasticjob.tracing.fixture.TestTracingListener; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; public final class TracingListenerFactoryTest { - @Test(expected = TracingConfigurationException.class) - public void assertGetListenerWithNullType() throws TracingConfigurationException { - TracingListenerFactory.getListener(new TracingConfiguration<>("", null)); + @Test + public void assertGetListenerWithNullType() { + assertThrows(TracingConfigurationException.class, () -> + TracingListenerFactory.getListener(new TracingConfiguration<>("", null))); } - - @Test(expected = TracingConfigurationException.class) - public void assertGetInvalidListener() throws TracingConfigurationException { - TracingListenerFactory.getListener(new TracingConfiguration<>("INVALID", null)); + + @Test + public void assertGetInvalidListener() { + assertThrows(TracingConfigurationException.class, () -> + TracingListenerFactory.getListener(new TracingConfiguration<>("INVALID", null))); } @Test diff --git a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/storage/TracingStorageConverterFactoryTest.java b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/storage/TracingStorageConverterFactoryTest.java index e4b4838c58..1c2c712da1 100644 --- a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/storage/TracingStorageConverterFactoryTest.java +++ b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/storage/TracingStorageConverterFactoryTest.java @@ -18,10 +18,10 @@ package org.apache.shardingsphere.elasticjob.tracing.storage; import org.apache.shardingsphere.elasticjob.tracing.fixture.JobEventCaller; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class TracingStorageConverterFactoryTest { diff --git a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/yaml/YamlTracingConfigurationConverterTest.java b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/yaml/YamlTracingConfigurationConverterTest.java index 69d3b142bf..5cefd95961 100644 --- a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/yaml/YamlTracingConfigurationConverterTest.java +++ b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/yaml/YamlTracingConfigurationConverterTest.java @@ -19,12 +19,12 @@ import org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration; import org.apache.shardingsphere.elasticjob.tracing.fixture.JobEventCaller; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertNotNull; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class YamlTracingConfigurationConverterTest { diff --git a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/pom.xml b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/pom.xml index 70674988d2..cd04ba62d5 100644 --- a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/pom.xml +++ b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/pom.xml @@ -38,14 +38,6 @@ lombok - - org.mockito - mockito-core - - - org.mockito - mockito-inline - org.slf4j jcl-over-slf4j diff --git a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceConfigurationTest.java b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceConfigurationTest.java index 347e7c4a51..442ec49f34 100644 --- a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceConfigurationTest.java +++ b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceConfigurationTest.java @@ -19,7 +19,7 @@ import com.zaxxer.hikari.HikariDataSource; import org.apache.commons.dbcp2.BasicDataSource; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.SQLException; import java.util.Arrays; @@ -31,9 +31,9 @@ import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; public final class DataSourceConfigurationTest { diff --git a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceRegistryTest.java b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceRegistryTest.java index 69ba1f6bd6..f2e4e863b2 100644 --- a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceRegistryTest.java +++ b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceRegistryTest.java @@ -17,10 +17,10 @@ package org.apache.shardingsphere.elasticjob.tracing.rdb.datasource; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import javax.sql.DataSource; @@ -31,7 +31,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class DataSourceRegistryTest { @Mock diff --git a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceTracingStorageConverterTest.java b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceTracingStorageConverterTest.java index a2f6b3b7d3..5fcc05194b 100644 --- a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceTracingStorageConverterTest.java +++ b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceTracingStorageConverterTest.java @@ -22,10 +22,10 @@ import org.apache.shardingsphere.elasticjob.tracing.exception.TracingStorageUnavailableException; import org.apache.shardingsphere.elasticjob.tracing.storage.TracingStorageConverter; import org.apache.shardingsphere.elasticjob.tracing.storage.TracingStorageConverterFactory; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import javax.sql.DataSource; import java.sql.Connection; @@ -33,12 +33,13 @@ import java.sql.SQLException; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertNotNull; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class DataSourceTracingStorageConverterTest { @Mock @@ -60,11 +61,13 @@ public void assertConvert() throws SQLException { assertNotNull(configuration); } - @Test(expected = TracingStorageUnavailableException.class) - public void assertConvertFailed() throws SQLException { - DataSourceTracingStorageConverter converter = new DataSourceTracingStorageConverter(); - doThrow(SQLException.class).when(dataSource).getConnection(); - converter.convertObjectToConfiguration(dataSource); + @Test + public void assertConvertFailed() { + assertThrows(TracingStorageUnavailableException.class, () -> { + DataSourceTracingStorageConverter converter = new DataSourceTracingStorageConverter(); + doThrow(SQLException.class).when(dataSource).getConnection(); + converter.convertObjectToConfiguration(dataSource); + }); } @Test diff --git a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerConfigurationTest.java b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerConfigurationTest.java index accf981ffd..47e7a79602 100644 --- a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerConfigurationTest.java +++ b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerConfigurationTest.java @@ -19,10 +19,11 @@ import org.apache.commons.dbcp2.BasicDataSource; import org.apache.shardingsphere.elasticjob.tracing.exception.TracingConfigurationException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; public final class RDBTracingListenerConfigurationTest { @@ -36,8 +37,9 @@ public void assertCreateTracingListenerSuccess() throws TracingConfigurationExce assertThat(new RDBTracingListenerConfiguration().createTracingListener(dataSource), instanceOf(RDBTracingListener.class)); } - @Test(expected = TracingConfigurationException.class) - public void assertCreateTracingListenerFailure() throws TracingConfigurationException { - new RDBTracingListenerConfiguration().createTracingListener(new BasicDataSource()); + @Test + public void assertCreateTracingListenerFailure() { + assertThrows(TracingConfigurationException.class, () -> + new RDBTracingListenerConfiguration().createTracingListener(new BasicDataSource())); } } diff --git a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerTest.java b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerTest.java index ef3ba055e9..3f67f4f355 100644 --- a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerTest.java +++ b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerTest.java @@ -26,11 +26,11 @@ import org.apache.shardingsphere.elasticjob.tracing.event.JobStatusTraceEvent.Source; import org.apache.shardingsphere.elasticjob.tracing.event.JobStatusTraceEvent.State; import org.apache.shardingsphere.elasticjob.tracing.rdb.storage.RDBJobEventStorage; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import javax.sql.DataSource; import java.lang.reflect.Field; @@ -39,7 +39,7 @@ import static org.mockito.Mockito.atMost; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class RDBTracingListenerTest { private static final String JOB_NAME = "test_rdb_event_listener"; @@ -49,7 +49,7 @@ public final class RDBTracingListenerTest { private JobTracingEventBus jobTracingEventBus; - @Before + @BeforeEach public void setUp() throws SQLException { BasicDataSource dataSource = new BasicDataSource(); dataSource.setDriverClassName(org.h2.Driver.class.getName()); diff --git a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/RDBJobEventStorageTest.java b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/RDBJobEventStorageTest.java index 73d4ed5bc4..ce708f28a1 100644 --- a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/RDBJobEventStorageTest.java +++ b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/RDBJobEventStorageTest.java @@ -22,19 +22,19 @@ import org.apache.shardingsphere.elasticjob.tracing.event.JobStatusTraceEvent; import org.apache.shardingsphere.elasticjob.tracing.event.JobStatusTraceEvent.Source; import org.apache.shardingsphere.elasticjob.tracing.event.JobStatusTraceEvent.State; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.sql.SQLException; import java.util.List; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.startsWith; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class RDBJobEventStorageTest { @@ -42,7 +42,7 @@ public final class RDBJobEventStorageTest { private BasicDataSource dataSource; - @Before + @BeforeEach public void setup() throws SQLException { dataSource = new BasicDataSource(); dataSource.setDriverClassName(org.h2.Driver.class.getName()); @@ -52,7 +52,7 @@ public void setup() throws SQLException { storage = RDBJobEventStorage.getInstance(dataSource); } - @After + @AfterEach public void teardown() throws SQLException { dataSource.close(); } diff --git a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfigurationConverterTest.java b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfigurationConverterTest.java index e8343dece4..8113a08c08 100644 --- a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfigurationConverterTest.java +++ b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfigurationConverterTest.java @@ -19,14 +19,14 @@ import org.apache.shardingsphere.elasticjob.tracing.rdb.datasource.DataSourceConfiguration; import org.apache.shardingsphere.elasticjob.tracing.yaml.YamlTracingStorageConfiguration; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.sql.DataSource; import java.util.Collections; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class YamlDataSourceConfigurationConverterTest { diff --git a/elasticjob-infra/elasticjob-infra-common/pom.xml b/elasticjob-infra/elasticjob-infra-common/pom.xml index 858eb77658..f352732a2c 100644 --- a/elasticjob-infra/elasticjob-infra-common/pom.xml +++ b/elasticjob-infra/elasticjob-infra-common/pom.xml @@ -60,14 +60,6 @@ lombok - - org.mockito - mockito-core - - - org.mockito - mockito-inline - org.slf4j jcl-over-slf4j diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/concurrent/ElasticJobExecutorServiceTest.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/concurrent/ElasticJobExecutorServiceTest.java index 9f847c3794..3db5903723 100644 --- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/concurrent/ElasticJobExecutorServiceTest.java +++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/concurrent/ElasticJobExecutorServiceTest.java @@ -18,15 +18,15 @@ package org.apache.shardingsphere.elasticjob.infra.concurrent; import org.awaitility.Awaitility; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class ElasticJobExecutorServiceTest { @@ -40,13 +40,13 @@ public void assertCreateExecutorService() { assertFalse(executorServiceObject.isShutdown()); ExecutorService executorService = executorServiceObject.createExecutorService(); executorService.submit(new FooTask()); - Awaitility.await().atLeast(100L, TimeUnit.MILLISECONDS).atMost(5L, TimeUnit.MINUTES).untilAsserted(() -> { + Awaitility.await().atLeast(1L, TimeUnit.MILLISECONDS).atMost(5L, TimeUnit.MINUTES).untilAsserted(() -> { assertThat(executorServiceObject.getActiveThreadCount(), is(1)); assertThat(executorServiceObject.getWorkQueueSize(), is(0)); assertFalse(executorServiceObject.isShutdown()); }); executorService.submit(new FooTask()); - Awaitility.await().atLeast(100L, TimeUnit.MILLISECONDS).atMost(5L, TimeUnit.MINUTES).untilAsserted(() -> { + Awaitility.await().atLeast(1L, TimeUnit.MILLISECONDS).atMost(5L, TimeUnit.MINUTES).untilAsserted(() -> { assertThat(executorServiceObject.getActiveThreadCount(), is(1)); assertThat(executorServiceObject.getWorkQueueSize(), is(1)); assertFalse(executorServiceObject.isShutdown()); diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/concurrent/ExecutorServiceReloadableTest.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/concurrent/ExecutorServiceReloadableTest.java index 01f6ce92cd..6aa87e4856 100644 --- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/concurrent/ExecutorServiceReloadableTest.java +++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/concurrent/ExecutorServiceReloadableTest.java @@ -19,22 +19,22 @@ import lombok.SneakyThrows; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.lang.reflect.Field; import java.util.concurrent.ExecutorService; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class ExecutorServiceReloadableTest { @Mock diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/context/ShardingItemParametersTest.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/context/ShardingItemParametersTest.java index d3ff6ddae1..ee6b5bc620 100755 --- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/context/ShardingItemParametersTest.java +++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/context/ShardingItemParametersTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.infra.context; import org.apache.shardingsphere.elasticjob.infra.exception.JobConfigurationException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.HashMap; @@ -26,17 +26,18 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; public final class ShardingItemParametersTest { - @Test(expected = JobConfigurationException.class) + @Test public void assertNewWhenPairFormatInvalid() { - new ShardingItemParameters("xxx-xxx"); + assertThrows(JobConfigurationException.class, () -> new ShardingItemParameters("xxx-xxx")); } - @Test(expected = JobConfigurationException.class) + @Test public void assertNewWhenItemIsNotNumber() { - new ShardingItemParameters("xxx=xxx"); + assertThrows(JobConfigurationException.class, () -> new ShardingItemParameters("xxx=xxx")); } @Test diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/context/TaskContextTest.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/context/TaskContextTest.java index b79085b9cf..93803aa430 100644 --- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/context/TaskContextTest.java +++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/context/TaskContextTest.java @@ -19,15 +19,15 @@ import org.apache.shardingsphere.elasticjob.infra.context.TaskContext.MetaInfo; import org.apache.shardingsphere.elasticjob.infra.context.fixture.TaskNode; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collections; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.startsWith; -import static org.junit.Assert.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class TaskContextTest { diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/env/HostExceptionTest.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/env/HostExceptionTest.java index 6b350ce261..45d1e478e4 100644 --- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/env/HostExceptionTest.java +++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/env/HostExceptionTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.infra.env; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/env/IpUtilsTest.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/env/IpUtilsTest.java index 158bd8bf1a..d2ea13281e 100644 --- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/env/IpUtilsTest.java +++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/env/IpUtilsTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.infra.env; import lombok.SneakyThrows; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -30,10 +30,10 @@ import java.util.Vector; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/env/TimeServiceTest.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/env/TimeServiceTest.java index 8f133a4ac1..55341edc51 100644 --- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/env/TimeServiceTest.java +++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/env/TimeServiceTest.java @@ -17,9 +17,9 @@ package org.apache.shardingsphere.elasticjob.infra.env; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TimeServiceTest { diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/ExceptionUtilsTest.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/ExceptionUtilsTest.java index bca6b78832..2d585f41e9 100644 --- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/ExceptionUtilsTest.java +++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/ExceptionUtilsTest.java @@ -17,11 +17,11 @@ package org.apache.shardingsphere.elasticjob.infra.exception; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class ExceptionUtilsTest { diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobConfigurationExceptionTest.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobConfigurationExceptionTest.java index dc05af367c..c94cecd137 100644 --- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobConfigurationExceptionTest.java +++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobConfigurationExceptionTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.infra.exception; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobExecutionEnvironmentExceptionTest.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobExecutionEnvironmentExceptionTest.java index 5064ea34fb..24c4bd19b4 100644 --- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobExecutionEnvironmentExceptionTest.java +++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobExecutionEnvironmentExceptionTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.infra.exception; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobStatisticExceptionTest.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobStatisticExceptionTest.java index e624b932a4..5e08bc50c9 100644 --- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobStatisticExceptionTest.java +++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobStatisticExceptionTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.infra.exception; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobSystemExceptionTest.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobSystemExceptionTest.java index 363a1b6aca..4596f0da32 100644 --- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobSystemExceptionTest.java +++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/exception/JobSystemExceptionTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.infra.exception; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/JobInstanceTest.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/JobInstanceTest.java index 9b1f087206..1cd13ae37d 100644 --- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/JobInstanceTest.java +++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/JobInstanceTest.java @@ -19,7 +19,7 @@ import org.apache.shardingsphere.elasticjob.infra.env.IpUtils; import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/JobShardingStrategyFactoryTest.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/JobShardingStrategyFactoryTest.java index f6eb14c32f..11a516c001 100644 --- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/JobShardingStrategyFactoryTest.java +++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/JobShardingStrategyFactoryTest.java @@ -20,10 +20,11 @@ import org.apache.shardingsphere.elasticjob.infra.exception.JobConfigurationException; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.impl.AverageAllocationJobShardingStrategy; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.impl.OdevitySortByNameJobShardingStrategy; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; public final class JobShardingStrategyFactoryTest { @@ -32,9 +33,10 @@ public void assertGetDefaultStrategy() { assertThat(JobShardingStrategyFactory.getStrategy(null), instanceOf(AverageAllocationJobShardingStrategy.class)); } - @Test(expected = JobConfigurationException.class) + @Test public void assertGetInvalidStrategy() { - JobShardingStrategyFactory.getStrategy("INVALID"); + assertThrows(JobConfigurationException.class, () -> + JobShardingStrategyFactory.getStrategy("INVALID")); } @Test diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/AverageAllocationJobShardingStrategyTest.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/AverageAllocationJobShardingStrategyTest.java index b4e6ab51a0..9d6525f7a9 100644 --- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/AverageAllocationJobShardingStrategyTest.java +++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/AverageAllocationJobShardingStrategyTest.java @@ -19,7 +19,7 @@ import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobShardingStrategy; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.Collections; diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/OdevitySortByNameJobShardingStrategyTest.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/OdevitySortByNameJobShardingStrategyTest.java index b9dc84eab8..b651b1f542 100644 --- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/OdevitySortByNameJobShardingStrategyTest.java +++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/OdevitySortByNameJobShardingStrategyTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.infra.handler.sharding.impl; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.Collections; diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/RotateServerByNameJobShardingStrategyTest.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/RotateServerByNameJobShardingStrategyTest.java index 04b3f7e198..e1709e9ab6 100644 --- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/RotateServerByNameJobShardingStrategyTest.java +++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/sharding/impl/RotateServerByNameJobShardingStrategyTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.infra.handler.sharding.impl; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.Collections; diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/JobExecutorServiceHandlerFactoryTest.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/JobExecutorServiceHandlerFactoryTest.java index 2dc51b2c51..863cd9860e 100644 --- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/JobExecutorServiceHandlerFactoryTest.java +++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/JobExecutorServiceHandlerFactoryTest.java @@ -20,10 +20,11 @@ import org.apache.shardingsphere.elasticjob.infra.exception.JobConfigurationException; import org.apache.shardingsphere.elasticjob.infra.handler.threadpool.impl.CPUUsageJobExecutorServiceHandler; import org.apache.shardingsphere.elasticjob.infra.handler.threadpool.impl.SingleThreadJobExecutorServiceHandler; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; public final class JobExecutorServiceHandlerFactoryTest { @@ -32,9 +33,10 @@ public void assertGetDefaultHandler() { assertThat(JobExecutorServiceHandlerFactory.getHandler(""), instanceOf(CPUUsageJobExecutorServiceHandler.class)); } - @Test(expected = JobConfigurationException.class) + @Test public void assertGetInvalidHandler() { - JobExecutorServiceHandlerFactory.getHandler("INVALID"); + assertThrows(JobConfigurationException.class, () -> + JobExecutorServiceHandlerFactory.getHandler("INVALID")); } @Test diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/impl/CPUUsageJobExecutorServiceHandlerTest.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/impl/CPUUsageJobExecutorServiceHandlerTest.java index 49d1151c3e..b2a3e9720c 100644 --- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/impl/CPUUsageJobExecutorServiceHandlerTest.java +++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/impl/CPUUsageJobExecutorServiceHandlerTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.infra.handler.threadpool.impl; import org.apache.shardingsphere.elasticjob.infra.handler.threadpool.JobExecutorServiceHandlerFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/impl/SingleThreadJobExecutorServiceHandlerTest.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/impl/SingleThreadJobExecutorServiceHandlerTest.java index 7e15268310..f4b05ffc87 100644 --- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/impl/SingleThreadJobExecutorServiceHandlerTest.java +++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/handler/threadpool/impl/SingleThreadJobExecutorServiceHandlerTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.infra.handler.threadpool.impl; import org.apache.shardingsphere.elasticjob.infra.handler.threadpool.JobExecutorServiceHandlerFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/json/GsonFactoryTest.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/json/GsonFactoryTest.java index 40e4ae828f..23fc1a90e7 100644 --- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/json/GsonFactoryTest.java +++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/json/GsonFactoryTest.java @@ -22,11 +22,13 @@ import com.google.gson.TypeAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; +import org.junit.jupiter.api.Test; + import java.io.IOException; -import org.junit.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; public final class GsonFactoryTest { @@ -66,10 +68,12 @@ public void assertParser() { assertThat(GsonFactory.getJsonParser().parse(json).getAsJsonObject().get("name").getAsString(), is("test")); } - @Test(expected = JsonParseException.class) + @Test public void assertParserWithException() { - String json = "{\"name\":\"test\""; - assertThat(GsonFactory.getJsonParser().parse(json).getAsJsonObject().get("name").getAsString(), is("test")); + assertThrows(JsonParseException.class, () -> { + String json = "{\"name\":\"test\""; + assertThat(GsonFactory.getJsonParser().parse(json).getAsJsonObject().get("name").getAsString(), is("test")); + }); } } diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/listener/ElasticJobListenerFactoryTest.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/listener/ElasticJobListenerFactoryTest.java index 2e94d4992d..f00a68bc87 100644 --- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/listener/ElasticJobListenerFactoryTest.java +++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/listener/ElasticJobListenerFactoryTest.java @@ -19,16 +19,18 @@ import org.apache.shardingsphere.elasticjob.infra.exception.JobConfigurationException; import org.apache.shardingsphere.elasticjob.infra.listener.fixture.FooElasticJobListener; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; public final class ElasticJobListenerFactoryTest { - @Test(expected = JobConfigurationException.class) + @Test public void assertCreateInvalidJobListener() { - ElasticJobListenerFactory.createListener("INVALID").orElseThrow(() -> new JobConfigurationException("Invalid elastic job listener!")); + assertThrows(JobConfigurationException.class, () -> + ElasticJobListenerFactory.createListener("INVALID").orElseThrow(() -> new JobConfigurationException("Invalid elastic job listener!"))); } @Test diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/listener/ShardingContextsTest.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/listener/ShardingContextsTest.java index 4c4cd7d3f2..8eb20c5af0 100644 --- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/listener/ShardingContextsTest.java +++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/listener/ShardingContextsTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.infra.listener; import org.apache.shardingsphere.elasticjob.api.ShardingContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.Map; diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/pojo/JobConfigurationPOJOTest.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/pojo/JobConfigurationPOJOTest.java index 5129280b87..1fbdf14b07 100644 --- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/pojo/JobConfigurationPOJOTest.java +++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/pojo/JobConfigurationPOJOTest.java @@ -19,16 +19,16 @@ import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collections; import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class JobConfigurationPOJOTest { diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/spi/ElasticJobServiceLoaderTest.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/spi/ElasticJobServiceLoaderTest.java index 063ea3b2e4..fb0ad8b5cd 100644 --- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/spi/ElasticJobServiceLoaderTest.java +++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/spi/ElasticJobServiceLoaderTest.java @@ -19,8 +19,9 @@ import org.apache.shardingsphere.elasticjob.infra.spi.fixture.TypedFooService; import org.apache.shardingsphere.elasticjob.infra.spi.fixture.UnRegisteredTypedFooService; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.util.Properties; @@ -29,7 +30,7 @@ public final class ElasticJobServiceLoaderTest { - @BeforeClass + @BeforeAll public static void register() { ElasticJobServiceLoader.registerTypedService(TypedFooService.class); } @@ -44,23 +45,27 @@ public void assertNewTypedServiceInstance() { assertThat(ElasticJobServiceLoader.getCachedTypedServiceInstance(TypedFooService.class, "typedFooServiceImpl").orElse(null), instanceOf(TypedFooService.class)); } - @Test(expected = IllegalArgumentException.class) + @Test public void assertGetCacheTypedServiceFailureWithUnRegisteredServiceInterface() { - ElasticJobServiceLoader.getCachedTypedServiceInstance(UnRegisteredTypedFooService.class, "unRegisteredTypedFooServiceImpl").orElseThrow(IllegalArgumentException::new); + Assertions.assertThrows(IllegalArgumentException.class, () -> + ElasticJobServiceLoader.getCachedTypedServiceInstance(UnRegisteredTypedFooService.class, "unRegisteredTypedFooServiceImpl").orElseThrow(IllegalArgumentException::new)); } - @Test(expected = IllegalArgumentException.class) + @Test public void assertGetCacheTypedServiceFailureWithInvalidType() { - ElasticJobServiceLoader.getCachedTypedServiceInstance(TypedFooService.class, "INVALID").orElseThrow(IllegalArgumentException::new); + Assertions.assertThrows(IllegalArgumentException.class, () -> + ElasticJobServiceLoader.getCachedTypedServiceInstance(TypedFooService.class, "INVALID").orElseThrow(IllegalArgumentException::new)); } - @Test(expected = IllegalArgumentException.class) + @Test public void assertNewTypedServiceInstanceFailureWithUnRegisteredServiceInterface() { - ElasticJobServiceLoader.newTypedServiceInstance(UnRegisteredTypedFooService.class, "unRegisteredTypedFooServiceImpl", new Properties()).orElseThrow(IllegalArgumentException::new); + Assertions.assertThrows(IllegalArgumentException.class, () -> + ElasticJobServiceLoader.newTypedServiceInstance(UnRegisteredTypedFooService.class, "unRegisteredTypedFooServiceImpl", new Properties()).orElseThrow(IllegalArgumentException::new)); } - @Test(expected = IllegalArgumentException.class) + @Test public void assertNewTypedServiceInstanceFailureWithInvalidType() { - ElasticJobServiceLoader.newTypedServiceInstance(TypedFooService.class, "INVALID", new Properties()).orElseThrow(IllegalArgumentException::new); + Assertions.assertThrows(IllegalArgumentException.class, () -> + ElasticJobServiceLoader.newTypedServiceInstance(TypedFooService.class, "INVALID", new Properties()).orElseThrow(IllegalArgumentException::new)); } } diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/validator/JobPropertiesValidateRuleTest.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/validator/JobPropertiesValidateRuleTest.java index ec652a6633..5f7e0e3c9c 100644 --- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/validator/JobPropertiesValidateRuleTest.java +++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/validator/JobPropertiesValidateRuleTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.infra.validator; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Properties; diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/yaml/YamlEngineTest.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/yaml/YamlEngineTest.java index fee915e059..9bebfef178 100644 --- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/yaml/YamlEngineTest.java +++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/yaml/YamlEngineTest.java @@ -18,11 +18,11 @@ package org.apache.shardingsphere.elasticjob.infra.yaml; import org.apache.shardingsphere.elasticjob.infra.yaml.fixture.FooYamlConfiguration; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertNull; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertNull; public final class YamlEngineTest { diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/yaml/config/YamlConfigurationConverterFactoryTest.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/yaml/config/YamlConfigurationConverterFactoryTest.java index e6f4de178c..7c02c0ea57 100644 --- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/yaml/config/YamlConfigurationConverterFactoryTest.java +++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/yaml/config/YamlConfigurationConverterFactoryTest.java @@ -17,9 +17,9 @@ package org.apache.shardingsphere.elasticjob.infra.yaml.config; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; public final class YamlConfigurationConverterFactoryTest { diff --git a/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/pom.xml b/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/pom.xml index 46951a2acf..6819cb1324 100644 --- a/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/pom.xml +++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/pom.xml @@ -35,14 +35,6 @@ org.projectlombok lombok - - org.mockito - mockito-core - - - org.mockito - mockito-inline - org.slf4j jcl-over-slf4j diff --git a/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/test/java/org/apache/shardingsphere/elasticjob/reg/base/transaction/TransactionOperationTest.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/test/java/org/apache/shardingsphere/elasticjob/reg/base/transaction/TransactionOperationTest.java index 75be29dc20..bf382a5366 100644 --- a/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/test/java/org/apache/shardingsphere/elasticjob/reg/base/transaction/TransactionOperationTest.java +++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/test/java/org/apache/shardingsphere/elasticjob/reg/base/transaction/TransactionOperationTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.reg.base.transaction; import org.apache.shardingsphere.elasticjob.reg.base.transaction.TransactionOperation.Type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/test/java/org/apache/shardingsphere/elasticjob/reg/exception/RegExceptionHandlerTest.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/test/java/org/apache/shardingsphere/elasticjob/reg/exception/RegExceptionHandlerTest.java index 4f3fde82bd..e619bf325b 100644 --- a/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/test/java/org/apache/shardingsphere/elasticjob/reg/exception/RegExceptionHandlerTest.java +++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-registry-center-api/src/test/java/org/apache/shardingsphere/elasticjob/reg/exception/RegExceptionHandlerTest.java @@ -17,13 +17,15 @@ package org.apache.shardingsphere.elasticjob.reg.exception; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertThrows; public final class RegExceptionHandlerTest { @Test - @Ignore + @Disabled // TODO throw InterruptedException will cause zookeeper TestingServer break. Ignore first, fix it later. public void assertHandleExceptionWithInterruptedException() { RegExceptionHandler.handleException(new InterruptedException()); @@ -34,8 +36,8 @@ public void assertHandleExceptionWithNull() { RegExceptionHandler.handleException(null); } - @Test(expected = RegException.class) + @Test public void assertHandleExceptionWithOtherException() { - RegExceptionHandler.handleException(new RuntimeException()); + assertThrows(RegException.class, () -> RegExceptionHandler.handleException(new RuntimeException())); } } diff --git a/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/pom.xml b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/pom.xml index c2f3614a9a..58210f29e2 100644 --- a/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/pom.xml +++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/pom.xml @@ -55,14 +55,6 @@ org.apache.curator curator-test - - org.mockito - mockito-core - - - org.mockito - mockito-inline - org.slf4j jcl-over-slf4j diff --git a/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperConfigurationTest.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperConfigurationTest.java index c7f8e7b3c0..4b11d653b4 100644 --- a/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperConfigurationTest.java +++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperConfigurationTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.reg.zookeeper; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperElectionServiceTest.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperElectionServiceTest.java index a288292428..826ec40096 100644 --- a/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperElectionServiceTest.java +++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperElectionServiceTest.java @@ -25,11 +25,11 @@ import org.apache.curator.test.KillSession; import org.apache.shardingsphere.elasticjob.reg.base.ElectionCandidate; import org.apache.shardingsphere.elasticjob.reg.zookeeper.fixture.EmbedTestingServer; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.lang.reflect.Field; import java.util.concurrent.CountDownLatch; @@ -39,7 +39,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class ZookeeperElectionServiceTest { private static final String HOST_AND_PORT = "localhost:8899"; @@ -49,7 +49,7 @@ public class ZookeeperElectionServiceTest { @Mock private ElectionCandidate electionCandidate; - @BeforeClass + @BeforeAll public static void init() { EmbedTestingServer.start(); } diff --git a/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterExecuteInLeaderTest.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterExecuteInLeaderTest.java index 7e58bddec1..bc8e215b14 100644 --- a/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterExecuteInLeaderTest.java +++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterExecuteInLeaderTest.java @@ -20,13 +20,15 @@ import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.elasticjob.reg.base.LeaderExecutionCallback; import org.apache.shardingsphere.elasticjob.reg.zookeeper.fixture.EmbedTestingServer; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; public final class ZookeeperRegistryCenterExecuteInLeaderTest { @@ -36,7 +38,7 @@ public final class ZookeeperRegistryCenterExecuteInLeaderTest { private static ZookeeperRegistryCenter zkRegCenter; - @BeforeClass + @BeforeAll public static void setUp() { EmbedTestingServer.start(); zkRegCenter = new ZookeeperRegistryCenter(ZOOKEEPER_CONFIGURATION); @@ -44,12 +46,13 @@ public static void setUp() { zkRegCenter.init(); } - @AfterClass + @AfterAll public static void tearDown() { zkRegCenter.close(); } - @Test(timeout = 10000L) + @Test + @Timeout(value = 10000L, unit = TimeUnit.MILLISECONDS) public void assertExecuteInLeader() throws InterruptedException { final int threads = 10; CountDownLatch countDownLatch = new CountDownLatch(threads); diff --git a/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterForAuthTest.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterForAuthTest.java index 6167856359..61626ceecb 100644 --- a/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterForAuthTest.java +++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterForAuthTest.java @@ -23,12 +23,13 @@ import org.apache.shardingsphere.elasticjob.reg.zookeeper.fixture.EmbedTestingServer; import org.apache.shardingsphere.elasticjob.reg.zookeeper.util.ZookeeperRegistryCenterTestUtil; import org.apache.zookeeper.KeeperException.NoAuthException; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; public final class ZookeeperRegistryCenterForAuthTest { @@ -38,7 +39,7 @@ public final class ZookeeperRegistryCenterForAuthTest { private static ZookeeperRegistryCenter zkRegCenter; - @BeforeClass + @BeforeAll public static void setUp() { EmbedTestingServer.start(); ZOOKEEPER_CONFIGURATION.setDigest("digest:password"); @@ -49,7 +50,7 @@ public static void setUp() { ZookeeperRegistryCenterTestUtil.persist(zkRegCenter); } - @AfterClass + @AfterAll public static void tearDown() { zkRegCenter.close(); } @@ -65,11 +66,13 @@ public void assertInitWithDigestSuccess() throws Exception { assertThat(client.getData().forPath("/" + ZookeeperRegistryCenterForAuthTest.class.getName() + "/test/deep/nested"), is("deepNested".getBytes())); } - @Test(expected = NoAuthException.class) - public void assertInitWithDigestFailure() throws Exception { - CuratorFramework client = CuratorFrameworkFactory.newClient(EmbedTestingServer.getConnectionString(), new RetryOneTime(2000)); - client.start(); - client.blockUntilConnected(); - client.getData().forPath("/" + ZookeeperRegistryCenterForAuthTest.class.getName() + "/test/deep/nested"); + @Test + public void assertInitWithDigestFailure() { + assertThrows(NoAuthException.class, () -> { + CuratorFramework client = CuratorFrameworkFactory.newClient(EmbedTestingServer.getConnectionString(), new RetryOneTime(2000)); + client.start(); + client.blockUntilConnected(); + client.getData().forPath("/" + ZookeeperRegistryCenterForAuthTest.class.getName() + "/test/deep/nested"); + }); } } diff --git a/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterInitFailureTest.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterInitFailureTest.java index 7c18d224b2..9d301af581 100644 --- a/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterInitFailureTest.java +++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterInitFailureTest.java @@ -18,13 +18,17 @@ package org.apache.shardingsphere.elasticjob.reg.zookeeper; import org.apache.shardingsphere.elasticjob.reg.exception.RegException; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertThrows; public final class ZookeeperRegistryCenterInitFailureTest { - - @Test(expected = RegException.class) + + @Test public void assertInitFailure() { - ZookeeperRegistryCenter zkRegCenter = new ZookeeperRegistryCenter(new ZookeeperConfiguration("localhost:1", ZookeeperRegistryCenterInitFailureTest.class.getName())); - zkRegCenter.init(); + assertThrows(RegException.class, () -> { + ZookeeperRegistryCenter zkRegCenter = new ZookeeperRegistryCenter(new ZookeeperConfiguration("localhost:1", ZookeeperRegistryCenterInitFailureTest.class.getName())); + zkRegCenter.init(); + }); } } diff --git a/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterListenerTest.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterListenerTest.java index 9b2d42b01d..bd4f0a65ee 100644 --- a/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterListenerTest.java +++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterListenerTest.java @@ -23,25 +23,25 @@ import org.apache.curator.framework.recipes.cache.CuratorCacheListener; import org.apache.curator.framework.state.ConnectionStateListener; import org.apache.shardingsphere.elasticjob.reg.zookeeper.util.ZookeeperRegistryCenterTestUtil; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.ArrayList; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class ZookeeperRegistryCenterListenerTest { @Mock @@ -63,7 +63,7 @@ public class ZookeeperRegistryCenterListenerTest { private final String jobPath = "/test_job"; - @Before + @BeforeEach public void setUp() { regCenter = new ZookeeperRegistryCenter(null); ZookeeperRegistryCenterTestUtil.setFieldValue(regCenter, "caches", caches); @@ -79,7 +79,7 @@ public void testAddConnectionStateChangedEventListener() throws Exception { } @Test - public void testWatch() throws Exception { + public void testWatch() { when(caches.get(jobPath + "/")).thenReturn(cache); when(cache.listenable()).thenReturn(dataListenable); regCenter.watch(jobPath, null, null); @@ -88,7 +88,7 @@ public void testWatch() throws Exception { } @Test - public void testRemoveDataListenersNonCache() throws Exception { + public void testRemoveDataListenersNonCache() { when(cache.listenable()).thenReturn(dataListenable); regCenter.removeDataListeners(jobPath); verify(cache.listenable(), never()).removeListener(any()); @@ -96,7 +96,7 @@ public void testRemoveDataListenersNonCache() throws Exception { } @Test - public void testRemoveDataListenersHasCache() throws Exception { + public void testRemoveDataListenersHasCache() { when(caches.get(jobPath + "/")).thenReturn(cache); when(cache.listenable()).thenReturn(dataListenable); List list = new ArrayList<>(); @@ -118,7 +118,7 @@ public void testRemoveDataListenersHasCacheEmptyListeners() throws Exception { } @Test - public void testRemoveConnStateListener() throws Exception { + public void testRemoveConnStateListener() { when(client.getConnectionStateListenable()).thenReturn(connStateListenable); List list = new ArrayList<>(); list.add(null); diff --git a/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterMiscellaneousTest.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterMiscellaneousTest.java index 7c79aaaf9b..332ed279a0 100644 --- a/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterMiscellaneousTest.java +++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterMiscellaneousTest.java @@ -20,9 +20,9 @@ import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.recipes.cache.CuratorCache; import org.apache.shardingsphere.elasticjob.reg.zookeeper.fixture.EmbedTestingServer; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; @@ -35,7 +35,7 @@ public final class ZookeeperRegistryCenterMiscellaneousTest { private static ZookeeperRegistryCenter zkRegCenter; - @BeforeClass + @BeforeAll public static void setUp() { EmbedTestingServer.start(); ZOOKEEPER_CONFIGURATION.setConnectionTimeoutMilliseconds(30000); @@ -44,7 +44,7 @@ public static void setUp() { zkRegCenter.addCacheData("/test"); } - @AfterClass + @AfterAll public static void tearDown() { zkRegCenter.close(); } diff --git a/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterModifyTest.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterModifyTest.java index b2cfe34bcb..45756679d4 100644 --- a/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterModifyTest.java +++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterModifyTest.java @@ -22,18 +22,18 @@ import org.apache.curator.retry.RetryOneTime; import org.apache.shardingsphere.elasticjob.reg.zookeeper.fixture.EmbedTestingServer; import org.apache.shardingsphere.elasticjob.reg.zookeeper.util.ZookeeperRegistryCenterTestUtil; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.util.List; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.startsWith; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class ZookeeperRegistryCenterModifyTest { @@ -41,7 +41,7 @@ public final class ZookeeperRegistryCenterModifyTest { private static ZookeeperRegistryCenter zkRegCenter; - @BeforeClass + @BeforeAll public static void setUp() { EmbedTestingServer.start(); zkRegCenter = new ZookeeperRegistryCenter(ZOOKEEPER_CONFIGURATION); @@ -50,7 +50,7 @@ public static void setUp() { ZookeeperRegistryCenterTestUtil.persist(zkRegCenter); } - @AfterClass + @AfterAll public static void tearDown() { zkRegCenter.close(); } diff --git a/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithCacheTest.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithCacheTest.java index fd66306e86..9940b8228c 100644 --- a/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithCacheTest.java +++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithCacheTest.java @@ -19,13 +19,13 @@ import org.apache.shardingsphere.elasticjob.reg.zookeeper.fixture.EmbedTestingServer; import org.apache.shardingsphere.elasticjob.reg.zookeeper.util.ZookeeperRegistryCenterTestUtil; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertNull; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertNull; public final class ZookeeperRegistryCenterQueryWithCacheTest { @@ -34,7 +34,7 @@ public final class ZookeeperRegistryCenterQueryWithCacheTest { private static ZookeeperRegistryCenter zkRegCenter; - @BeforeClass + @BeforeAll public static void setUp() { EmbedTestingServer.start(); zkRegCenter = new ZookeeperRegistryCenter(ZOOKEEPER_CONFIGURATION); @@ -44,7 +44,7 @@ public static void setUp() { zkRegCenter.addCacheData("/test"); } - @AfterClass + @AfterAll public static void tearDown() { zkRegCenter.close(); } diff --git a/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithoutCacheTest.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithoutCacheTest.java index 94e10906a2..d8407dd7e5 100644 --- a/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithoutCacheTest.java +++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithoutCacheTest.java @@ -19,18 +19,18 @@ import org.apache.shardingsphere.elasticjob.reg.zookeeper.fixture.EmbedTestingServer; import org.apache.shardingsphere.elasticjob.reg.zookeeper.util.ZookeeperRegistryCenterTestUtil; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.Collections; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class ZookeeperRegistryCenterQueryWithoutCacheTest { @@ -39,7 +39,7 @@ public final class ZookeeperRegistryCenterQueryWithoutCacheTest { private static ZookeeperRegistryCenter zkRegCenter; - @BeforeClass + @BeforeAll public static void setUp() { EmbedTestingServer.start(); ZOOKEEPER_CONFIGURATION.setConnectionTimeoutMilliseconds(30000); @@ -49,7 +49,7 @@ public static void setUp() { zkRegCenter.addCacheData("/other"); } - @AfterClass + @AfterAll public static void tearDown() { zkRegCenter.close(); } diff --git a/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterTransactionTest.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterTransactionTest.java index dd619ef34e..52aa4f0400 100644 --- a/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterTransactionTest.java +++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterTransactionTest.java @@ -21,37 +21,37 @@ import org.apache.shardingsphere.elasticjob.reg.zookeeper.fixture.EmbedTestingServer; import org.apache.shardingsphere.elasticjob.reg.zookeeper.util.ZookeeperRegistryCenterTestUtil; import org.apache.zookeeper.KeeperException; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertFalse; public final class ZookeeperRegistryCenterTransactionTest { - + private static final ZookeeperConfiguration ZOOKEEPER_CONFIGURATION = new ZookeeperConfiguration(EmbedTestingServer.getConnectionString(), ZookeeperRegistryCenterTransactionTest.class.getName()); - + private static ZookeeperRegistryCenter zkRegCenter; - - @BeforeClass + + @BeforeAll public static void setUp() { EmbedTestingServer.start(); zkRegCenter = new ZookeeperRegistryCenter(ZOOKEEPER_CONFIGURATION); ZOOKEEPER_CONFIGURATION.setConnectionTimeoutMilliseconds(30000); zkRegCenter.init(); } - - @Before + + @BeforeEach public void setup() { ZookeeperRegistryCenterTestUtil.persist(zkRegCenter); } - + @Test public void assertExecuteInTransactionSucceeded() throws Exception { List operations = new ArrayList<>(3); @@ -62,7 +62,7 @@ public void assertExecuteInTransactionSucceeded() throws Exception { zkRegCenter.executeInTransaction(operations); assertThat(zkRegCenter.getDirectly("/test/transaction"), is("transaction")); } - + @Test public void assertExecuteInTransactionFailed() throws Exception { List operations = new ArrayList<>(3); diff --git a/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterWatchTest.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterWatchTest.java index 58a08d60be..1bf5a24edc 100644 --- a/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterWatchTest.java +++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterWatchTest.java @@ -21,25 +21,27 @@ import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent; import org.apache.shardingsphere.elasticjob.reg.zookeeper.fixture.EmbedTestingServer; import org.apache.shardingsphere.elasticjob.reg.zookeeper.util.ZookeeperRegistryCenterTestUtil; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; +import java.util.concurrent.TimeUnit; import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.MatcherAssert.assertThat; public final class ZookeeperRegistryCenterWatchTest { - + private static final ZookeeperConfiguration ZOOKEEPER_CONFIGURATION = new ZookeeperConfiguration(EmbedTestingServer.getConnectionString(), ZookeeperRegistryCenterWatchTest.class.getName()); - + private static ZookeeperRegistryCenter zkRegCenter; - - @BeforeClass + + @BeforeAll public static void setUp() { EmbedTestingServer.start(); zkRegCenter = new ZookeeperRegistryCenter(ZOOKEEPER_CONFIGURATION); @@ -47,13 +49,14 @@ public static void setUp() { zkRegCenter.init(); ZookeeperRegistryCenterTestUtil.persist(zkRegCenter); } - - @AfterClass + + @AfterAll public static void tearDown() { zkRegCenter.close(); } - @Test(timeout = 10000L) + @Test + @Timeout(value = 10000L, unit = TimeUnit.MILLISECONDS) public void assertWatchWithoutExecutor() throws InterruptedException { CountDownLatch waitingForCountDownValue = new CountDownLatch(1); String key = "/test-watch-without-executor"; @@ -70,8 +73,9 @@ public void assertWatchWithoutExecutor() throws InterruptedException { zkRegCenter.update(key, "countDown"); waitingForCountDownValue.await(); } - - @Test(timeout = 10000L) + + @Test + @Timeout(value = 10000L, unit = TimeUnit.MILLISECONDS) public void assertWatchWithExecutor() throws InterruptedException { CountDownLatch waitingForCountDownValue = new CountDownLatch(1); String key = "/test-watch-with-executor"; diff --git a/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/exception/ZookeeperCuratorIgnoredExceptionProviderTest.java b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/exception/ZookeeperCuratorIgnoredExceptionProviderTest.java index 1508ed4b07..70109d83e0 100644 --- a/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/exception/ZookeeperCuratorIgnoredExceptionProviderTest.java +++ b/elasticjob-infra/elasticjob-registry-center/elasticjob-regitry-center-provider/elasticjob-registry-center-zookeeper-curator/src/test/java/org/apache/shardingsphere/elasticjob/reg/zookeeper/exception/ZookeeperCuratorIgnoredExceptionProviderTest.java @@ -20,7 +20,7 @@ import org.apache.zookeeper.KeeperException.ConnectionLossException; import org.apache.zookeeper.KeeperException.NoNodeException; import org.apache.zookeeper.KeeperException.NodeExistsException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; diff --git a/elasticjob-infra/elasticjob-restful/pom.xml b/elasticjob-infra/elasticjob-restful/pom.xml index 9d0b82509d..61705269dd 100644 --- a/elasticjob-infra/elasticjob-restful/pom.xml +++ b/elasticjob-infra/elasticjob-restful/pom.xml @@ -47,14 +47,6 @@ slf4j-jdk14 true - - org.mockito - mockito-core - - - org.mockito - mockito-inline - io.netty netty-common diff --git a/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/RegexPathMatcherTest.java b/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/RegexPathMatcherTest.java index aa302c2a97..6770959ca9 100644 --- a/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/RegexPathMatcherTest.java +++ b/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/RegexPathMatcherTest.java @@ -19,15 +19,15 @@ import org.apache.shardingsphere.elasticjob.restful.mapping.PathMatcher; import org.apache.shardingsphere.elasticjob.restful.mapping.RegexPathMatcher; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Map; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class RegexPathMatcherTest { diff --git a/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/RegexUrlPatternMapTest.java b/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/RegexUrlPatternMapTest.java index ea977967f5..f124f4ab45 100644 --- a/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/RegexUrlPatternMapTest.java +++ b/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/RegexUrlPatternMapTest.java @@ -19,12 +19,13 @@ import org.apache.shardingsphere.elasticjob.restful.mapping.MappingContext; import org.apache.shardingsphere.elasticjob.restful.mapping.RegexUrlPatternMap; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; public final class RegexUrlPatternMapTest { @@ -58,11 +59,13 @@ public void assertAmbiguous() { assertThat(mappingContext.payload(), is(11)); } - @Test(expected = IllegalArgumentException.class) + @Test public void assertDuplicate() { - RegexUrlPatternMap urlPatternMap = new RegexUrlPatternMap<>(); - urlPatternMap.put("/app/{jobName}/enable", 0); - urlPatternMap.put("/app/{jobName}", 1); - urlPatternMap.put("/app/{appName}", 2); + assertThrows(IllegalArgumentException.class, () -> { + RegexUrlPatternMap urlPatternMap = new RegexUrlPatternMap<>(); + urlPatternMap.put("/app/{jobName}/enable", 0); + urlPatternMap.put("/app/{jobName}", 1); + urlPatternMap.put("/app/{appName}", 2); + }); } } diff --git a/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/deserializer/RequestBodyDeserializerFactoryTest.java b/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/deserializer/RequestBodyDeserializerFactoryTest.java index 956ec4d3bb..9c79763559 100644 --- a/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/deserializer/RequestBodyDeserializerFactoryTest.java +++ b/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/deserializer/RequestBodyDeserializerFactoryTest.java @@ -18,9 +18,10 @@ package org.apache.shardingsphere.elasticjob.restful.deserializer; import io.netty.handler.codec.http.HttpHeaderValues; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; public final class RequestBodyDeserializerFactoryTest { @@ -30,8 +31,9 @@ public void assertGetJsonDefaultDeserializer() { assertNotNull(deserializer); } - @Test(expected = RequestBodyDeserializerNotFoundException.class) + @Test public void assertDeserializerNotFound() { - RequestBodyDeserializerFactory.getRequestBodyDeserializer("Unknown"); + assertThrows(RequestBodyDeserializerNotFoundException.class, () -> + RequestBodyDeserializerFactory.getRequestBodyDeserializer("Unknown")); } } diff --git a/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/filter/DefaultFilterChainTest.java b/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/filter/DefaultFilterChainTest.java index 85a25864c3..d3dc3f022c 100644 --- a/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/filter/DefaultFilterChainTest.java +++ b/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/filter/DefaultFilterChainTest.java @@ -24,25 +24,26 @@ import org.apache.shardingsphere.elasticjob.restful.Filter; import org.apache.shardingsphere.elasticjob.restful.handler.HandleContext; import org.apache.shardingsphere.elasticjob.restful.handler.Handler; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.lang.reflect.Field; import java.util.Arrays; import java.util.Collections; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class DefaultFilterChainTest { @Mock @@ -56,7 +57,7 @@ public final class DefaultFilterChainTest { private HandleContext handleContext; - @Before + @BeforeEach public void setUp() { handleContext = new HandleContext<>(httpRequest, httpResponse); } @@ -127,23 +128,27 @@ public void assertWithThreeFiltersDoResponseByTheSecond() { verify(ctx).writeAndFlush(httpResponse); } - @Test(expected = IllegalStateException.class) + @Test public void assertInvokeFinishedFilterChainWithoutFilter() { - DefaultFilterChain filterChain = new DefaultFilterChain(Collections.emptyList(), ctx, handleContext); - filterChain.next(httpRequest); - filterChain.next(httpRequest); + assertThrows(IllegalStateException.class, () -> { + DefaultFilterChain filterChain = new DefaultFilterChain(Collections.emptyList(), ctx, handleContext); + filterChain.next(httpRequest); + filterChain.next(httpRequest); + }); } - @Test(expected = IllegalStateException.class) + @Test public void assertInvokePassedThroughFilterChainWithTwoFilters() { - Filter firstFilter = spy(new PassableFilter()); - Filter secondFilter = spy(new PassableFilter()); - DefaultFilterChain filterChain = new DefaultFilterChain(Arrays.asList(firstFilter, secondFilter), ctx, handleContext); - filterChain.next(httpRequest); - verify(firstFilter).doFilter(httpRequest, httpResponse, filterChain); - verify(secondFilter).doFilter(httpRequest, httpResponse, filterChain); - verify(ctx).fireChannelRead(handleContext); - filterChain.next(httpRequest); + assertThrows(IllegalStateException.class, () -> { + Filter firstFilter = spy(new PassableFilter()); + Filter secondFilter = spy(new PassableFilter()); + DefaultFilterChain filterChain = new DefaultFilterChain(Arrays.asList(firstFilter, secondFilter), ctx, handleContext); + filterChain.next(httpRequest); + verify(firstFilter).doFilter(httpRequest, httpResponse, filterChain); + verify(secondFilter).doFilter(httpRequest, httpResponse, filterChain); + verify(ctx).fireChannelRead(handleContext); + filterChain.next(httpRequest); + }); } private boolean isPassedThrough(final DefaultFilterChain filterChain) { diff --git a/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/FilterChainInboundHandlerTest.java b/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/FilterChainInboundHandlerTest.java index d25e444f4d..f3f95c3dbc 100644 --- a/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/FilterChainInboundHandlerTest.java +++ b/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/FilterChainInboundHandlerTest.java @@ -22,11 +22,11 @@ import org.apache.shardingsphere.elasticjob.restful.Filter; import org.apache.shardingsphere.elasticjob.restful.handler.HandleContext; import org.apache.shardingsphere.elasticjob.restful.handler.Handler; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.List; @@ -35,7 +35,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class FilterChainInboundHandlerTest { @Mock @@ -46,7 +46,7 @@ public final class FilterChainInboundHandlerTest { private EmbeddedChannel channel; - @Before + @BeforeEach public void setUp() { channel = new EmbeddedChannel(new FilterChainInboundHandler(filterInstances)); } diff --git a/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HandlerParameterDecoderTest.java b/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HandlerParameterDecoderTest.java index 42ad6d0dcc..94b56c67f8 100644 --- a/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HandlerParameterDecoderTest.java +++ b/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HandlerParameterDecoderTest.java @@ -35,8 +35,8 @@ import org.apache.shardingsphere.elasticjob.restful.annotation.Param; import org.apache.shardingsphere.elasticjob.restful.annotation.ParamSource; import org.apache.shardingsphere.elasticjob.restful.annotation.RequestBody; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.Collections; @@ -47,7 +47,7 @@ public final class HandlerParameterDecoderTest { private EmbeddedChannel channel; - @Before + @BeforeEach public void setUp() { ContextInitializationInboundHandler contextInitializationInboundHandler = new ContextInitializationInboundHandler(); HttpRequestDispatcher httpRequestDispatcher = new HttpRequestDispatcher(Collections.singletonList(new DecoderTestController()), false); diff --git a/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HttpRequestDispatcherTest.java b/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HttpRequestDispatcherTest.java index a893325e55..185bcf1a3c 100644 --- a/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HttpRequestDispatcherTest.java +++ b/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HttpRequestDispatcherTest.java @@ -26,14 +26,18 @@ import org.apache.shardingsphere.elasticjob.restful.controller.JobController; import org.apache.shardingsphere.elasticjob.restful.handler.HandleContext; import org.apache.shardingsphere.elasticjob.restful.handler.HandlerNotFoundException; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertThrows; public final class HttpRequestDispatcherTest { - @Test(expected = HandlerNotFoundException.class) + @Test public void assertDispatcherHandlerNotFound() { - EmbeddedChannel channel = new EmbeddedChannel(new HttpRequestDispatcher(Lists.newArrayList(new JobController()), false)); - FullHttpRequest fullHttpRequest = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, "/hello/myJob/myCron"); - channel.writeInbound(new HandleContext<>(fullHttpRequest, null)); + assertThrows(HandlerNotFoundException.class, () -> { + EmbeddedChannel channel = new EmbeddedChannel(new HttpRequestDispatcher(Lists.newArrayList(new JobController()), false)); + FullHttpRequest fullHttpRequest = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, "/hello/myJob/myCron"); + channel.writeInbound(new HandleContext<>(fullHttpRequest, null)); + }); } } diff --git a/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/NettyRestfulServiceTest.java b/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/NettyRestfulServiceTest.java index 3cbf57eb6f..253b013e80 100644 --- a/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/NettyRestfulServiceTest.java +++ b/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/NettyRestfulServiceTest.java @@ -34,16 +34,18 @@ import org.apache.shardingsphere.elasticjob.restful.controller.JobController; import org.apache.shardingsphere.elasticjob.restful.handler.CustomIllegalStateExceptionHandler; import org.apache.shardingsphere.elasticjob.restful.pojo.JobPojo; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; +import java.util.concurrent.TimeUnit; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertEquals; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; public final class NettyRestfulServiceTest { @@ -55,7 +57,7 @@ public final class NettyRestfulServiceTest { private static RestfulService restfulService; - @BeforeClass + @BeforeAll public static void init() { NettyRestfulServiceConfiguration configuration = new NettyRestfulServiceConfiguration(PORT); configuration.setHost(HOST); @@ -66,7 +68,8 @@ public static void init() { } @SneakyThrows - @Test(timeout = TESTCASE_TIMEOUT) + @Test + @Timeout(value = TESTCASE_TIMEOUT, unit = TimeUnit.MILLISECONDS) public void assertRequestWithParameters() { String cron = "0 * * * * ?"; String uri = String.format("/job/myGroup/myJob?cron=%s", URLEncoder.encode(cron, "UTF-8")); @@ -88,7 +91,8 @@ public void assertRequestWithParameters() { }, TESTCASE_TIMEOUT); } - @Test(timeout = TESTCASE_TIMEOUT) + @Test + @Timeout(value = TESTCASE_TIMEOUT, unit = TimeUnit.MILLISECONDS) public void assertCustomExceptionHandler() { DefaultFullHttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, "/job/throw/IllegalState"); request.headers().set("Exception-Message", "An illegal state exception message."); @@ -98,7 +102,8 @@ public void assertCustomExceptionHandler() { }, TESTCASE_TIMEOUT); } - @Test(timeout = TESTCASE_TIMEOUT) + @Test + @Timeout(value = TESTCASE_TIMEOUT, unit = TimeUnit.MILLISECONDS) public void assertUsingDefaultExceptionHandler() { DefaultFullHttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, "/job/throw/IllegalArgument"); request.headers().set("Exception-Message", "An illegal argument exception message."); @@ -108,7 +113,8 @@ public void assertUsingDefaultExceptionHandler() { }, TESTCASE_TIMEOUT); } - @Test(timeout = TESTCASE_TIMEOUT) + @Test + @Timeout(value = TESTCASE_TIMEOUT, unit = TimeUnit.MILLISECONDS) public void assertReturnStatusCode() { DefaultFullHttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, "/job/code/204"); HttpClient.request(HOST, PORT, request, httpResponse -> { @@ -116,7 +122,8 @@ public void assertReturnStatusCode() { }, TESTCASE_TIMEOUT); } - @Test(timeout = TESTCASE_TIMEOUT) + @Test + @Timeout(value = TESTCASE_TIMEOUT, unit = TimeUnit.MILLISECONDS) public void assertHandlerNotFound() { DefaultFullHttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, "/not/found"); HttpClient.request(HOST, PORT, request, httpResponse -> { @@ -124,7 +131,8 @@ public void assertHandlerNotFound() { }, TESTCASE_TIMEOUT); } - @Test(timeout = TESTCASE_TIMEOUT) + @Test + @Timeout(value = TESTCASE_TIMEOUT, unit = TimeUnit.MILLISECONDS) public void assertRequestIndexWithSlash() { DefaultFullHttpRequest requestWithSlash = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, "/"); HttpClient.request(HOST, PORT, requestWithSlash, httpResponse -> { @@ -132,7 +140,8 @@ public void assertRequestIndexWithSlash() { }, TESTCASE_TIMEOUT); } - @Test(timeout = TESTCASE_TIMEOUT) + @Test + @Timeout(value = TESTCASE_TIMEOUT, unit = TimeUnit.MILLISECONDS) public void assertRequestIndexWithoutSlash() { DefaultFullHttpRequest requestWithoutSlash = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, ""); HttpClient.request(HOST, PORT, requestWithoutSlash, httpResponse -> { @@ -140,7 +149,7 @@ public void assertRequestIndexWithoutSlash() { }, TESTCASE_TIMEOUT); } - @AfterClass + @AfterAll public static void tearDown() { if (null != restfulService) { restfulService.shutdown(); diff --git a/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/NettyRestfulServiceTrailingSlashInsensitiveTest.java b/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/NettyRestfulServiceTrailingSlashInsensitiveTest.java index cca5caac56..a0bf589597 100644 --- a/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/NettyRestfulServiceTrailingSlashInsensitiveTest.java +++ b/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/NettyRestfulServiceTrailingSlashInsensitiveTest.java @@ -21,7 +21,9 @@ import org.apache.shardingsphere.elasticjob.restful.NettyRestfulServiceConfiguration; import org.apache.shardingsphere.elasticjob.restful.RestfulService; import org.apache.shardingsphere.elasticjob.restful.controller.TrailingSlashTestController; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertThrows; public final class NettyRestfulServiceTrailingSlashInsensitiveTest { @@ -29,12 +31,14 @@ public final class NettyRestfulServiceTrailingSlashInsensitiveTest { private static final int PORT = 18082; - @Test(expected = IllegalArgumentException.class) + @Test public void assertPathDuplicateWhenTrailingSlashInsensitive() { - NettyRestfulServiceConfiguration configuration = new NettyRestfulServiceConfiguration(PORT); - configuration.setHost(HOST); - configuration.addControllerInstances(new TrailingSlashTestController()); - RestfulService restfulService = new NettyRestfulService(configuration); - restfulService.startup(); + assertThrows(IllegalArgumentException.class, () -> { + NettyRestfulServiceConfiguration configuration = new NettyRestfulServiceConfiguration(PORT); + configuration.setHost(HOST); + configuration.addControllerInstances(new TrailingSlashTestController()); + RestfulService restfulService = new NettyRestfulService(configuration); + restfulService.startup(); + }); } } diff --git a/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/NettyRestfulServiceTrailingSlashSensitiveTest.java b/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/NettyRestfulServiceTrailingSlashSensitiveTest.java index d089cad40c..2146168e9c 100644 --- a/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/NettyRestfulServiceTrailingSlashSensitiveTest.java +++ b/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/NettyRestfulServiceTrailingSlashSensitiveTest.java @@ -25,11 +25,13 @@ import org.apache.shardingsphere.elasticjob.restful.NettyRestfulServiceConfiguration; import org.apache.shardingsphere.elasticjob.restful.RestfulService; import org.apache.shardingsphere.elasticjob.restful.controller.TrailingSlashTestController; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; import java.nio.charset.StandardCharsets; +import java.util.concurrent.TimeUnit; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -44,7 +46,7 @@ public final class NettyRestfulServiceTrailingSlashSensitiveTest { private static RestfulService restfulService; - @BeforeClass + @BeforeAll public static void init() { NettyRestfulServiceConfiguration configuration = new NettyRestfulServiceConfiguration(PORT); configuration.setHost(HOST); @@ -54,7 +56,8 @@ public static void init() { restfulService.startup(); } - @Test(timeout = TESTCASE_TIMEOUT) + @Test + @Timeout(value = TESTCASE_TIMEOUT, unit = TimeUnit.MILLISECONDS) public void assertWithoutTrailingSlash() { DefaultFullHttpRequest requestWithSlash = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, "/trailing/slash"); HttpClient.request(HOST, PORT, requestWithSlash, httpResponse -> { @@ -65,7 +68,8 @@ public void assertWithoutTrailingSlash() { }, TESTCASE_TIMEOUT); } - @Test(timeout = TESTCASE_TIMEOUT) + @Test + @Timeout(value = TESTCASE_TIMEOUT, unit = TimeUnit.MILLISECONDS) public void assertWithTrailingSlash() { DefaultFullHttpRequest requestWithoutSlash = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, "/trailing/slash/"); HttpClient.request(HOST, PORT, requestWithoutSlash, httpResponse -> { @@ -76,7 +80,7 @@ public void assertWithTrailingSlash() { }, TESTCASE_TIMEOUT); } - @AfterClass + @AfterAll public static void tearDown() { if (null != restfulService) { restfulService.shutdown(); diff --git a/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializerFactoryTest.java b/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializerFactoryTest.java index 1ed054fa1b..860637ef04 100644 --- a/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializerFactoryTest.java +++ b/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializerFactoryTest.java @@ -18,9 +18,10 @@ package org.apache.shardingsphere.elasticjob.restful.serializer; import io.netty.handler.codec.http.HttpHeaderValues; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; public final class ResponseBodySerializerFactoryTest { @@ -30,8 +31,9 @@ public void assertGetJsonDefaultSerializer() { assertNotNull(serializer); } - @Test(expected = ResponseBodySerializerNotFoundException.class) + @Test public void assertSerializerNotFound() { - ResponseBodySerializerFactory.getResponseBodySerializer("Unknown"); + assertThrows(ResponseBodySerializerNotFoundException.class, () -> + ResponseBodySerializerFactory.getResponseBodySerializer("Unknown")); } } diff --git a/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/wrapper/QueryParameterMapTest.java b/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/wrapper/QueryParameterMapTest.java index 52d724150b..a50a3a1182 100644 --- a/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/wrapper/QueryParameterMapTest.java +++ b/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/wrapper/QueryParameterMapTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.restful.wrapper; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.LinkedHashMap; @@ -27,8 +27,8 @@ import java.util.Set; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertFalse; public final class QueryParameterMapTest { diff --git a/elasticjob-lite/elasticjob-lite-core/pom.xml b/elasticjob-lite/elasticjob-lite-core/pom.xml index 1307b5d137..8de1f04b5f 100644 --- a/elasticjob-lite/elasticjob-lite-core/pom.xml +++ b/elasticjob-lite/elasticjob-lite-core/pom.xml @@ -98,14 +98,6 @@ org.apache.curator curator-test - - org.mockito - mockito-core - - - org.mockito - mockito-inline - org.slf4j jcl-over-slf4j diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/api/bootstrap/impl/OneOffJobBootstrapTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/api/bootstrap/impl/OneOffJobBootstrapTest.java index 38e0411e89..14b9089843 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/api/bootstrap/impl/OneOffJobBootstrapTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/api/bootstrap/impl/OneOffJobBootstrapTest.java @@ -25,10 +25,10 @@ import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperConfiguration; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCenter; import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.quartz.Scheduler; import org.quartz.SchedulerException; @@ -37,7 +37,8 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class OneOffJobBootstrapTest { @@ -47,26 +48,27 @@ public final class OneOffJobBootstrapTest { private ZookeeperRegistryCenter zkRegCenter; - @BeforeClass + @BeforeAll public static void init() { EmbedTestingServer.start(); } - @Before + @BeforeEach public void setUp() { zkRegCenter = new ZookeeperRegistryCenter(ZOOKEEPER_CONFIGURATION); zkRegCenter.init(); } - @After + @AfterEach public void teardown() { zkRegCenter.close(); } - @Test(expected = IllegalArgumentException.class) + @Test public void assertConfigFailedWithCron() { - new OneOffJobBootstrap(zkRegCenter, (SimpleJob) shardingContext -> { - }, JobConfiguration.newBuilder("test_one_off_job_execute_with_config_cron", SHARDING_TOTAL_COUNT).cron("0/5 * * * * ?").build()); + assertThrows(IllegalArgumentException.class, () -> + new OneOffJobBootstrap(zkRegCenter, (SimpleJob) shardingContext -> { + }, JobConfiguration.newBuilder("test_one_off_job_execute_with_config_cron", SHARDING_TOTAL_COUNT).cron("0/5 * * * * ?").build())); } @Test diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/api/listener/DistributeOnceElasticJobListenerTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/api/listener/DistributeOnceElasticJobListenerTest.java index a8f778738a..4d507c32be 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/api/listener/DistributeOnceElasticJobListenerTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/api/listener/DistributeOnceElasticJobListenerTest.java @@ -18,28 +18,29 @@ package org.apache.shardingsphere.elasticjob.lite.api.listener; import com.google.common.collect.Sets; +import org.apache.shardingsphere.elasticjob.infra.env.TimeService; +import org.apache.shardingsphere.elasticjob.infra.exception.JobSystemException; import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts; import org.apache.shardingsphere.elasticjob.lite.api.listener.fixture.ElasticJobListenerCaller; import org.apache.shardingsphere.elasticjob.lite.api.listener.fixture.TestDistributeOnceElasticJobListener; -import org.apache.shardingsphere.elasticjob.infra.exception.JobSystemException; import org.apache.shardingsphere.elasticjob.lite.internal.guarantee.GuaranteeService; import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils; -import org.apache.shardingsphere.elasticjob.infra.env.TimeService; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Arrays; import java.util.HashMap; import java.util.Map; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class DistributeOnceElasticJobListenerTest { @Mock @@ -55,7 +56,7 @@ public final class DistributeOnceElasticJobListenerTest { private TestDistributeOnceElasticJobListener distributeOnceElasticJobListener; - @Before + @BeforeEach public void setUp() { distributeOnceElasticJobListener = new TestDistributeOnceElasticJobListener(elasticJobListenerCaller); distributeOnceElasticJobListener.setGuaranteeService(guaranteeService); @@ -85,14 +86,16 @@ public void assertBeforeJobExecutedWhenIsNotAllStartedAndNotTimeout() { verify(guaranteeService, times(0)).clearAllStartedInfo(); } - @Test(expected = JobSystemException.class) + @Test public void assertBeforeJobExecutedWhenIsNotAllStartedAndTimeout() { - when(guaranteeService.isRegisterStartSuccess(Sets.newHashSet(0, 1))).thenReturn(true); - when(guaranteeService.isAllStarted()).thenReturn(false); - when(timeService.getCurrentMillis()).thenReturn(0L, 2L); - distributeOnceElasticJobListener.beforeJobExecuted(shardingContexts); - verify(guaranteeService).registerStart(Arrays.asList(0, 1)); - verify(guaranteeService, times(0)).clearAllStartedInfo(); + assertThrows(JobSystemException.class, () -> { + when(guaranteeService.isRegisterStartSuccess(Sets.newHashSet(0, 1))).thenReturn(true); + when(guaranteeService.isAllStarted()).thenReturn(false); + when(timeService.getCurrentMillis()).thenReturn(0L, 2L); + distributeOnceElasticJobListener.beforeJobExecuted(shardingContexts); + verify(guaranteeService).registerStart(Arrays.asList(0, 1)); + verify(guaranteeService, times(0)).clearAllStartedInfo(); + }); } @Test @@ -114,13 +117,15 @@ public void assertAfterJobExecutedWhenIsAllCompletedAndNotTimeout() { verify(guaranteeService, times(0)).clearAllCompletedInfo(); } - @Test(expected = JobSystemException.class) + @Test public void assertAfterJobExecutedWhenIsAllCompletedAndTimeout() { - when(guaranteeService.isRegisterCompleteSuccess(Sets.newHashSet(0, 1))).thenReturn(true); - when(guaranteeService.isAllCompleted()).thenReturn(false); - when(timeService.getCurrentMillis()).thenReturn(0L, 2L); - distributeOnceElasticJobListener.afterJobExecuted(shardingContexts); - verify(guaranteeService).registerComplete(Arrays.asList(0, 1)); - verify(guaranteeService, times(0)).clearAllCompletedInfo(); + assertThrows(JobSystemException.class, () -> { + when(guaranteeService.isRegisterCompleteSuccess(Sets.newHashSet(0, 1))).thenReturn(true); + when(guaranteeService.isAllCompleted()).thenReturn(false); + when(timeService.getCurrentMillis()).thenReturn(0L, 2L); + distributeOnceElasticJobListener.afterJobExecuted(shardingContexts); + verify(guaranteeService).registerComplete(Arrays.asList(0, 1)); + verify(guaranteeService, times(0)).clearAllCompletedInfo(); + }); } } diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/api/registry/JobInstanceRegistryTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/api/registry/JobInstanceRegistryTest.java index 7ab88a002f..23a7bcec7d 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/api/registry/JobInstanceRegistryTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/api/registry/JobInstanceRegistryTest.java @@ -24,15 +24,16 @@ import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class JobInstanceRegistryTest { @Mock @@ -53,18 +54,22 @@ public void assertListenLabelNotMatch() { verify(regCenter, times(0)).get("/jobName"); } - @Test(expected = RuntimeException.class) + @Test public void assertListenScheduleJob() { - JobInstanceRegistry jobInstanceRegistry = new JobInstanceRegistry(regCenter, new JobInstance("id")); - String jobConfig = toYaml(JobConfiguration.newBuilder("jobName", 1).cron("0/1 * * * * ?").label("label").build()); - jobInstanceRegistry.new JobInstanceRegistryListener().onChange(new DataChangedEvent(Type.ADDED, "/jobName/config", jobConfig)); + assertThrows(RuntimeException.class, () -> { + JobInstanceRegistry jobInstanceRegistry = new JobInstanceRegistry(regCenter, new JobInstance("id")); + String jobConfig = toYaml(JobConfiguration.newBuilder("jobName", 1).cron("0/1 * * * * ?").label("label").build()); + jobInstanceRegistry.new JobInstanceRegistryListener().onChange(new DataChangedEvent(Type.ADDED, "/jobName/config", jobConfig)); + }); } - @Test(expected = RuntimeException.class) + @Test public void assertListenOneOffJob() { - JobInstanceRegistry jobInstanceRegistry = new JobInstanceRegistry(regCenter, new JobInstance("id", "label")); - String jobConfig = toYaml(JobConfiguration.newBuilder("jobName", 1).label("label").build()); - jobInstanceRegistry.new JobInstanceRegistryListener().onChange(new DataChangedEvent(Type.ADDED, "/jobName/config", jobConfig)); + assertThrows(RuntimeException.class, () -> { + JobInstanceRegistry jobInstanceRegistry = new JobInstanceRegistry(regCenter, new JobInstance("id", "label")); + String jobConfig = toYaml(JobConfiguration.newBuilder("jobName", 1).label("label").build()); + jobInstanceRegistry.new JobInstanceRegistryListener().onChange(new DataChangedEvent(Type.ADDED, "/jobName/config", jobConfig)); + }); } private String toYaml(final JobConfiguration build) { diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/BaseIntegrateTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/BaseIntegrateTest.java index 77a483db19..a4b88435df 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/BaseIntegrateTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/BaseIntegrateTest.java @@ -19,21 +19,21 @@ import lombok.AccessLevel; import lombok.Getter; +import org.apache.shardingsphere.elasticjob.api.ElasticJob; +import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.lite.api.bootstrap.JobBootstrap; import org.apache.shardingsphere.elasticjob.lite.api.bootstrap.impl.OneOffJobBootstrap; import org.apache.shardingsphere.elasticjob.lite.api.bootstrap.impl.ScheduleJobBootstrap; -import org.apache.shardingsphere.elasticjob.api.ElasticJob; -import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.lite.fixture.EmbedTestingServer; import org.apache.shardingsphere.elasticjob.lite.internal.election.LeaderService; import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperConfiguration; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCenter; -import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils; -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; @Getter(AccessLevel.PROTECTED) public abstract class BaseIntegrateTest { @@ -73,14 +73,14 @@ private JobBootstrap createJobBootstrap(final TestType type, final ElasticJob el } } - @BeforeClass + @BeforeAll public static void init() { EmbedTestingServer.start(); ZOOKEEPER_CONFIG.setConnectionTimeoutMilliseconds(30000); REGISTRY_CENTER.init(); } - @Before + @BeforeEach public void setUp() { if (jobBootstrap instanceof ScheduleJobBootstrap) { ((ScheduleJobBootstrap) jobBootstrap).schedule(); @@ -89,7 +89,7 @@ public void setUp() { } } - @After + @AfterEach public void tearDown() { jobBootstrap.shutdown(); ReflectionUtils.setFieldValue(JobRegistry.getInstance(), "instance", null); diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/disable/DisabledJobIntegrateTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/disable/DisabledJobIntegrateTest.java index 3878df797d..e03256e165 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/disable/DisabledJobIntegrateTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/disable/DisabledJobIntegrateTest.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.hamcrest.MatcherAssert.assertThat; public abstract class DisabledJobIntegrateTest extends BaseIntegrateTest { diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/disable/OneOffDisabledJobIntegrateTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/disable/OneOffDisabledJobIntegrateTest.java index c9a04f18c3..1e72926fb2 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/disable/OneOffDisabledJobIntegrateTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/disable/OneOffDisabledJobIntegrateTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.lite.integrate.disable; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.junit.Test; +import org.junit.jupiter.api.Test; public final class OneOffDisabledJobIntegrateTest extends DisabledJobIntegrateTest { diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/disable/ScheduleDisabledJobIntegrateTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/disable/ScheduleDisabledJobIntegrateTest.java index 99c6310f0e..fc220082bd 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/disable/ScheduleDisabledJobIntegrateTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/disable/ScheduleDisabledJobIntegrateTest.java @@ -22,13 +22,13 @@ import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry; import org.apache.shardingsphere.elasticjob.lite.internal.server.ServerStatus; import org.awaitility.Awaitility; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.concurrent.TimeUnit; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class ScheduleDisabledJobIntegrateTest extends DisabledJobIntegrateTest { diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/enable/EnabledJobIntegrateTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/enable/EnabledJobIntegrateTest.java index 1d50d84e54..799cd16c21 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/enable/EnabledJobIntegrateTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/enable/EnabledJobIntegrateTest.java @@ -17,21 +17,21 @@ package org.apache.shardingsphere.elasticjob.lite.integrate.enable; -import org.apache.shardingsphere.elasticjob.lite.api.bootstrap.impl.ScheduleJobBootstrap; import org.apache.shardingsphere.elasticjob.api.ElasticJob; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.lite.integrate.BaseIntegrateTest; +import org.apache.shardingsphere.elasticjob.infra.env.IpUtils; import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO; +import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; +import org.apache.shardingsphere.elasticjob.lite.api.bootstrap.impl.ScheduleJobBootstrap; +import org.apache.shardingsphere.elasticjob.lite.integrate.BaseIntegrateTest; import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry; import org.apache.shardingsphere.elasticjob.lite.internal.server.ServerStatus; -import org.apache.shardingsphere.elasticjob.infra.env.IpUtils; -import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertNull; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public abstract class EnabledJobIntegrateTest extends BaseIntegrateTest { @@ -39,7 +39,7 @@ protected EnabledJobIntegrateTest(final TestType type, final ElasticJob elasticJ super(type, elasticJob); } - @Before + @BeforeEach public final void assertEnabledRegCenterInfo() { assertThat(JobRegistry.getInstance().getCurrentShardingTotalCount(getJobName()), is(3)); assertThat(JobRegistry.getInstance().getJobInstance(getJobName()).getServerIp(), is(IpUtils.getIp())); diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/enable/OneOffEnabledJobIntegrateTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/enable/OneOffEnabledJobIntegrateTest.java index 411f6776cc..42562ef8a4 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/enable/OneOffEnabledJobIntegrateTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/enable/OneOffEnabledJobIntegrateTest.java @@ -20,13 +20,13 @@ import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.lite.fixture.job.DetailedFooJob; import org.awaitility.Awaitility; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.concurrent.TimeUnit; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class OneOffEnabledJobIntegrateTest extends EnabledJobIntegrateTest { diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/enable/ScheduleEnabledJobIntegrateTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/enable/ScheduleEnabledJobIntegrateTest.java index 9772b0ce19..20ae0c32d1 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/enable/ScheduleEnabledJobIntegrateTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/integrate/enable/ScheduleEnabledJobIntegrateTest.java @@ -20,13 +20,13 @@ import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.lite.fixture.job.DetailedFooJob; import org.awaitility.Awaitility; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.concurrent.TimeUnit; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class ScheduleEnabledJobIntegrateTest extends EnabledJobIntegrateTest { diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/annotation/JobAnnotationBuilderTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/annotation/JobAnnotationBuilderTest.java index 3986e8f518..2fd08a95c3 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/annotation/JobAnnotationBuilderTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/annotation/JobAnnotationBuilderTest.java @@ -17,15 +17,15 @@ package org.apache.shardingsphere.elasticjob.lite.internal.annotation; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertTrue; - import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.lite.fixture.job.AnnotationSimpleJob; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class JobAnnotationBuilderTest { diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/annotation/integrate/BaseAnnotationTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/annotation/integrate/BaseAnnotationTest.java index bbc3e46cd3..e77d74970b 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/annotation/integrate/BaseAnnotationTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/annotation/integrate/BaseAnnotationTest.java @@ -32,9 +32,9 @@ import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperConfiguration; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCenter; -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; @Getter(AccessLevel.PROTECTED) public abstract class BaseAnnotationTest { @@ -73,14 +73,14 @@ private JobBootstrap createJobBootstrap(final TestType type, final ElasticJob el } } - @BeforeClass + @BeforeAll public static void init() { EmbedTestingServer.start(); ZOOKEEPER_CONFIG.setConnectionTimeoutMilliseconds(30000); REGISTRY_CENTER.init(); } - @Before + @BeforeEach public void setUp() { if (jobBootstrap instanceof ScheduleJobBootstrap) { ((ScheduleJobBootstrap) jobBootstrap).schedule(); @@ -89,7 +89,7 @@ public void setUp() { } } - @After + @AfterEach public void tearDown() { jobBootstrap.shutdown(); ReflectionUtils.setFieldValue(JobRegistry.getInstance(), "instance", null); diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/annotation/integrate/OneOffEnabledJobTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/annotation/integrate/OneOffEnabledJobTest.java index 0d88da1869..a566736fff 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/annotation/integrate/OneOffEnabledJobTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/annotation/integrate/OneOffEnabledJobTest.java @@ -25,15 +25,15 @@ import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry; import org.apache.shardingsphere.elasticjob.lite.internal.server.ServerStatus; import org.awaitility.Awaitility; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.concurrent.TimeUnit; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertNull; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class OneOffEnabledJobTest extends BaseAnnotationTest { @@ -41,7 +41,7 @@ public OneOffEnabledJobTest() { super(TestType.ONE_OFF, new AnnotationUnShardingJob()); } - @Before + @BeforeEach public void assertEnabledRegCenterInfo() { assertThat(JobRegistry.getInstance().getCurrentShardingTotalCount(getJobName()), is(1)); assertThat(JobRegistry.getInstance().getJobInstance(getJobName()).getServerIp(), is(IpUtils.getIp())); diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/annotation/integrate/ScheduleEnabledJobTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/annotation/integrate/ScheduleEnabledJobTest.java index f81530b3db..56c9f17ea9 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/annotation/integrate/ScheduleEnabledJobTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/annotation/integrate/ScheduleEnabledJobTest.java @@ -25,15 +25,15 @@ import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry; import org.apache.shardingsphere.elasticjob.lite.internal.server.ServerStatus; import org.awaitility.Awaitility; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.concurrent.TimeUnit; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertNull; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class ScheduleEnabledJobTest extends BaseAnnotationTest { @@ -41,7 +41,7 @@ public ScheduleEnabledJobTest() { super(TestType.SCHEDULE, new AnnotationSimpleJob()); } - @Before + @BeforeEach public void assertEnabledRegCenterInfo() { assertThat(JobRegistry.getInstance().getCurrentShardingTotalCount(getJobName()), is(3)); assertThat(JobRegistry.getInstance().getJobInstance(getJobName()).getServerIp(), is(IpUtils.getIp())); diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/ConfigurationNodeTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/ConfigurationNodeTest.java index 1fa4e06a96..96bfdc0d6a 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/ConfigurationNodeTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/ConfigurationNodeTest.java @@ -17,9 +17,9 @@ package org.apache.shardingsphere.elasticjob.lite.internal.config; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class ConfigurationNodeTest { diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/ConfigurationServiceTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/ConfigurationServiceTest.java index 3db03b76ae..5ae1541aa7 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/ConfigurationServiceTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/ConfigurationServiceTest.java @@ -21,24 +21,25 @@ import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.infra.exception.JobConfigurationException; import org.apache.shardingsphere.elasticjob.infra.exception.JobExecutionEnvironmentException; -import org.apache.shardingsphere.elasticjob.lite.fixture.LiteYamlConstants; import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO; +import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; +import org.apache.shardingsphere.elasticjob.lite.fixture.LiteYamlConstants; import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage; import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils; -import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class ConfigurationServiceTest { @Mock @@ -46,7 +47,7 @@ public final class ConfigurationServiceTest { private final ConfigurationService configService = new ConfigurationService(null, "test_job"); - @Before + @BeforeEach public void setUp() { ReflectionUtils.setFieldValue(configService, "jobNodeStorage", jobNodeStorage); } @@ -79,16 +80,18 @@ public void assertLoadFromCacheButNull() { assertThat(actual.getShardingTotalCount(), is(3)); } - @Test(expected = JobConfigurationException.class) + @Test public void assertSetUpJobConfigurationJobConfigurationForJobConflict() { - when(jobNodeStorage.isJobRootNodeExisted()).thenReturn(true); - when(jobNodeStorage.getJobRootNodeData()).thenReturn("org.apache.shardingsphere.elasticjob.lite.api.script.api.ScriptJob"); - try { - configService.setUpJobConfiguration(null, JobConfiguration.newBuilder("test_job", 3).cron("0/1 * * * * ?").build()); - } finally { - verify(jobNodeStorage).isJobRootNodeExisted(); - verify(jobNodeStorage).getJobRootNodeData(); - } + assertThrows(JobConfigurationException.class, () -> { + when(jobNodeStorage.isJobRootNodeExisted()).thenReturn(true); + when(jobNodeStorage.getJobRootNodeData()).thenReturn("org.apache.shardingsphere.elasticjob.lite.api.script.api.ScriptJob"); + try { + configService.setUpJobConfiguration(null, JobConfiguration.newBuilder("test_job", 3).cron("0/1 * * * * ?").build()); + } finally { + verify(jobNodeStorage).isJobRootNodeExisted(); + verify(jobNodeStorage).getJobRootNodeData(); + } + }); } @Test @@ -130,14 +133,16 @@ public void assertIsMaxTimeDiffSecondsTolerable() throws JobExecutionEnvironment verify(jobNodeStorage).getRegistryCenterTime(); } - @Test(expected = JobExecutionEnvironmentException.class) - public void assertIsNotMaxTimeDiffSecondsTolerable() throws JobExecutionEnvironmentException { - when(jobNodeStorage.getJobNodeData(ConfigurationNode.ROOT)).thenReturn(LiteYamlConstants.getJobYaml()); - when(jobNodeStorage.getRegistryCenterTime()).thenReturn(0L); - try { - configService.checkMaxTimeDiffSecondsTolerable(); - } finally { - verify(jobNodeStorage).getRegistryCenterTime(); - } + @Test + public void assertIsNotMaxTimeDiffSecondsTolerable() { + assertThrows(JobExecutionEnvironmentException.class, () -> { + when(jobNodeStorage.getJobNodeData(ConfigurationNode.ROOT)).thenReturn(LiteYamlConstants.getJobYaml()); + when(jobNodeStorage.getRegistryCenterTime()).thenReturn(0L); + try { + configService.checkMaxTimeDiffSecondsTolerable(); + } finally { + verify(jobNodeStorage).getRegistryCenterTime(); + } + }); } } diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/RescheduleListenerManagerTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/RescheduleListenerManagerTest.java index 51ba639231..61a02bdf52 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/RescheduleListenerManagerTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/RescheduleListenerManagerTest.java @@ -25,18 +25,18 @@ import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentMatchers; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class RescheduleListenerManagerTest { @Mock @@ -50,7 +50,7 @@ public final class RescheduleListenerManagerTest { private final RescheduleListenerManager rescheduleListenerManager = new RescheduleListenerManager(null, "test_job"); - @Before + @BeforeEach public void setUp() { ReflectionUtils.setSuperclassFieldValue(rescheduleListenerManager, "jobNodeStorage", jobNodeStorage); } diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/election/ElectionListenerManagerTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/election/ElectionListenerManagerTest.java index 692b58f5e2..390b2b0414 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/election/ElectionListenerManagerTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/election/ElectionListenerManagerTest.java @@ -27,18 +27,18 @@ import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentMatchers; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class ElectionListenerManagerTest { @Mock @@ -58,7 +58,7 @@ public final class ElectionListenerManagerTest { private final ElectionListenerManager electionListenerManager = new ElectionListenerManager(null, "test_job"); - @Before + @BeforeEach public void setUp() { JobRegistry.getInstance().addJobInstance("test_job", new JobInstance("127.0.0.1@-@0", null, "127.0.0.1")); ReflectionUtils.setSuperclassFieldValue(electionListenerManager, "jobNodeStorage", jobNodeStorage); diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/election/LeaderNodeTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/election/LeaderNodeTest.java index 75bb74bdc0..3158ce5f7c 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/election/LeaderNodeTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/election/LeaderNodeTest.java @@ -17,10 +17,10 @@ package org.apache.shardingsphere.elasticjob.lite.internal.election; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class LeaderNodeTest { diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/election/LeaderServiceTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/election/LeaderServiceTest.java index b469f8ccfd..8fe0bb3b8e 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/election/LeaderServiceTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/election/LeaderServiceTest.java @@ -25,21 +25,21 @@ import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage; import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentMatchers; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class LeaderServiceTest { @Mock @@ -56,7 +56,7 @@ public final class LeaderServiceTest { private LeaderService leaderService; - @Before + @BeforeEach public void setUp() { JobRegistry.getInstance().addJobInstance("test_job", new JobInstance("127.0.0.1@-@0", null, "127.0.0.1")); leaderService = new LeaderService(null, "test_job"); diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverListenerManagerTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverListenerManagerTest.java index d9f72c6625..14bc79dd1c 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverListenerManagerTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverListenerManagerTest.java @@ -32,12 +32,12 @@ import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEventListener; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentMatchers; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Arrays; import java.util.Collections; @@ -50,7 +50,7 @@ import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class FailoverListenerManagerTest { @Mock @@ -79,7 +79,7 @@ public final class FailoverListenerManagerTest { private final FailoverListenerManager failoverListenerManager = new FailoverListenerManager(null, "test_job"); - @Before + @BeforeEach public void setUp() { ReflectionUtils.setSuperclassFieldValue(failoverListenerManager, "jobNodeStorage", jobNodeStorage); ReflectionUtils.setFieldValue(failoverListenerManager, "configService", configService); diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverNodeTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverNodeTest.java index a545c59fd9..48c966724f 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverNodeTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverNodeTest.java @@ -17,11 +17,11 @@ package org.apache.shardingsphere.elasticjob.lite.internal.failover; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertNull; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertNull; public final class FailoverNodeTest { diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverServiceTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverServiceTest.java index f581262cf7..139c065c0a 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverServiceTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/failover/FailoverServiceTest.java @@ -24,14 +24,14 @@ import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobScheduleController; import org.apache.shardingsphere.elasticjob.lite.internal.sharding.ShardingService; import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage; -import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentMatchers; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Arrays; import java.util.Collections; @@ -45,7 +45,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.StrictStubs.class) +@ExtendWith(MockitoExtension.class) public final class FailoverServiceTest { @Mock @@ -65,7 +65,7 @@ public final class FailoverServiceTest { private final FailoverService failoverService = new FailoverService(null, "test_job"); - @Before + @BeforeEach public void setUp() { ReflectionUtils.setFieldValue(failoverService, "jobNodeStorage", jobNodeStorage); ReflectionUtils.setFieldValue(failoverService, "shardingService", shardingService); diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/guarantee/GuaranteeListenerManagerTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/guarantee/GuaranteeListenerManagerTest.java index 695f875652..52591a5803 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/guarantee/GuaranteeListenerManagerTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/guarantee/GuaranteeListenerManagerTest.java @@ -24,11 +24,11 @@ import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEventListener; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Arrays; @@ -36,7 +36,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class GuaranteeListenerManagerTest { @Mock @@ -50,7 +50,7 @@ public final class GuaranteeListenerManagerTest { private GuaranteeListenerManager guaranteeListenerManager; - @Before + @BeforeEach public void setUp() { guaranteeListenerManager = new GuaranteeListenerManager(null, "test_job", Arrays.asList(elasticJobListener, distributeOnceElasticJobListener)); ReflectionUtils.setSuperclassFieldValue(guaranteeListenerManager, "jobNodeStorage", jobNodeStorage); diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/guarantee/GuaranteeNodeTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/guarantee/GuaranteeNodeTest.java index 5c0c9fbde1..bb45e46b60 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/guarantee/GuaranteeNodeTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/guarantee/GuaranteeNodeTest.java @@ -17,12 +17,12 @@ package org.apache.shardingsphere.elasticjob.lite.internal.guarantee; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class GuaranteeNodeTest { diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/guarantee/GuaranteeServiceTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/guarantee/GuaranteeServiceTest.java index 1e9c223cdf..fa8d052abd 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/guarantee/GuaranteeServiceTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/guarantee/GuaranteeServiceTest.java @@ -23,21 +23,21 @@ import org.apache.shardingsphere.elasticjob.lite.internal.config.ConfigurationService; import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage; import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Arrays; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class GuaranteeServiceTest { @Mock @@ -54,7 +54,7 @@ public final class GuaranteeServiceTest { private final GuaranteeService guaranteeService = new GuaranteeService(null, "test_job"); - @Before + @BeforeEach public void setUp() { ReflectionUtils.setFieldValue(guaranteeService, "jobNodeStorage", jobNodeStorage); ReflectionUtils.setFieldValue(guaranteeService, "configService", configService); diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/InstanceNodeTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/InstanceNodeTest.java index 0d4433f251..d218aa9617 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/InstanceNodeTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/InstanceNodeTest.java @@ -19,19 +19,19 @@ import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class InstanceNodeTest { private static InstanceNode instanceNode; - @BeforeClass + @BeforeAll public static void setUp() { JobRegistry.getInstance().addJobInstance("test_job", new JobInstance("127.0.0.1@-@0")); instanceNode = new InstanceNode("test_job"); diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/InstanceServiceTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/InstanceServiceTest.java index 0b056c6573..3ab2b42d66 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/InstanceServiceTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/InstanceServiceTest.java @@ -22,22 +22,22 @@ import org.apache.shardingsphere.elasticjob.lite.internal.server.ServerService; import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage; import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Arrays; import java.util.Collections; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class InstanceServiceTest { @Mock @@ -48,7 +48,7 @@ public final class InstanceServiceTest { private InstanceService instanceService; - @Before + @BeforeEach public void setUp() { JobRegistry.getInstance().addJobInstance("test_job", new JobInstance("127.0.0.1@-@0", null, "127.0.0.1")); instanceService = new InstanceService(null, "test_job"); diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/ShutdownListenerManagerTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/ShutdownListenerManagerTest.java index d33aff32da..e3c6e0fc03 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/ShutdownListenerManagerTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/instance/ShutdownListenerManagerTest.java @@ -26,19 +26,19 @@ import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentMatchers; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class ShutdownListenerManagerTest { @Mock @@ -58,7 +58,7 @@ public final class ShutdownListenerManagerTest { private ShutdownListenerManager shutdownListenerManager; - @Before + @BeforeEach public void setUp() { JobRegistry.getInstance().addJobInstance("test_job", new JobInstance("127.0.0.1@-@0")); shutdownListenerManager = new ShutdownListenerManager(null, "test_job"); @@ -67,7 +67,7 @@ public void setUp() { ReflectionUtils.setSuperclassFieldValue(shutdownListenerManager, "jobNodeStorage", jobNodeStorage); } - @After + @AfterEach public void tearDown() { JobRegistry.getInstance().shutdown("test_job"); } diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/ListenerManagerTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/ListenerManagerTest.java index 59f68c99ca..00386e42ad 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/ListenerManagerTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/ListenerManagerTest.java @@ -27,17 +27,17 @@ import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage; import org.apache.shardingsphere.elasticjob.lite.internal.trigger.TriggerListenerManager; import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Collections; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class ListenerManagerTest { @Mock @@ -72,7 +72,7 @@ public final class ListenerManagerTest { private final ListenerManager listenerManager = new ListenerManager(null, "test_job", Collections.emptyList()); - @Before + @BeforeEach public void setUp() { ReflectionUtils.setFieldValue(listenerManager, "jobNodeStorage", jobNodeStorage); ReflectionUtils.setFieldValue(listenerManager, "electionListenerManager", electionListenerManager); diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/ListenerNotifierManagerTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/ListenerNotifierManagerTest.java index fea0bebf6e..8f322174e8 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/ListenerNotifierManagerTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/ListenerNotifierManagerTest.java @@ -17,16 +17,16 @@ package org.apache.shardingsphere.elasticjob.lite.internal.listener; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.concurrent.Executor; -import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.MatcherAssert.assertThat; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class ListenerNotifierManagerTest { @Test diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/RegistryCenterConnectionStateListenerTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/RegistryCenterConnectionStateListenerTest.java index abb71b2b39..df2d796297 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/RegistryCenterConnectionStateListenerTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/listener/RegistryCenterConnectionStateListenerTest.java @@ -27,11 +27,11 @@ import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.listener.ConnectionStateChangedEventListener.State; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Arrays; @@ -39,7 +39,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class RegistryCenterConnectionStateListenerTest { @Mock @@ -62,7 +62,7 @@ public final class RegistryCenterConnectionStateListenerTest { private RegistryCenterConnectionStateListener regCenterConnectionStateListener; - @Before + @BeforeEach public void setUp() { JobRegistry.getInstance().addJobInstance("test_job", new JobInstance("127.0.0.1@-@0", null, "127.0.0.1")); regCenterConnectionStateListener = new RegistryCenterConnectionStateListener(null, "test_job"); diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/reconcile/ReconcileServiceTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/reconcile/ReconcileServiceTest.java index 1d0ed12656..425b298161 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/reconcile/ReconcileServiceTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/reconcile/ReconcileServiceTest.java @@ -25,17 +25,17 @@ import org.apache.shardingsphere.elasticjob.lite.internal.sharding.ShardingService; import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class ReconcileServiceTest { @Mock @@ -49,7 +49,7 @@ public final class ReconcileServiceTest { private ReconcileService reconcileService; - @Before + @BeforeEach public void setup() { JobRegistry.getInstance().addJobInstance("test_job", new JobInstance("127.0.0.1@-@0")); reconcileService = new ReconcileService(regCenter, "test_job"); diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/JobRegistryTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/JobRegistryTest.java index 428d902c3b..804c367c08 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/JobRegistryTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/JobRegistryTest.java @@ -20,12 +20,12 @@ import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/JobScheduleControllerTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/JobScheduleControllerTest.java index 459e0124e0..5d690953db 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/JobScheduleControllerTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/JobScheduleControllerTest.java @@ -19,11 +19,11 @@ import org.apache.shardingsphere.elasticjob.infra.exception.JobSystemException; import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.quartz.JobDetail; import org.quartz.JobKey; import org.quartz.Scheduler; @@ -33,8 +33,9 @@ import org.quartz.impl.triggers.CronTriggerImpl; import org.quartz.impl.triggers.SimpleTriggerImpl; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doThrow; @@ -42,7 +43,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class JobScheduleControllerTest { @Mock @@ -53,20 +54,22 @@ public final class JobScheduleControllerTest { private JobScheduleController jobScheduleController; - @Before + @BeforeEach public void setUp() { jobScheduleController = new JobScheduleController(scheduler, jobDetail, "test_job_Trigger"); } - @Test(expected = JobSystemException.class) - public void assertIsPausedFailure() throws SchedulerException { - doThrow(SchedulerException.class).when(scheduler).getTriggerState(new TriggerKey("test_job_Trigger")); - ReflectionUtils.setFieldValue(jobScheduleController, "scheduler", scheduler); - try { - jobScheduleController.isPaused(); - } finally { - verify(scheduler).getTriggerState(new TriggerKey("test_job_Trigger")); - } + @Test + public void assertIsPausedFailure() { + assertThrows(JobSystemException.class, () -> { + doThrow(SchedulerException.class).when(scheduler).getTriggerState(new TriggerKey("test_job_Trigger")); + ReflectionUtils.setFieldValue(jobScheduleController, "scheduler", scheduler); + try { + jobScheduleController.isPaused(); + } finally { + verify(scheduler).getTriggerState(new TriggerKey("test_job_Trigger")); + } + }); } @Test @@ -98,15 +101,17 @@ public void assertPauseJobIfShutdown() throws SchedulerException { verify(scheduler, times(0)).pauseAll(); } - @Test(expected = JobSystemException.class) - public void assertPauseJobFailure() throws SchedulerException { - doThrow(SchedulerException.class).when(scheduler).pauseAll(); - ReflectionUtils.setFieldValue(jobScheduleController, "scheduler", scheduler); - try { - jobScheduleController.pauseJob(); - } finally { - verify(scheduler).pauseAll(); - } + @Test + public void assertPauseJobFailure() { + assertThrows(JobSystemException.class, () -> { + doThrow(SchedulerException.class).when(scheduler).pauseAll(); + ReflectionUtils.setFieldValue(jobScheduleController, "scheduler", scheduler); + try { + jobScheduleController.pauseJob(); + } finally { + verify(scheduler).pauseAll(); + } + }); } @Test @@ -124,15 +129,17 @@ public void assertResumeJobIfShutdown() throws SchedulerException { verify(scheduler, times(0)).resumeAll(); } - @Test(expected = JobSystemException.class) - public void assertResumeJobFailure() throws SchedulerException { - doThrow(SchedulerException.class).when(scheduler).resumeAll(); - ReflectionUtils.setFieldValue(jobScheduleController, "scheduler", scheduler); - try { - jobScheduleController.resumeJob(); - } finally { - verify(scheduler).resumeAll(); - } + @Test + public void assertResumeJobFailure() { + assertThrows(JobSystemException.class, () -> { + doThrow(SchedulerException.class).when(scheduler).resumeAll(); + ReflectionUtils.setFieldValue(jobScheduleController, "scheduler", scheduler); + try { + jobScheduleController.resumeJob(); + } finally { + verify(scheduler).resumeAll(); + } + }); } @Test @@ -152,20 +159,22 @@ public void assertTriggerJobIfShutdown() throws SchedulerException { verify(scheduler, times(0)).triggerJob(any()); } - @Test(expected = JobSystemException.class) - public void assertTriggerJobFailure() throws SchedulerException { - JobKey jobKey = new JobKey("test_job"); - when(jobDetail.getKey()).thenReturn(jobKey); - when(scheduler.checkExists(jobKey)).thenReturn(true); - doThrow(SchedulerException.class).when(scheduler).triggerJob(jobKey); - ReflectionUtils.setFieldValue(jobScheduleController, "scheduler", scheduler); - ReflectionUtils.setFieldValue(jobScheduleController, "jobDetail", jobDetail); - try { - jobScheduleController.triggerJob(); - } finally { - verify(jobDetail, times(2)).getKey(); - verify(scheduler).triggerJob(jobKey); - } + @Test + public void assertTriggerJobFailure() { + assertThrows(JobSystemException.class, () -> { + JobKey jobKey = new JobKey("test_job"); + when(jobDetail.getKey()).thenReturn(jobKey); + when(scheduler.checkExists(jobKey)).thenReturn(true); + doThrow(SchedulerException.class).when(scheduler).triggerJob(jobKey); + ReflectionUtils.setFieldValue(jobScheduleController, "scheduler", scheduler); + ReflectionUtils.setFieldValue(jobScheduleController, "jobDetail", jobDetail); + try { + jobScheduleController.triggerJob(); + } finally { + verify(jobDetail, times(2)).getKey(); + verify(scheduler).triggerJob(jobKey); + } + }); } @Test @@ -201,15 +210,17 @@ public void assertShutdownJobIfShutdown() throws SchedulerException { verify(scheduler, times(0)).shutdown(); } - @Test(expected = JobSystemException.class) - public void assertShutdownFailure() throws SchedulerException { - doThrow(SchedulerException.class).when(scheduler).shutdown(false); - ReflectionUtils.setFieldValue(jobScheduleController, "scheduler", scheduler); - try { - jobScheduleController.shutdown(); - } finally { - verify(scheduler).shutdown(false); - } + @Test + public void assertShutdownFailure() { + assertThrows(JobSystemException.class, () -> { + doThrow(SchedulerException.class).when(scheduler).shutdown(false); + ReflectionUtils.setFieldValue(jobScheduleController, "scheduler", scheduler); + try { + jobScheduleController.shutdown(); + } finally { + verify(scheduler).shutdown(false); + } + }); } @Test @@ -227,16 +238,18 @@ public void assertRescheduleJobIfShutdown() throws SchedulerException { verify(scheduler, times(0)).rescheduleJob(eq(TriggerKey.triggerKey("test_job_Trigger")), any()); } - @Test(expected = JobSystemException.class) - public void assertRescheduleJobFailure() throws SchedulerException { - when(scheduler.getTrigger(TriggerKey.triggerKey("test_job_Trigger"))).thenReturn(new CronTriggerImpl()); - doThrow(SchedulerException.class).when(scheduler).rescheduleJob(eq(TriggerKey.triggerKey("test_job_Trigger")), any()); - ReflectionUtils.setFieldValue(jobScheduleController, "scheduler", scheduler); - try { - jobScheduleController.rescheduleJob("0/1 * * * * ?", null); - } finally { - verify(scheduler).rescheduleJob(eq(TriggerKey.triggerKey("test_job_Trigger")), any()); - } + @Test + public void assertRescheduleJobFailure() { + assertThrows(JobSystemException.class, () -> { + when(scheduler.getTrigger(TriggerKey.triggerKey("test_job_Trigger"))).thenReturn(new CronTriggerImpl()); + doThrow(SchedulerException.class).when(scheduler).rescheduleJob(eq(TriggerKey.triggerKey("test_job_Trigger")), any()); + ReflectionUtils.setFieldValue(jobScheduleController, "scheduler", scheduler); + try { + jobScheduleController.rescheduleJob("0/1 * * * * ?", null); + } finally { + verify(scheduler).rescheduleJob(eq(TriggerKey.triggerKey("test_job_Trigger")), any()); + } + }); } @Test @@ -262,16 +275,18 @@ public void assertRescheduleJobIfShutdownForOneOffJob() throws SchedulerExceptio verify(scheduler, times(0)).rescheduleJob(eq(TriggerKey.triggerKey("test_job_Trigger")), any()); } - @Test(expected = JobSystemException.class) - public void assertRescheduleJobFailureForOneOffJob() throws SchedulerException { - when(scheduler.getTrigger(TriggerKey.triggerKey("test_job_Trigger"))).thenReturn(new SimpleTriggerImpl()); - doThrow(SchedulerException.class).when(scheduler).rescheduleJob(eq(TriggerKey.triggerKey("test_job_Trigger")), any()); - ReflectionUtils.setFieldValue(jobScheduleController, "scheduler", scheduler); - try { - jobScheduleController.rescheduleJob(); - } finally { - verify(scheduler).rescheduleJob(eq(TriggerKey.triggerKey("test_job_Trigger")), any()); - } + @Test + public void assertRescheduleJobFailureForOneOffJob() { + assertThrows(JobSystemException.class, () -> { + when(scheduler.getTrigger(TriggerKey.triggerKey("test_job_Trigger"))).thenReturn(new SimpleTriggerImpl()); + doThrow(SchedulerException.class).when(scheduler).rescheduleJob(eq(TriggerKey.triggerKey("test_job_Trigger")), any()); + ReflectionUtils.setFieldValue(jobScheduleController, "scheduler", scheduler); + try { + jobScheduleController.rescheduleJob(); + } finally { + verify(scheduler).rescheduleJob(eq(TriggerKey.triggerKey("test_job_Trigger")), any()); + } + }); } @Test diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/JobTriggerListenerTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/JobTriggerListenerTest.java index e827358fc5..db1ead14fa 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/JobTriggerListenerTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/JobTriggerListenerTest.java @@ -19,11 +19,11 @@ import org.apache.shardingsphere.elasticjob.lite.internal.sharding.ExecutionService; import org.apache.shardingsphere.elasticjob.lite.internal.sharding.ShardingService; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.quartz.Trigger; import java.util.Collections; @@ -35,7 +35,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class JobTriggerListenerTest { @Mock @@ -49,7 +49,7 @@ public final class JobTriggerListenerTest { private JobTriggerListener jobTriggerListener; - @Before + @BeforeEach public void setUp() { jobTriggerListener = new JobTriggerListener(executionService, shardingService); } diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/LiteJobFacadeTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/LiteJobFacadeTest.java index cb6d9a679c..964c5ea24a 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/LiteJobFacadeTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/LiteJobFacadeTest.java @@ -30,11 +30,11 @@ import org.apache.shardingsphere.elasticjob.lite.internal.sharding.ShardingService; import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.tracing.JobTracingEventBus; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Arrays; import java.util.Collections; @@ -45,7 +45,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class LiteJobFacadeTest { @Mock @@ -73,7 +73,7 @@ public final class LiteJobFacadeTest { private StringBuilder orderResult; - @Before + @BeforeEach public void setUp() { orderResult = new StringBuilder(); TestElasticJobListener l1 = new TestElasticJobListener(caller, "l1", 2, orderResult); diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/SchedulerFacadeTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/SchedulerFacadeTest.java index f4d30bd590..1609fa9bca 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/SchedulerFacadeTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/SchedulerFacadeTest.java @@ -20,19 +20,19 @@ import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; import org.apache.shardingsphere.elasticjob.lite.internal.election.LeaderService; import org.apache.shardingsphere.elasticjob.lite.internal.sharding.ShardingService; -import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class SchedulerFacadeTest { @Mock @@ -49,7 +49,7 @@ public final class SchedulerFacadeTest { private SchedulerFacade schedulerFacade; - @Before + @BeforeEach public void setUp() { JobRegistry.getInstance().addJobInstance("test_job", new JobInstance("127.0.0.1@-@0")); schedulerFacade = new SchedulerFacade(null, "test_job"); diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/server/ServerNodeTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/server/ServerNodeTest.java index 742acdcbb8..2613122f56 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/server/ServerNodeTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/server/ServerNodeTest.java @@ -19,19 +19,19 @@ import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class ServerNodeTest { private final ServerNode serverNode = new ServerNode("test_job"); - @BeforeClass + @BeforeAll public static void setUp() { JobRegistry.getInstance().addJobInstance("test_job", new JobInstance("127.0.0.1@-@0", null, "127.0.0.1")); } diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/server/ServerServiceTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/server/ServerServiceTest.java index 272e5cafa8..d775045c6a 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/server/ServerServiceTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/server/ServerServiceTest.java @@ -21,24 +21,24 @@ 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.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Arrays; import java.util.Collections; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class ServerServiceTest { @Mock @@ -52,7 +52,7 @@ public final class ServerServiceTest { private ServerService serverService; - @Before + @BeforeEach public void setUp() { JobRegistry.getInstance().addJobInstance("test_job", new JobInstance("127.0.0.1@-@0", null, "127.0.0.1")); serverService = new ServerService(null, "test_job"); diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/setup/DefaultJobClassNameProviderTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/setup/DefaultJobClassNameProviderTest.java index 96e6c21d2a..06e41d512f 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/setup/DefaultJobClassNameProviderTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/setup/DefaultJobClassNameProviderTest.java @@ -19,7 +19,7 @@ import org.apache.shardingsphere.elasticjob.lite.fixture.job.DetailedFooJob; import org.apache.shardingsphere.elasticjob.lite.fixture.job.FooJob; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/setup/JobClassNameProviderFactoryTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/setup/JobClassNameProviderFactoryTest.java index 0a76cf6633..34f52ae760 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/setup/JobClassNameProviderFactoryTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/setup/JobClassNameProviderFactoryTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.lite.internal.setup; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/setup/SetUpFacadeTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/setup/SetUpFacadeTest.java index e5093e06c5..4d3eb4e547 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/setup/SetUpFacadeTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/setup/SetUpFacadeTest.java @@ -26,18 +26,18 @@ import org.apache.shardingsphere.elasticjob.lite.internal.server.ServerService; import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Collections; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class SetUpFacadeTest { @Mock @@ -60,7 +60,7 @@ public final class SetUpFacadeTest { private SetUpFacade setUpFacade; - @Before + @BeforeEach public void setUp() { JobRegistry.getInstance().addJobInstance("test_job", new JobInstance("127.0.0.1@-@0")); setUpFacade = new SetUpFacade(regCenter, "test_job", Collections.emptyList()); diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ExecutionContextServiceTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ExecutionContextServiceTest.java index a99423e5e0..637729706b 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ExecutionContextServiceTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ExecutionContextServiceTest.java @@ -25,11 +25,11 @@ import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry; import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage; import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Arrays; import java.util.Collections; @@ -38,10 +38,10 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class ExecutionContextServiceTest { @Mock @@ -52,7 +52,7 @@ public final class ExecutionContextServiceTest { private final ExecutionContextService executionContextService = new ExecutionContextService(null, "test_job"); - @Before + @BeforeEach public void setUp() { ReflectionUtils.setFieldValue(executionContextService, "jobNodeStorage", jobNodeStorage); ReflectionUtils.setFieldValue(executionContextService, "configService", configService); diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ExecutionServiceTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ExecutionServiceTest.java index d05b8ebc5f..edde6c7f2e 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ExecutionServiceTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ExecutionServiceTest.java @@ -24,12 +24,12 @@ import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry; import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage; import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Arrays; import java.util.Collections; @@ -37,16 +37,16 @@ import java.util.Map; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.StrictStubs.class) +@ExtendWith(MockitoExtension.class) public final class ExecutionServiceTest { @Mock @@ -57,13 +57,13 @@ public final class ExecutionServiceTest { private final ExecutionService executionService = new ExecutionService(null, "test_job"); - @Before + @BeforeEach public void setUp() { ReflectionUtils.setFieldValue(executionService, "jobNodeStorage", jobNodeStorage); ReflectionUtils.setFieldValue(executionService, "configService", configService); } - @After + @AfterEach public void tearDown() { JobRegistry.getInstance().shutdown("test_job"); } diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/MonitorExecutionListenerManagerTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/MonitorExecutionListenerManagerTest.java index 01ffde949e..1b5b6388a6 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/MonitorExecutionListenerManagerTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/MonitorExecutionListenerManagerTest.java @@ -22,16 +22,16 @@ import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class MonitorExecutionListenerManagerTest { @Mock @@ -42,7 +42,7 @@ public final class MonitorExecutionListenerManagerTest { private final MonitorExecutionListenerManager monitorExecutionListenerManager = new MonitorExecutionListenerManager(null, "test_job"); - @Before + @BeforeEach public void setUp() { ReflectionUtils.setSuperclassFieldValue(monitorExecutionListenerManager, "jobNodeStorage", jobNodeStorage); ReflectionUtils.setFieldValue(monitorExecutionListenerManager, "executionService", executionService); diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingListenerManagerTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingListenerManagerTest.java index e7b4e0a140..5ea835479f 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingListenerManagerTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingListenerManagerTest.java @@ -30,18 +30,18 @@ import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent.Type; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEventListener; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class ShardingListenerManagerTest { @Mock @@ -61,7 +61,7 @@ public final class ShardingListenerManagerTest { private ShardingListenerManager shardingListenerManager; - @Before + @BeforeEach public void setUp() { JobRegistry.getInstance().addJobInstance("test_job", new JobInstance("127.0.0.1@-@0")); shardingListenerManager = new ShardingListenerManager(null, "test_job"); diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingNodeTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingNodeTest.java index 9beb7687e8..f8354560d9 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingNodeTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingNodeTest.java @@ -17,11 +17,11 @@ package org.apache.shardingsphere.elasticjob.lite.internal.sharding; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertNull; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertNull; public final class ShardingNodeTest { diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingServiceTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingServiceTest.java index e52451003f..e15ea7eadc 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingServiceTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ShardingServiceTest.java @@ -29,27 +29,27 @@ import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodeStorage; import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Arrays; import java.util.Collections; import java.util.List; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.any; import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.StrictStubs.class) +@ExtendWith(MockitoExtension.class) public final class ShardingServiceTest { @Mock @@ -78,7 +78,7 @@ public final class ShardingServiceTest { private final ShardingService shardingService = new ShardingService(null, "test_job"); - @Before + @BeforeEach public void setUp() { ReflectionUtils.setFieldValue(shardingService, "jobNodeStorage", jobNodeStorage); ReflectionUtils.setFieldValue(shardingService, "leaderService", leaderService); diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/snapshot/BaseSnapshotServiceTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/snapshot/BaseSnapshotServiceTest.java index b3568b3fe5..c099d6b036 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/snapshot/BaseSnapshotServiceTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/snapshot/BaseSnapshotServiceTest.java @@ -19,18 +19,18 @@ import lombok.AccessLevel; import lombok.Getter; -import org.apache.shardingsphere.elasticjob.lite.api.bootstrap.impl.ScheduleJobBootstrap; import org.apache.shardingsphere.elasticjob.api.ElasticJob; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; +import org.apache.shardingsphere.elasticjob.lite.api.bootstrap.impl.ScheduleJobBootstrap; import org.apache.shardingsphere.elasticjob.lite.fixture.EmbedTestingServer; import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry; +import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperConfiguration; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCenter; -import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils; -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; public abstract class BaseSnapshotServiceTest { @@ -53,20 +53,20 @@ public BaseSnapshotServiceTest(final ElasticJob elasticJob) { bootstrap = new ScheduleJobBootstrap(REG_CENTER, elasticJob, JobConfiguration.newBuilder(jobName, 3).cron("0/1 * * * * ?").overwrite(true).build()); } - @BeforeClass + @BeforeAll public static void init() { EmbedTestingServer.start(); ZOOKEEPER_CONFIG.setConnectionTimeoutMilliseconds(30000); REG_CENTER.init(); } - @Before + @BeforeEach public final void setUp() { REG_CENTER.init(); bootstrap.schedule(); } - @After + @AfterEach public final void tearDown() { bootstrap.shutdown(); ReflectionUtils.setFieldValue(JobRegistry.getInstance(), "instance", null); diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/snapshot/SnapshotServiceDisableTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/snapshot/SnapshotServiceDisableTest.java index 33c56cf7ef..551988fc36 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/snapshot/SnapshotServiceDisableTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/snapshot/SnapshotServiceDisableTest.java @@ -19,13 +19,14 @@ import lombok.SneakyThrows; import org.apache.shardingsphere.elasticjob.lite.fixture.job.DetailedFooJob; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.lang.reflect.Field; import java.net.ServerSocket; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; public final class SnapshotServiceDisableTest extends BaseSnapshotServiceTest { @@ -33,15 +34,17 @@ public SnapshotServiceDisableTest() { super(new DetailedFooJob()); } - @Test(expected = IOException.class) - public void assertMonitorWithDumpCommand() throws IOException { - SocketUtils.sendCommand(SnapshotService.DUMP_COMMAND, DUMP_PORT - 1); + @Test + public void assertMonitorWithDumpCommand() { + assertThrows(IOException.class, () -> SocketUtils.sendCommand(SnapshotService.DUMP_COMMAND, DUMP_PORT - 1)); } - @Test(expected = IllegalArgumentException.class) + @Test public void assertPortInvalid() { - SnapshotService snapshotService = new SnapshotService(getREG_CENTER(), -1); - snapshotService.listen(); + assertThrows(IllegalArgumentException.class, () -> { + SnapshotService snapshotService = new SnapshotService(getREG_CENTER(), -1); + snapshotService.listen(); + }); } @Test diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/snapshot/SnapshotServiceEnableTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/snapshot/SnapshotServiceEnableTest.java index 74879562fc..9f17dffb12 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/snapshot/SnapshotServiceEnableTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/snapshot/SnapshotServiceEnableTest.java @@ -18,14 +18,14 @@ package org.apache.shardingsphere.elasticjob.lite.internal.snapshot; import org.apache.shardingsphere.elasticjob.lite.fixture.job.DetailedFooJob; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public final class SnapshotServiceEnableTest extends BaseSnapshotServiceTest { @@ -33,12 +33,12 @@ public SnapshotServiceEnableTest() { super(new DetailedFooJob()); } - @Before + @BeforeEach public void listenMonitor() { getSnapshotService().listen(); } - @After + @AfterEach public void closeMonitor() { getSnapshotService().close(); } @@ -50,7 +50,7 @@ public void assertMonitorWithCommand() throws IOException { } @Test - public void assertDumpJobDirectly() throws IOException { + public void assertDumpJobDirectly() { assertNotNull(getSnapshotService().dumpJobDirectly(getJobName())); } diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/storage/JobNodePathTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/storage/JobNodePathTest.java index 6f3000d503..fa2c17073b 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/storage/JobNodePathTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/storage/JobNodePathTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.lite.internal.storage; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/storage/JobNodeStorageTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/storage/JobNodeStorageTest.java index a7c4a04ac1..839a120f13 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/storage/JobNodeStorageTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/storage/JobNodeStorageTest.java @@ -24,11 +24,11 @@ import org.apache.shardingsphere.elasticjob.reg.exception.RegException; import org.apache.shardingsphere.elasticjob.reg.listener.ConnectionStateChangedEventListener; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEventListener; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Arrays; import java.util.Collections; @@ -37,7 +37,8 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; @@ -45,7 +46,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class JobNodeStorageTest { @Mock @@ -53,7 +54,7 @@ public final class JobNodeStorageTest { private JobNodeStorage jobNodeStorage; - @Before + @BeforeEach public void setUp() { jobNodeStorage = new JobNodeStorage(regCenter, "test_job"); ReflectionUtils.setFieldValue(jobNodeStorage, "regCenter", regCenter); @@ -162,10 +163,12 @@ public void assertExecuteInTransactionSuccess() throws Exception { verify(regCenter).executeInTransaction(any(List.class)); } - @Test(expected = RegException.class) - public void assertExecuteInTransactionFailure() throws Exception { - doThrow(RuntimeException.class).when(regCenter).executeInTransaction(any(List.class)); - jobNodeStorage.executeInTransaction(Collections.singletonList(TransactionOperation.opAdd("/test_transaction", ""))); + @Test + public void assertExecuteInTransactionFailure() { + assertThrows(RegException.class, () -> { + doThrow(RuntimeException.class).when(regCenter).executeInTransaction(any(List.class)); + jobNodeStorage.executeInTransaction(Collections.singletonList(TransactionOperation.opAdd("/test_transaction", ""))); + }); } @Test diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/trigger/TriggerListenerManagerTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/trigger/TriggerListenerManagerTest.java index 079ab6c3e4..ec3bf90130 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/trigger/TriggerListenerManagerTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/trigger/TriggerListenerManagerTest.java @@ -24,17 +24,17 @@ import org.apache.shardingsphere.elasticjob.lite.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.listener.DataChangedEvent; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentMatchers; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class TriggerListenerManagerTest { @Mock @@ -51,7 +51,7 @@ public final class TriggerListenerManagerTest { private TriggerListenerManager triggerListenerManager; - @Before + @BeforeEach public void setUp() { JobRegistry.getInstance().addJobInstance("test_job", new JobInstance("127.0.0.1@-@0")); triggerListenerManager = new TriggerListenerManager(null, "test_job"); diff --git a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/util/SensitiveInfoUtilsTest.java b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/util/SensitiveInfoUtilsTest.java index d8e2f4bd51..42b494bc11 100644 --- a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/util/SensitiveInfoUtilsTest.java +++ b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/util/SensitiveInfoUtilsTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.lite.internal.util; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; diff --git a/elasticjob-lite/elasticjob-lite-lifecycle/pom.xml b/elasticjob-lite/elasticjob-lite-lifecycle/pom.xml index 232b8c53ba..4ed6e1c08d 100644 --- a/elasticjob-lite/elasticjob-lite-lifecycle/pom.xml +++ b/elasticjob-lite/elasticjob-lite-lifecycle/pom.xml @@ -51,15 +51,6 @@ org.apache.curator curator-test - - org.mockito - mockito-core - - - org.mockito - mockito-inline - - org.slf4j jcl-over-slf4j diff --git a/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/AbstractEmbedZookeeperBaseTest.java b/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/AbstractEmbedZookeeperBaseTest.java index 53c7189bce..cf5b37263c 100644 --- a/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/AbstractEmbedZookeeperBaseTest.java +++ b/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/AbstractEmbedZookeeperBaseTest.java @@ -19,7 +19,7 @@ import org.apache.curator.test.TestingServer; import org.apache.shardingsphere.elasticjob.reg.exception.RegExceptionHandler; -import org.junit.BeforeClass; +import org.junit.jupiter.api.BeforeAll; import java.io.File; import java.io.IOException; @@ -30,7 +30,7 @@ public abstract class AbstractEmbedZookeeperBaseTest { private static volatile TestingServer testingServer; - @BeforeClass + @BeforeAll public static void setUp() { startEmbedTestingServer(); } diff --git a/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/api/JobAPIFactoryTest.java b/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/api/JobAPIFactoryTest.java index 1079997705..f80089be91 100644 --- a/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/api/JobAPIFactoryTest.java +++ b/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/api/JobAPIFactoryTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.lite.lifecycle.api; import org.apache.shardingsphere.elasticjob.lite.lifecycle.AbstractEmbedZookeeperBaseTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/domain/ShardingStatusTest.java b/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/domain/ShardingStatusTest.java index 30d0777fcd..3defc997b4 100644 --- a/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/domain/ShardingStatusTest.java +++ b/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/domain/ShardingStatusTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.lite.lifecycle.domain; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/operate/JobOperateAPIImplTest.java b/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/operate/JobOperateAPIImplTest.java index f188757d4b..11c57d55eb 100644 --- a/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/operate/JobOperateAPIImplTest.java +++ b/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/operate/JobOperateAPIImplTest.java @@ -19,31 +19,32 @@ import org.apache.shardingsphere.elasticjob.lite.lifecycle.api.JobOperateAPI; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Arrays; import java.util.Collections; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class JobOperateAPIImplTest { static final int DUMP_PORT = 9000; private JobOperateAPI jobOperateAPI; - - @Mock + + // TODO We should not use `Mock.Strictness.LENIENT` here, but the default. This is a flaw in the unit test design. + @Mock(strictness = Mock.Strictness.LENIENT) private CoordinatorRegistryCenter regCenter; - @Before + @BeforeEach public void setUp() { jobOperateAPI = new JobOperateAPIImpl(regCenter); } diff --git a/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/operate/ShardingOperateAPIImplTest.java b/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/operate/ShardingOperateAPIImplTest.java index 9fc3656d0f..53ef7d293f 100644 --- a/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/operate/ShardingOperateAPIImplTest.java +++ b/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/operate/ShardingOperateAPIImplTest.java @@ -19,15 +19,15 @@ import org.apache.shardingsphere.elasticjob.lite.lifecycle.api.ShardingOperateAPI; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class ShardingOperateAPIImplTest { private ShardingOperateAPI shardingOperateAPI; @@ -35,7 +35,7 @@ public final class ShardingOperateAPIImplTest { @Mock private CoordinatorRegistryCenter regCenter; - @Before + @BeforeEach public void setUp() { shardingOperateAPI = new ShardingOperateAPIImpl(regCenter); } diff --git a/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/reg/RegistryCenterFactoryTest.java b/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/reg/RegistryCenterFactoryTest.java index beadc1e69e..c4a4b10536 100644 --- a/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/reg/RegistryCenterFactoryTest.java +++ b/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/reg/RegistryCenterFactoryTest.java @@ -21,13 +21,13 @@ import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperConfiguration; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCenter; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.lang.reflect.Method; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertNull; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertNull; public final class RegistryCenterFactoryTest extends AbstractEmbedZookeeperBaseTest { diff --git a/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/settings/JobConfigurationAPIImplTest.java b/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/settings/JobConfigurationAPIImplTest.java index d4ccad8ca7..704d490a09 100644 --- a/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/settings/JobConfigurationAPIImplTest.java +++ b/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/settings/JobConfigurationAPIImplTest.java @@ -23,21 +23,22 @@ import org.apache.shardingsphere.elasticjob.lite.lifecycle.fixture.LifecycleYamlConstants; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.script.props.ScriptJobProperties; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class JobConfigurationAPIImplTest { private JobConfigurationAPI jobConfigAPI; @@ -45,7 +46,7 @@ public final class JobConfigurationAPIImplTest { @Mock private CoordinatorRegistryCenter regCenter; - @Before + @BeforeEach public void setUp() { jobConfigAPI = new JobConfigurationAPIImpl(regCenter); } @@ -109,28 +110,34 @@ public void assertUpdateJobConfig() { verify(regCenter).update("/test_job/config", LifecycleYamlConstants.getDataflowJobYaml()); } - @Test(expected = IllegalArgumentException.class) + @Test public void assertUpdateJobConfigIfJobNameIsEmpty() { - JobConfigurationPOJO jobConfiguration = new JobConfigurationPOJO(); - jobConfiguration.setJobName(""); - jobConfigAPI.updateJobConfiguration(jobConfiguration); + assertThrows(IllegalArgumentException.class, () -> { + JobConfigurationPOJO jobConfiguration = new JobConfigurationPOJO(); + jobConfiguration.setJobName(""); + jobConfigAPI.updateJobConfiguration(jobConfiguration); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void assertUpdateJobConfigIfCronIsEmpty() { - JobConfigurationPOJO jobConfiguration = new JobConfigurationPOJO(); - jobConfiguration.setJobName("test_job"); - jobConfiguration.setCron(""); - jobConfigAPI.updateJobConfiguration(jobConfiguration); + assertThrows(IllegalArgumentException.class, () -> { + JobConfigurationPOJO jobConfiguration = new JobConfigurationPOJO(); + jobConfiguration.setJobName("test_job"); + jobConfiguration.setCron(""); + jobConfigAPI.updateJobConfiguration(jobConfiguration); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void assertUpdateJobConfigIfShardingTotalCountLessThanOne() { - JobConfigurationPOJO jobConfiguration = new JobConfigurationPOJO(); - jobConfiguration.setJobName("test_job"); - jobConfiguration.setCron("0/1 * * * * ?"); - jobConfiguration.setShardingTotalCount(0); - jobConfigAPI.updateJobConfiguration(jobConfiguration); + assertThrows(IllegalArgumentException.class, () -> { + JobConfigurationPOJO jobConfiguration = new JobConfigurationPOJO(); + jobConfiguration.setJobName("test_job"); + jobConfiguration.setCron("0/1 * * * * ?"); + jobConfiguration.setShardingTotalCount(0); + jobConfigAPI.updateJobConfiguration(jobConfiguration); + }); } @Test diff --git a/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/statistics/JobStatisticsAPIImplTest.java b/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/statistics/JobStatisticsAPIImplTest.java index f17b2b26ca..b0c025043e 100644 --- a/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/statistics/JobStatisticsAPIImplTest.java +++ b/elasticjob-lite/elasticjob-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.domain.JobBriefInfo; import org.apache.shardingsphere.elasticjob.lite.lifecycle.fixture.LifecycleYamlConstants; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Arrays; import java.util.Collections; @@ -34,15 +34,16 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class JobStatisticsAPIImplTest { private JobStatisticsAPI jobStatisticsAPI; - - @Mock + + // TODO We should not use `Mock.Strictness.LENIENT` here, but the default. This is a flaw in the unit test design. + @Mock(strictness = Mock.Strictness.LENIENT) private CoordinatorRegistryCenter regCenter; - @Before + @BeforeEach public void setUp() { jobStatisticsAPI = new JobStatisticsAPIImpl(regCenter); } diff --git a/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/statistics/ServerStatisticsAPIImplTest.java b/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/statistics/ServerStatisticsAPIImplTest.java index 4b4e8090d3..f56c2b6226 100644 --- a/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/statistics/ServerStatisticsAPIImplTest.java +++ b/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/statistics/ServerStatisticsAPIImplTest.java @@ -20,21 +20,21 @@ import org.apache.shardingsphere.elasticjob.lite.lifecycle.api.ServerStatisticsAPI; import org.apache.shardingsphere.elasticjob.lite.lifecycle.domain.ServerBriefInfo; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Arrays; import java.util.Collections; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class ServerStatisticsAPIImplTest { private ServerStatisticsAPI serverStatisticsAPI; @@ -42,7 +42,7 @@ public final class ServerStatisticsAPIImplTest { @Mock private CoordinatorRegistryCenter regCenter; - @Before + @BeforeEach public void setUp() { serverStatisticsAPI = new ServerStatisticsAPIImpl(regCenter); } diff --git a/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/statistics/ShardingStatisticsAPIImplTest.java b/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/statistics/ShardingStatisticsAPIImplTest.java index c89b605c45..c92659d512 100644 --- a/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/statistics/ShardingStatisticsAPIImplTest.java +++ b/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/statistics/ShardingStatisticsAPIImplTest.java @@ -20,28 +20,29 @@ import org.apache.shardingsphere.elasticjob.lite.lifecycle.api.ShardingStatisticsAPI; import org.apache.shardingsphere.elasticjob.lite.lifecycle.domain.ShardingInfo; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Arrays; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class ShardingStatisticsAPIImplTest { private ShardingStatisticsAPI shardingStatisticsAPI; - - @Mock + + // TODO We should not use `Mock.Strictness.LENIENT` here, but the default. This is a flaw in the unit test design. + @Mock(strictness = Mock.Strictness.LENIENT) private CoordinatorRegistryCenter regCenter; - @Before + @BeforeEach public void setUp() { shardingStatisticsAPI = new ShardingStatisticsAPIImpl(regCenter); } diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobConfigurationPropertiesTest.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobConfigurationPropertiesTest.java index 4ed9da9ce4..4415b7ece5 100644 --- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobConfigurationPropertiesTest.java +++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobConfigurationPropertiesTest.java @@ -23,7 +23,7 @@ import java.util.Collections; import org.apache.shardingsphere.elasticjob.api.ElasticJob; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.junit.Test; +import org.junit.jupiter.api.Test; public final class ElasticJobConfigurationPropertiesTest { diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobSpringBootScannerTest.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobSpringBootScannerTest.java index 2a3607daf8..b21302701c 100644 --- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobSpringBootScannerTest.java +++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobSpringBootScannerTest.java @@ -22,25 +22,29 @@ import org.apache.shardingsphere.elasticjob.lite.spring.boot.job.fixture.job.impl.AnnotationCustomJob; import org.apache.shardingsphere.elasticjob.lite.spring.core.scanner.ElasticJobScan; import org.awaitility.Awaitility; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.ApplicationContext; import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; import java.util.concurrent.TimeUnit; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertNotNull; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; @SpringBootTest @ActiveProfiles("elasticjob") @ElasticJobScan(basePackages = "org.apache.shardingsphere.elasticjob.lite.spring.boot.job.fixture.job.impl") -public class ElasticJobSpringBootScannerTest extends AbstractJUnit4SpringContextTests { - - @BeforeClass +public class ElasticJobSpringBootScannerTest { + + @Autowired + private ApplicationContext applicationContext; + + @BeforeAll public static void init() { EmbedTestingServer.start(); AnnotationCustomJob.reset(); diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobSpringBootTest.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobSpringBootTest.java index 59d9469c8e..b0ce4781f3 100644 --- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobSpringBootTest.java +++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobSpringBootTest.java @@ -30,12 +30,13 @@ import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCenter; import org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration; import org.awaitility.Awaitility; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.ApplicationContext; import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; import javax.sql.DataSource; import java.lang.reflect.Field; @@ -49,18 +50,21 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; @SpringBootTest @SpringBootApplication @ActiveProfiles("elasticjob") -public class ElasticJobSpringBootTest extends AbstractJUnit4SpringContextTests { - - @BeforeClass +public class ElasticJobSpringBootTest { + + @Autowired + private ApplicationContext applicationContext; + + @BeforeAll public static void init() { EmbedTestingServer.start(); } diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/reg/ZookeeperPropertiesTest.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/reg/ZookeeperPropertiesTest.java index 66432d9599..979e58375f 100644 --- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/reg/ZookeeperPropertiesTest.java +++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/reg/ZookeeperPropertiesTest.java @@ -21,7 +21,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperConfiguration; -import org.junit.Test; +import org.junit.jupiter.api.Test; public final class ZookeeperPropertiesTest { diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/reg/snapshot/ElasticJobSnapshotServiceConfigurationTest.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/reg/snapshot/ElasticJobSnapshotServiceConfigurationTest.java index 547599bb36..8649f70cc5 100644 --- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/reg/snapshot/ElasticJobSnapshotServiceConfigurationTest.java +++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/reg/snapshot/ElasticJobSnapshotServiceConfigurationTest.java @@ -17,23 +17,27 @@ package org.apache.shardingsphere.elasticjob.lite.spring.boot.reg.snapshot; -import static org.junit.Assert.assertNotNull; - import org.apache.shardingsphere.elasticjob.lite.internal.snapshot.SnapshotService; import org.apache.shardingsphere.elasticjob.lite.spring.boot.job.fixture.EmbedTestingServer; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.ApplicationContext; import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; + +import static org.junit.jupiter.api.Assertions.assertNotNull; @SpringBootTest @SpringBootApplication @ActiveProfiles("snapshot") -public class ElasticJobSnapshotServiceConfigurationTest extends AbstractJUnit4SpringContextTests { +public class ElasticJobSnapshotServiceConfigurationTest { + + @Autowired + private ApplicationContext applicationContext; - @BeforeClass + @BeforeAll public static void init() { EmbedTestingServer.start(); } diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/tracing/TracingConfigurationTest.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/tracing/TracingConfigurationTest.java index 5785969edb..c1ed9ccb4c 100644 --- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/tracing/TracingConfigurationTest.java +++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/tracing/TracingConfigurationTest.java @@ -19,27 +19,31 @@ import org.apache.shardingsphere.elasticjob.lite.spring.boot.job.fixture.EmbedTestingServer; import org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.ObjectProvider; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.ApplicationContext; import org.springframework.core.ResolvableType; import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; import javax.sql.DataSource; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; @SpringBootTest @SpringBootApplication @ActiveProfiles("tracing") -public class TracingConfigurationTest extends AbstractJUnit4SpringContextTests { +public class TracingConfigurationTest { - @BeforeClass + @Autowired + private ApplicationContext applicationContext; + + @BeforeAll public static void init() { EmbedTestingServer.start(); } diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/core/setup/JobClassNameProviderFactoryTest.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/core/setup/JobClassNameProviderFactoryTest.java index af4107db93..315be983cc 100644 --- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/core/setup/JobClassNameProviderFactoryTest.java +++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/core/setup/JobClassNameProviderFactoryTest.java @@ -21,7 +21,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import org.apache.shardingsphere.elasticjob.lite.internal.setup.JobClassNameProviderFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; public final class JobClassNameProviderFactoryTest { diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/core/util/AopTargetUtilsTest.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/core/util/AopTargetUtilsTest.java index 9f7b6aea62..8477180208 100644 --- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/core/util/AopTargetUtilsTest.java +++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/core/util/AopTargetUtilsTest.java @@ -17,16 +17,16 @@ package org.apache.shardingsphere.elasticjob.lite.spring.core.util; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertFalse; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; - import org.apache.shardingsphere.elasticjob.api.ElasticJob; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.aop.framework.ProxyFactory; import org.springframework.aop.support.AopUtils; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + public final class AopTargetUtilsTest { @Test diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/pom.xml b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/pom.xml index 8dc4c821f8..ac84b90730 100644 --- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/pom.xml +++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/pom.xml @@ -82,10 +82,6 @@ org.aspectj aspectjweaver - - org.mockito - mockito-core - org.slf4j jcl-over-slf4j diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/fixture/aspect/SimpleAspect.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/fixture/aspect/SimpleAspect.java index 3d4b82df9d..0554769c59 100644 --- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/fixture/aspect/SimpleAspect.java +++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/fixture/aspect/SimpleAspect.java @@ -33,7 +33,11 @@ public class SimpleAspect { @Pointcut("execution(* org.apache.shardingsphere.elasticjob.lite.spring.fixture..*(..))") public void aspect() { } - + + /** + * Before operator. + * @param joinPoint joinPoint + */ @Before("aspect()") public void before(final JoinPoint joinPoint) { } diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/AbstractJobSpringIntegrateTest.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/AbstractJobSpringIntegrateTest.java index 879d953f94..60024db4d7 100644 --- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/AbstractJobSpringIntegrateTest.java +++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/AbstractJobSpringIntegrateTest.java @@ -21,22 +21,22 @@ import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry; import org.apache.shardingsphere.elasticjob.lite.spring.namespace.fixture.job.DataflowElasticJob; import org.apache.shardingsphere.elasticjob.lite.spring.namespace.fixture.job.FooSimpleElasticJob; -import org.apache.shardingsphere.elasticjob.lite.spring.namespace.test.AbstractZookeeperJUnit4SpringContextTests; +import org.apache.shardingsphere.elasticjob.lite.spring.namespace.test.AbstractZookeeperJUnitJupiterSpringContextTests; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.awaitility.Awaitility; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import java.util.concurrent.TimeUnit; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; @RequiredArgsConstructor -public abstract class AbstractJobSpringIntegrateTest extends AbstractZookeeperJUnit4SpringContextTests { +public abstract class AbstractJobSpringIntegrateTest extends AbstractZookeeperJUnitJupiterSpringContextTests { private final String simpleJobName; @@ -45,14 +45,14 @@ public abstract class AbstractJobSpringIntegrateTest extends AbstractZookeeperJU @Autowired private CoordinatorRegistryCenter regCenter; - @Before - @After + @BeforeEach + @AfterEach public void reset() { FooSimpleElasticJob.reset(); DataflowElasticJob.reset(); } - @After + @AfterEach public void tearDown() { JobRegistry.getInstance().shutdown(simpleJobName); JobRegistry.getInstance().shutdown(throughputDataflowJobName); diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/AbstractOneOffJobSpringIntegrateTest.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/AbstractOneOffJobSpringIntegrateTest.java index 8bb75a19f7..325780ad08 100644 --- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/AbstractOneOffJobSpringIntegrateTest.java +++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/AbstractOneOffJobSpringIntegrateTest.java @@ -22,38 +22,42 @@ import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry; import org.apache.shardingsphere.elasticjob.lite.spring.namespace.fixture.job.DataflowElasticJob; import org.apache.shardingsphere.elasticjob.lite.spring.namespace.fixture.job.FooSimpleElasticJob; -import org.apache.shardingsphere.elasticjob.lite.spring.namespace.test.AbstractZookeeperJUnit4SpringContextTests; +import org.apache.shardingsphere.elasticjob.lite.spring.namespace.test.AbstractZookeeperJUnitJupiterSpringContextTests; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.awaitility.Awaitility; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; import java.util.concurrent.TimeUnit; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; @RequiredArgsConstructor -public abstract class AbstractOneOffJobSpringIntegrateTest extends AbstractZookeeperJUnit4SpringContextTests { +public abstract class AbstractOneOffJobSpringIntegrateTest extends AbstractZookeeperJUnitJupiterSpringContextTests { private final String simpleJobName; private final String throughputDataflowJobName; + + @Autowired + private ApplicationContext applicationContext; @Autowired private CoordinatorRegistryCenter regCenter; - @Before - @After + @BeforeEach + @AfterEach public void reset() { FooSimpleElasticJob.reset(); DataflowElasticJob.reset(); } - @After + @AfterEach public void tearDown() { JobRegistry.getInstance().shutdown(simpleJobName); JobRegistry.getInstance().shutdown(throughputDataflowJobName); diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/JobSpringNamespaceWithRefTest.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/JobSpringNamespaceWithRefTest.java index 438b4046e2..09202f3e46 100644 --- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/JobSpringNamespaceWithRefTest.java +++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/JobSpringNamespaceWithRefTest.java @@ -19,12 +19,12 @@ import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry; import org.apache.shardingsphere.elasticjob.lite.spring.namespace.fixture.job.ref.RefFooSimpleElasticJob; -import org.apache.shardingsphere.elasticjob.lite.spring.namespace.test.AbstractZookeeperJUnit4SpringContextTests; +import org.apache.shardingsphere.elasticjob.lite.spring.namespace.test.AbstractZookeeperJUnitJupiterSpringContextTests; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.awaitility.Awaitility; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; @@ -32,23 +32,23 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; @ContextConfiguration(locations = "classpath:META-INF/job/withJobRef.xml") -public final class JobSpringNamespaceWithRefTest extends AbstractZookeeperJUnit4SpringContextTests { +public final class JobSpringNamespaceWithRefTest extends AbstractZookeeperJUnitJupiterSpringContextTests { private final String simpleJobName = "simpleElasticJob_job_ref"; @Autowired private CoordinatorRegistryCenter regCenter; - @Before - @After + @BeforeEach + @AfterEach public void reset() { RefFooSimpleElasticJob.reset(); } - @After + @AfterEach public void tearDown() { JobRegistry.getInstance().shutdown(simpleJobName); } diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/JobSpringNamespaceWithTypeTest.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/JobSpringNamespaceWithTypeTest.java index 4b511053d8..4c1684cfdd 100644 --- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/JobSpringNamespaceWithTypeTest.java +++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/JobSpringNamespaceWithTypeTest.java @@ -18,11 +18,11 @@ package org.apache.shardingsphere.elasticjob.lite.spring.namespace.job; import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.lite.spring.namespace.test.AbstractZookeeperJUnit4SpringContextTests; +import org.apache.shardingsphere.elasticjob.lite.spring.namespace.test.AbstractZookeeperJUnitJupiterSpringContextTests; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.awaitility.Awaitility; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import org.quartz.Scheduler; import org.quartz.SchedulerException; import org.springframework.beans.factory.annotation.Autowired; @@ -33,10 +33,10 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; @ContextConfiguration(locations = "classpath:META-INF/job/withJobType.xml") -public final class JobSpringNamespaceWithTypeTest extends AbstractZookeeperJUnit4SpringContextTests { +public final class JobSpringNamespaceWithTypeTest extends AbstractZookeeperJUnitJupiterSpringContextTests { private final String scriptJobName = "scriptElasticJob_job_type"; @@ -45,7 +45,7 @@ public final class JobSpringNamespaceWithTypeTest extends AbstractZookeeperJUnit private Scheduler scheduler; - @After + @AfterEach public void tearDown() { Awaitility.await().atMost(1L, TimeUnit.MINUTES).untilAsserted(() -> assertThat(scheduler.getCurrentlyExecutingJobs().isEmpty(), is(true)) diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/OneOffJobSpringNamespaceWithRefTest.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/OneOffJobSpringNamespaceWithRefTest.java index d7c6af6323..e182f8c4de 100644 --- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/OneOffJobSpringNamespaceWithRefTest.java +++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/OneOffJobSpringNamespaceWithRefTest.java @@ -20,36 +20,40 @@ import org.apache.shardingsphere.elasticjob.lite.api.bootstrap.impl.OneOffJobBootstrap; import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry; import org.apache.shardingsphere.elasticjob.lite.spring.namespace.fixture.job.ref.RefFooSimpleElasticJob; -import org.apache.shardingsphere.elasticjob.lite.spring.namespace.test.AbstractZookeeperJUnit4SpringContextTests; +import org.apache.shardingsphere.elasticjob.lite.spring.namespace.test.AbstractZookeeperJUnitJupiterSpringContextTests; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.awaitility.Awaitility; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; import org.springframework.test.context.ContextConfiguration; import java.util.concurrent.TimeUnit; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; @ContextConfiguration(locations = "classpath:META-INF/job/oneOffWithJobRef.xml") -public final class OneOffJobSpringNamespaceWithRefTest extends AbstractZookeeperJUnit4SpringContextTests { +public final class OneOffJobSpringNamespaceWithRefTest extends AbstractZookeeperJUnitJupiterSpringContextTests { private final String oneOffSimpleJobName = "oneOffSimpleElasticJobRef"; - + + @Autowired + private ApplicationContext applicationContext; + @Autowired private CoordinatorRegistryCenter regCenter; - @Before - @After + @BeforeEach + @AfterEach public void reset() { RefFooSimpleElasticJob.reset(); } - @After + @AfterEach public void tearDown() { JobRegistry.getInstance().shutdown(oneOffSimpleJobName); } diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/OneOffJobSpringNamespaceWithTypeTest.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/OneOffJobSpringNamespaceWithTypeTest.java index c6f1f46dbb..e0ae1ae17d 100644 --- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/OneOffJobSpringNamespaceWithTypeTest.java +++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/OneOffJobSpringNamespaceWithTypeTest.java @@ -19,27 +19,31 @@ import org.apache.shardingsphere.elasticjob.lite.api.bootstrap.impl.OneOffJobBootstrap; import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry; -import org.apache.shardingsphere.elasticjob.lite.spring.namespace.test.AbstractZookeeperJUnit4SpringContextTests; +import org.apache.shardingsphere.elasticjob.lite.spring.namespace.test.AbstractZookeeperJUnitJupiterSpringContextTests; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.awaitility.Awaitility; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; import org.springframework.test.context.ContextConfiguration; import java.util.concurrent.TimeUnit; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; @ContextConfiguration(locations = "classpath:META-INF/job/oneOffWithJobType.xml") -public final class OneOffJobSpringNamespaceWithTypeTest extends AbstractZookeeperJUnit4SpringContextTests { +public final class OneOffJobSpringNamespaceWithTypeTest extends AbstractZookeeperJUnitJupiterSpringContextTests { private final String scriptJobName = "oneOffScriptElasticJob_job_type"; - + + @Autowired + private ApplicationContext applicationContext; + @Autowired private CoordinatorRegistryCenter regCenter; - @After + @AfterEach public void tearDown() { JobRegistry.getInstance().shutdown(scriptJobName); } diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/scanner/AbstractJobSpringIntegrateTest.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/scanner/AbstractJobSpringIntegrateTest.java index 98f7d67cce..d7a3538940 100644 --- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/scanner/AbstractJobSpringIntegrateTest.java +++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/scanner/AbstractJobSpringIntegrateTest.java @@ -20,46 +20,46 @@ import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.elasticjob.lite.internal.schedule.JobRegistry; import org.apache.shardingsphere.elasticjob.lite.spring.namespace.fixture.job.annotation.AnnotationSimpleJob; -import org.apache.shardingsphere.elasticjob.lite.spring.namespace.test.AbstractZookeeperJUnit4SpringContextTests; +import org.apache.shardingsphere.elasticjob.lite.spring.namespace.test.AbstractZookeeperJUnitJupiterSpringContextTests; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.awaitility.Awaitility; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import java.util.concurrent.TimeUnit; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; @RequiredArgsConstructor -public abstract class AbstractJobSpringIntegrateTest extends AbstractZookeeperJUnit4SpringContextTests { +public abstract class AbstractJobSpringIntegrateTest extends AbstractZookeeperJUnitJupiterSpringContextTests { private final String simpleJobName; @Autowired private CoordinatorRegistryCenter regCenter; - @Before - @After + @BeforeEach + @AfterEach public void reset() { AnnotationSimpleJob.reset(); } - @After + @AfterEach public void tearDown() { JobRegistry.getInstance().shutdown(simpleJobName); } - + @Test public void assertSpringJobBean() { assertSimpleElasticJobBean(); } private void assertSimpleElasticJobBean() { - Awaitility.await().atMost(1L, TimeUnit.MINUTES).untilAsserted(() -> + Awaitility.await().atMost(5L, TimeUnit.SECONDS).untilAsserted(() -> assertThat(AnnotationSimpleJob.isCompleted(), is(true)) ); assertTrue(AnnotationSimpleJob.isCompleted()); diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/snapshot/SnapshotSpringNamespaceDisableTest.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/snapshot/SnapshotSpringNamespaceDisableTest.java index 883cc431e4..3f8943f1ec 100644 --- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/snapshot/SnapshotSpringNamespaceDisableTest.java +++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/snapshot/SnapshotSpringNamespaceDisableTest.java @@ -18,17 +18,19 @@ package org.apache.shardingsphere.elasticjob.lite.spring.namespace.snapshot; import org.apache.shardingsphere.elasticjob.lite.internal.snapshot.SnapshotService; -import org.apache.shardingsphere.elasticjob.lite.spring.namespace.test.AbstractZookeeperJUnit4SpringContextTests; -import org.junit.Test; +import org.apache.shardingsphere.elasticjob.lite.spring.namespace.test.AbstractZookeeperJUnitJupiterSpringContextTests; +import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; import java.io.IOException; +import static org.junit.jupiter.api.Assertions.assertThrows; + @ContextConfiguration(locations = "classpath:META-INF/snapshot/snapshotDisabled.xml") -public final class SnapshotSpringNamespaceDisableTest extends AbstractZookeeperJUnit4SpringContextTests { +public final class SnapshotSpringNamespaceDisableTest extends AbstractZookeeperJUnitJupiterSpringContextTests { - @Test(expected = IOException.class) - public void assertSnapshotDisable() throws IOException { - SocketUtils.sendCommand(SnapshotService.DUMP_COMMAND, 9998); + @Test + public void assertSnapshotDisable() { + assertThrows(IOException.class, () -> SocketUtils.sendCommand(SnapshotService.DUMP_COMMAND, 9998)); } } diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/snapshot/SnapshotSpringNamespaceEnableTest.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/snapshot/SnapshotSpringNamespaceEnableTest.java index 92376cb92b..a1c94756ed 100644 --- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/snapshot/SnapshotSpringNamespaceEnableTest.java +++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/snapshot/SnapshotSpringNamespaceEnableTest.java @@ -17,16 +17,16 @@ package org.apache.shardingsphere.elasticjob.lite.spring.namespace.snapshot; -import org.apache.shardingsphere.elasticjob.lite.spring.namespace.test.AbstractZookeeperJUnit4SpringContextTests; -import org.junit.Test; +import org.apache.shardingsphere.elasticjob.lite.spring.namespace.test.AbstractZookeeperJUnitJupiterSpringContextTests; +import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; import java.io.IOException; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; @ContextConfiguration(locations = "classpath:META-INF/snapshot/snapshotEnabled.xml") -public final class SnapshotSpringNamespaceEnableTest extends AbstractZookeeperJUnit4SpringContextTests { +public final class SnapshotSpringNamespaceEnableTest extends AbstractZookeeperJUnitJupiterSpringContextTests { @Test public void assertSnapshotEnable() throws IOException { diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/test/AbstractZookeeperJUnit4SpringContextTests.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/test/AbstractZookeeperJUnitJupiterSpringContextTests.java similarity index 57% rename from elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/test/AbstractZookeeperJUnit4SpringContextTests.java rename to elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/test/AbstractZookeeperJUnitJupiterSpringContextTests.java index 6a1832a00f..b21c50105e 100644 --- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/test/AbstractZookeeperJUnit4SpringContextTests.java +++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/test/AbstractZookeeperJUnitJupiterSpringContextTests.java @@ -17,9 +17,19 @@ package org.apache.shardingsphere.elasticjob.lite.spring.namespace.test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.test.context.TestExecutionListeners; -import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; +import org.springframework.test.context.junit.jupiter.SpringExtension; -@TestExecutionListeners(EmbedZookeeperTestExecutionListener.class) -public abstract class AbstractZookeeperJUnit4SpringContextTests extends AbstractJUnit4SpringContextTests { +/** + * Background reference AbstractJUnit4SpringContextTests + * and spring-projects/spring-framework#29149. + * + * @see org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests + */ +@ExtendWith(SpringExtension.class) +@TestExecutionListeners(listeners = {EmbedZookeeperTestExecutionListener.class}, + inheritListeners = false, + mergeMode = TestExecutionListeners.MergeMode.MERGE_WITH_DEFAULTS) +public abstract class AbstractZookeeperJUnitJupiterSpringContextTests { } diff --git a/pom.xml b/pom.xml index bf99960b2f..59f63a4a76 100644 --- a/pom.xml +++ b/pom.xml @@ -71,8 +71,7 @@ 8.0.16 1.4.184 - 4.13.2 - 5.10.0 + 5.10.0 2.2 4.11.0 4.2.0 @@ -313,15 +312,9 @@ ${h2.version} test - - junit - junit - ${junit.version} - test - org.hamcrest - hamcrest-core + hamcrest ${hamcrest.version} test @@ -330,12 +323,6 @@ mockito-core ${mockito.version} test - - - org.hamcrest - hamcrest-core - - org.mockito @@ -343,6 +330,12 @@ ${mockito.version} test + + org.mockito + mockito-junit-jupiter + ${mockito.version} + test + org.aspectj aspectjweaver @@ -358,7 +351,7 @@ org.junit junit-bom - ${junit5.version} + ${junit.version} pom import @@ -367,13 +360,28 @@ - junit - junit + org.junit.jupiter + junit-jupiter + test + + + org.hamcrest + hamcrest + test + + + org.mockito + mockito-core + test + + + org.mockito + mockito-inline test - org.junit.vintage - junit-vintage-engine + org.mockito + mockito-junit-jupiter test diff --git a/src/main/resources/checkstyle.xml b/src/main/resources/checkstyle.xml index 496dca007c..00242136f7 100644 --- a/src/main/resources/checkstyle.xml +++ b/src/main/resources/checkstyle.xml @@ -117,7 +117,7 @@ - + diff --git a/src/main/resources/checkstyle_ci.xml b/src/main/resources/checkstyle_ci.xml index ba0e83d9ef..326987419b 100644 --- a/src/main/resources/checkstyle_ci.xml +++ b/src/main/resources/checkstyle_ci.xml @@ -112,7 +112,7 @@ - + @@ -226,7 +226,7 @@ - +