You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/07/10 13:22:24 UTC
[shardingsphere-elasticjob-lite] branch master updated: Use static
import with test cases (#1023)
This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob-lite.git
The following commit(s) were added to refs/heads/master by this push:
new c1656cd Use static import with test cases (#1023)
c1656cd is described below
commit c1656cd8342837413ad52c33f740b3295cc3d3e9
Author: Liang Zhang <te...@163.com>
AuthorDate: Fri Jul 10 21:21:39 2020 +0800
Use static import with test cases (#1023)
* Use static import with is
* Use static import with Mockito
* Use static import with Assert
* Use @RunWith(MockitoJUnitRunner.class)
---
.../elasticjob/cloud/api/ShardingContextTest.java | 21 +-
.../cloud/config/JobCoreConfigurationTest.java | 39 ++--
.../elasticjob/cloud/context/TaskContextTest.java | 61 +++---
.../cloud/exception/ExceptionUtilTest.java | 12 +-
.../exception/JobConfigurationExceptionTest.java | 9 +-
.../JobExecutionEnvironmentExceptionTest.java | 7 +-
.../cloud/exception/JobSystemExceptionTest.java | 9 +-
.../cloud/executor/JobExecutorFactoryTest.java | 28 +--
.../ExecutorServiceHandlerRegistryTest.java | 17 +-
.../cloud/executor/handler/JobPropertiesTest.java | 29 +--
.../reg/zookeeper/ZookeeperConfigurationTest.java | 15 +-
...okeeperRegistryCenterQueryWithoutCacheTest.java | 41 ++--
.../statistics/rdb/StatisticRdbRepositoryTest.java | 10 +-
.../util/concurrent/ExecutorServiceObjectTest.java | 30 +--
.../cloud/util/digest/EncryptionTest.java | 7 +-
.../elasticjob/cloud/util/env/TimeServiceTest.java | 7 +-
.../json/JobConfigurationGsonTypeAdapterTest.java | 30 +--
.../cloud/executor/CloudJobFacadeTest.java | 15 +-
.../executor/JobConfigurationContextTest.java | 36 ++--
.../cloud/executor/TaskExecutorThreadTest.java | 19 +-
.../executor/local/LocalTaskExecutorTest.java | 42 ++--
.../cloud/restful/RestfulExceptionTest.java | 5 +-
.../cloud/restful/RestfulServerTest.java | 24 +--
.../config/app/CloudAppConfigurationNodeTest.java | 7 +-
.../app/CloudAppConfigurationServiceTest.java | 49 ++---
.../config/job/CloudJobConfigurationNodeTest.java | 7 +-
.../job/CloudJobConfigurationServiceTest.java | 59 +++---
.../cloud/scheduler/context/JobContextTest.java | 11 +-
.../scheduler/env/BootstrapEnvironmentTest.java | 42 ++--
.../cloud/scheduler/ha/FrameworkIDServiceTest.java | 5 +-
.../mesos/AppConstraintEvaluatorTest.java | 67 ++++---
.../cloud/scheduler/mesos/FacadeServiceTest.java | 125 ++++++------
.../cloud/scheduler/mesos/JobTaskRequestTest.java | 34 ++--
.../cloud/scheduler/mesos/LaunchingTasksTest.java | 17 +-
.../cloud/scheduler/mesos/LeasesQueueTest.java | 10 +-
.../scheduler/mesos/MesosStateServiceTest.java | 35 ++--
.../cloud/scheduler/mesos/SchedulerEngineTest.java | 150 +++++++-------
.../scheduler/mesos/SchedulerServiceTest.java | 19 +-
.../cloud/scheduler/mesos/TaskInfoDataTest.java | 24 +--
.../scheduler/restful/CloudAppRestfulApiTest.java | 92 ++++-----
.../scheduler/restful/CloudJobRestfulApiTest.java | 214 ++++++++++----------
.../restful/CloudOperationRestfulApiTest.java | 25 +--
.../state/disable/app/DisableAppNodeTest.java | 7 +-
.../state/disable/app/DisableAppServiceTest.java | 27 +--
.../state/disable/job/DisableJobNodeTest.java | 7 +-
.../state/disable/job/DisableJobServiceTest.java | 27 +--
.../scheduler/state/failover/FailoverNodeTest.java | 9 +-
.../state/failover/FailoverServiceTest.java | 164 ++++++++--------
.../cloud/scheduler/state/ready/ReadyNodeTest.java | 7 +-
.../scheduler/state/ready/ReadyServiceTest.java | 215 +++++++++++----------
.../scheduler/state/running/RunningNodeTest.java | 9 +-
.../state/running/RunningServiceTest.java | 89 +++++----
.../scheduler/statistics/StatisticManagerTest.java | 94 ++++-----
.../statistics/job/JobRunningStatisticJobTest.java | 60 +++---
.../elasticjob/tracing/JobEventBusTest.java | 4 +-
.../rdb/listener/RDBTracingListenerTest.java | 3 -
56 files changed, 1168 insertions(+), 1059 deletions(-)
diff --git a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/api/ShardingContextTest.java b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/api/ShardingContextTest.java
index 72a082a..8300738 100755
--- a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/api/ShardingContextTest.java
+++ b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/api/ShardingContextTest.java
@@ -19,27 +19,28 @@ package org.apache.shardingsphere.elasticjob.cloud.api;
import org.apache.shardingsphere.elasticjob.cloud.executor.ShardingContexts;
import org.apache.shardingsphere.elasticjob.cloud.fixture.ShardingContextsBuilder;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public final class ShardingContextTest {
@Test
public void assertNew() {
ShardingContexts shardingContexts = ShardingContextsBuilder.getMultipleShardingContexts();
ShardingContext actual = new ShardingContext(shardingContexts, 1);
- Assert.assertThat(actual.getJobName(), Is.is(shardingContexts.getJobName()));
- Assert.assertThat(actual.getTaskId(), Is.is(shardingContexts.getTaskId()));
- Assert.assertThat(actual.getShardingTotalCount(), Is.is(shardingContexts.getShardingTotalCount()));
- Assert.assertThat(actual.getJobParameter(), Is.is(shardingContexts.getJobParameter()));
- Assert.assertThat(actual.getShardingItem(), Is.is(1));
- Assert.assertThat(actual.getShardingParameter(), Is.is(shardingContexts.getShardingItemParameters().get(1)));
+ assertThat(actual.getJobName(), is(shardingContexts.getJobName()));
+ assertThat(actual.getTaskId(), is(shardingContexts.getTaskId()));
+ assertThat(actual.getShardingTotalCount(), is(shardingContexts.getShardingTotalCount()));
+ assertThat(actual.getJobParameter(), is(shardingContexts.getJobParameter()));
+ assertThat(actual.getShardingItem(), is(1));
+ assertThat(actual.getShardingParameter(), is(shardingContexts.getShardingItemParameters().get(1)));
}
@Test
public void assertToString() {
- Assert.assertThat(new ShardingContext(ShardingContextsBuilder.getMultipleShardingContexts(), 1).toString(),
- Is.is("ShardingContext(jobName=test_job, taskId=fake_task_id, shardingTotalCount=2, jobParameter=, shardingItem=1, shardingParameter=B)"));
+ assertThat(new ShardingContext(ShardingContextsBuilder.getMultipleShardingContexts(), 1).toString(),
+ is("ShardingContext(jobName=test_job, taskId=fake_task_id, shardingTotalCount=2, jobParameter=, shardingItem=1, shardingParameter=B)"));
}
}
diff --git a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/config/JobCoreConfigurationTest.java b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/config/JobCoreConfigurationTest.java
index 32df8f1..a44ff4e 100755
--- a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/config/JobCoreConfigurationTest.java
+++ b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/config/JobCoreConfigurationTest.java
@@ -17,13 +17,16 @@
package org.apache.shardingsphere.elasticjob.cloud.config;
+import org.apache.shardingsphere.elasticjob.cloud.executor.handler.JobProperties;
import org.apache.shardingsphere.elasticjob.cloud.executor.handler.impl.DefaultJobExceptionHandler;
import org.apache.shardingsphere.elasticjob.cloud.fixture.handler.IgnoreJobExceptionHandler;
-import org.apache.shardingsphere.elasticjob.cloud.executor.handler.JobProperties;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
public final class JobCoreConfigurationTest {
@Test
@@ -32,12 +35,12 @@ public final class JobCoreConfigurationTest {
.shardingItemParameters("0=a,1=b,2=c").jobParameter("param").failover(true).misfire(false).description("desc")
.jobProperties("job_exception_handler", IgnoreJobExceptionHandler.class.getName()).build();
assertRequiredProperties(actual);
- Assert.assertThat(actual.getShardingItemParameters(), Is.is("0=a,1=b,2=c"));
- Assert.assertThat(actual.getJobParameter(), Is.is("param"));
- Assert.assertTrue(actual.isFailover());
- Assert.assertFalse(actual.isMisfire());
- Assert.assertThat(actual.getDescription(), Is.is("desc"));
- Assert.assertThat(actual.getJobProperties().get(JobProperties.JobPropertiesEnum.JOB_EXCEPTION_HANDLER), Is.is(IgnoreJobExceptionHandler.class.getName()));
+ assertThat(actual.getShardingItemParameters(), is("0=a,1=b,2=c"));
+ assertThat(actual.getJobParameter(), is("param"));
+ assertTrue(actual.isFailover());
+ assertFalse(actual.isMisfire());
+ assertThat(actual.getDescription(), is("desc"));
+ assertThat(actual.getJobProperties().get(JobProperties.JobPropertiesEnum.JOB_EXCEPTION_HANDLER), is(IgnoreJobExceptionHandler.class.getName()));
}
@Test
@@ -56,18 +59,18 @@ public final class JobCoreConfigurationTest {
}
private void assertRequiredProperties(final JobCoreConfiguration actual) {
- Assert.assertThat(actual.getJobName(), Is.is("test_job"));
- Assert.assertThat(actual.getCron(), Is.is("0/1 * * * * ?"));
- Assert.assertThat(actual.getShardingTotalCount(), Is.is(3));
+ assertThat(actual.getJobName(), is("test_job"));
+ assertThat(actual.getCron(), is("0/1 * * * * ?"));
+ assertThat(actual.getShardingTotalCount(), is(3));
}
private void assertDefaultValues(final JobCoreConfiguration actual) {
- Assert.assertThat(actual.getShardingItemParameters(), Is.is(""));
- Assert.assertThat(actual.getJobParameter(), Is.is(""));
- Assert.assertFalse(actual.isFailover());
- Assert.assertTrue(actual.isMisfire());
- Assert.assertThat(actual.getDescription(), Is.is(""));
- Assert.assertThat(actual.getJobProperties().get(JobProperties.JobPropertiesEnum.JOB_EXCEPTION_HANDLER), Is.is(DefaultJobExceptionHandler.class.getName()));
+ assertThat(actual.getShardingItemParameters(), is(""));
+ assertThat(actual.getJobParameter(), is(""));
+ assertFalse(actual.isFailover());
+ assertTrue(actual.isMisfire());
+ assertThat(actual.getDescription(), is(""));
+ assertThat(actual.getJobProperties().get(JobProperties.JobPropertiesEnum.JOB_EXCEPTION_HANDLER), is(DefaultJobExceptionHandler.class.getName()));
}
@Test(expected = IllegalArgumentException.class)
diff --git a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/context/TaskContextTest.java b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/context/TaskContextTest.java
index 84ab679..a82ea8b 100755
--- a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/context/TaskContextTest.java
+++ b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/context/TaskContextTest.java
@@ -19,103 +19,106 @@ package org.apache.shardingsphere.elasticjob.cloud.context;
import com.google.common.collect.Lists;
import org.apache.shardingsphere.elasticjob.cloud.fixture.context.TaskNode;
-import org.hamcrest.core.Is;
import org.hamcrest.core.StringStartsWith;
-import org.junit.Assert;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
public final class TaskContextTest {
@Test
public void assertNew() {
TaskContext actual = new TaskContext("test_job", Lists.newArrayList(0), ExecutionType.READY, "slave-S0");
- Assert.assertThat(actual.getMetaInfo().getJobName(), Is.is("test_job"));
- Assert.assertThat(actual.getMetaInfo().getShardingItems().get(0), Is.is(0));
- Assert.assertThat(actual.getType(), Is.is(ExecutionType.READY));
- Assert.assertThat(actual.getSlaveId(), Is.is("slave-S0"));
- Assert.assertThat(actual.getId(), StringStartsWith.startsWith(TaskNode.builder().build().getTaskNodeValue().substring(0, TaskNode.builder().build().getTaskNodeValue().length() - 1)));
+ assertThat(actual.getMetaInfo().getJobName(), is("test_job"));
+ assertThat(actual.getMetaInfo().getShardingItems().get(0), is(0));
+ assertThat(actual.getType(), is(ExecutionType.READY));
+ assertThat(actual.getSlaveId(), is("slave-S0"));
+ assertThat(actual.getId(), StringStartsWith.startsWith(TaskNode.builder().build().getTaskNodeValue().substring(0, TaskNode.builder().build().getTaskNodeValue().length() - 1)));
}
@Test
public void assertNewWithoutSlaveId() {
TaskContext actual = new TaskContext("test_job", Lists.newArrayList(0), ExecutionType.READY);
- Assert.assertThat(actual.getSlaveId(), Is.is("unassigned-slave"));
+ assertThat(actual.getSlaveId(), is("unassigned-slave"));
}
@Test
public void assertGetMetaInfo() {
TaskContext actual = new TaskContext("test_job", Lists.newArrayList(0), ExecutionType.READY, "slave-S0");
- Assert.assertThat(actual.getMetaInfo().toString(), Is.is("test_job@-@0"));
+ assertThat(actual.getMetaInfo().toString(), is("test_job@-@0"));
}
@Test
public void assertTaskContextFrom() {
TaskContext actual = TaskContext.from(TaskNode.builder().build().getTaskNodeValue());
- Assert.assertThat(actual.getId(), Is.is(TaskNode.builder().build().getTaskNodeValue()));
- Assert.assertThat(actual.getMetaInfo().getJobName(), Is.is("test_job"));
- Assert.assertThat(actual.getMetaInfo().getShardingItems().get(0), Is.is(0));
- Assert.assertThat(actual.getType(), Is.is(ExecutionType.READY));
- Assert.assertThat(actual.getSlaveId(), Is.is("slave-S0"));
+ assertThat(actual.getId(), is(TaskNode.builder().build().getTaskNodeValue()));
+ assertThat(actual.getMetaInfo().getJobName(), is("test_job"));
+ assertThat(actual.getMetaInfo().getShardingItems().get(0), is(0));
+ assertThat(actual.getType(), is(ExecutionType.READY));
+ assertThat(actual.getSlaveId(), is("slave-S0"));
}
@Test
public void assertMetaInfoFromWithMetaInfo() {
TaskContext.MetaInfo actual = TaskContext.MetaInfo.from("test_job@-@1");
- Assert.assertThat(actual.getJobName(), Is.is("test_job"));
- Assert.assertThat(actual.getShardingItems().get(0), Is.is(1));
+ assertThat(actual.getJobName(), is("test_job"));
+ assertThat(actual.getShardingItems().get(0), is(1));
}
@Test
public void assertMetaInfoFromWithTaskId() {
TaskContext.MetaInfo actual = TaskContext.MetaInfo.from("test_job@-@1@-@READY@-@unassigned-slave@-@0");
- Assert.assertThat(actual.getJobName(), Is.is("test_job"));
- Assert.assertThat(actual.getShardingItems().get(0), Is.is(1));
+ assertThat(actual.getJobName(), is("test_job"));
+ assertThat(actual.getShardingItems().get(0), is(1));
}
@Test
public void assertMetaInfoFromWithMetaInfoWithoutShardingItems() {
TaskContext.MetaInfo actual = TaskContext.MetaInfo.from("test_job@-@");
- Assert.assertThat(actual.getJobName(), Is.is("test_job"));
- Assert.assertTrue(actual.getShardingItems().isEmpty());
+ assertThat(actual.getJobName(), is("test_job"));
+ assertTrue(actual.getShardingItems().isEmpty());
}
@Test
public void assertMetaInfoFromWithTaskIdWithoutShardingItems() {
TaskContext.MetaInfo actual = TaskContext.MetaInfo.from("test_job@-@@-@READY@-@unassigned-slave@-@0");
- Assert.assertThat(actual.getJobName(), Is.is("test_job"));
- Assert.assertTrue(actual.getShardingItems().isEmpty());
+ assertThat(actual.getJobName(), is("test_job"));
+ assertTrue(actual.getShardingItems().isEmpty());
}
@Test
public void assertGetIdForUnassignedSlave() {
- Assert.assertThat(TaskContext.getIdForUnassignedSlave("test_job@-@0@-@READY@-@slave-S0@-@0"), Is.is("test_job@-@0@-@READY@-@unassigned-slave@-@0"));
+ assertThat(TaskContext.getIdForUnassignedSlave("test_job@-@0@-@READY@-@slave-S0@-@0"), is("test_job@-@0@-@READY@-@unassigned-slave@-@0"));
}
@Test
public void assertGetTaskName() {
TaskContext actual = TaskContext.from(TaskNode.builder().build().getTaskNodeValue());
- Assert.assertThat(actual.getTaskName(), Is.is("test_job@-@0@-@READY@-@slave-S0"));
+ assertThat(actual.getTaskName(), is("test_job@-@0@-@READY@-@slave-S0"));
}
@Test
public void assertGetExecutorId() {
TaskContext actual = TaskContext.from(TaskNode.builder().build().getTaskNodeValue());
- Assert.assertThat(actual.getExecutorId("app"), Is.is("app@-@slave-S0"));
+ assertThat(actual.getExecutorId("app"), is("app@-@slave-S0"));
}
@Test
public void assertSetSlaveId() {
TaskContext actual = new TaskContext("test_job", Lists.newArrayList(0), ExecutionType.READY, "slave-S0");
- Assert.assertThat(actual.getSlaveId(), Is.is("slave-S0"));
+ assertThat(actual.getSlaveId(), is("slave-S0"));
actual.setSlaveId("slave-S1");
- Assert.assertThat(actual.getSlaveId(), Is.is("slave-S1"));
+ assertThat(actual.getSlaveId(), is("slave-S1"));
}
@Test
public void assertSetIdle() {
TaskContext actual = new TaskContext("test_job", Lists.newArrayList(0), ExecutionType.READY, "slave-S0");
- Assert.assertFalse(actual.isIdle());
+ assertFalse(actual.isIdle());
actual.setIdle(true);
- Assert.assertTrue(actual.isIdle());
+ assertTrue(actual.isIdle());
}
}
diff --git a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/exception/ExceptionUtilTest.java b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/exception/ExceptionUtilTest.java
index c3330d2..c3419c1 100755
--- a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/exception/ExceptionUtilTest.java
+++ b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/exception/ExceptionUtilTest.java
@@ -17,24 +17,26 @@
package org.apache.shardingsphere.elasticjob.cloud.exception;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
public final class ExceptionUtilTest {
@Test
public void assertTransformWithError() {
- Assert.assertTrue(ExceptionUtil.transform(new Error("Error")).startsWith("java.lang.Error"));
+ assertTrue(ExceptionUtil.transform(new Error("Error")).startsWith("java.lang.Error"));
}
@Test
public void assertTransformWithException() {
- Assert.assertTrue(ExceptionUtil.transform(new Exception("Exception")).startsWith("java.lang.Exception"));
+ assertTrue(ExceptionUtil.transform(new Exception("Exception")).startsWith("java.lang.Exception"));
}
@Test
public void assertTransformWithNull() {
- Assert.assertThat(ExceptionUtil.transform(null), Is.is(""));
+ assertThat(ExceptionUtil.transform(null), is(""));
}
}
diff --git a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/exception/JobConfigurationExceptionTest.java b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/exception/JobConfigurationExceptionTest.java
index 7b7f550..02cdd9c 100755
--- a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/exception/JobConfigurationExceptionTest.java
+++ b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/exception/JobConfigurationExceptionTest.java
@@ -18,19 +18,20 @@
package org.apache.shardingsphere.elasticjob.cloud.exception;
import org.hamcrest.CoreMatchers;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public final class JobConfigurationExceptionTest {
@Test
public void assertGetMessage() {
- Assert.assertThat(new JobConfigurationException("message is: '%s'", "test").getMessage(), Is.is("message is: 'test'"));
+ assertThat(new JobConfigurationException("message is: '%s'", "test").getMessage(), is("message is: 'test'"));
}
@Test
public void assertGetCause() {
- Assert.assertThat(new JobConfigurationException(new RuntimeException()).getCause(), CoreMatchers.instanceOf(RuntimeException.class));
+ assertThat(new JobConfigurationException(new RuntimeException()).getCause(), CoreMatchers.instanceOf(RuntimeException.class));
}
}
diff --git a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/exception/JobExecutionEnvironmentExceptionTest.java b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/exception/JobExecutionEnvironmentExceptionTest.java
index 3fa9639..8a1468e 100755
--- a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/exception/JobExecutionEnvironmentExceptionTest.java
+++ b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/exception/JobExecutionEnvironmentExceptionTest.java
@@ -17,14 +17,15 @@
package org.apache.shardingsphere.elasticjob.cloud.exception;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public final class JobExecutionEnvironmentExceptionTest {
@Test
public void assertGetMessage() {
- Assert.assertThat(new JobExecutionEnvironmentException("message is: '%s'", "test").getMessage(), Is.is("message is: 'test'"));
+ assertThat(new JobExecutionEnvironmentException("message is: '%s'", "test").getMessage(), is("message is: 'test'"));
}
}
diff --git a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/exception/JobSystemExceptionTest.java b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/exception/JobSystemExceptionTest.java
index de13673..8196be8 100755
--- a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/exception/JobSystemExceptionTest.java
+++ b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/exception/JobSystemExceptionTest.java
@@ -18,19 +18,20 @@
package org.apache.shardingsphere.elasticjob.cloud.exception;
import org.hamcrest.CoreMatchers;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public final class JobSystemExceptionTest {
@Test
public void assertGetMessage() {
- Assert.assertThat(new JobSystemException("message is: '%s'", "test").getMessage(), Is.is("message is: 'test'"));
+ assertThat(new JobSystemException("message is: '%s'", "test").getMessage(), is("message is: 'test'"));
}
@Test
public void assertGetCause() {
- Assert.assertThat(new JobSystemException(new RuntimeException()).getCause(), CoreMatchers.instanceOf(RuntimeException.class));
+ assertThat(new JobSystemException(new RuntimeException()).getCause(), CoreMatchers.instanceOf(RuntimeException.class));
}
}
diff --git a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/JobExecutorFactoryTest.java b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/JobExecutorFactoryTest.java
index 77eb9dc..f4abde6 100755
--- a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/JobExecutorFactoryTest.java
+++ b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/JobExecutorFactoryTest.java
@@ -19,23 +19,25 @@ package org.apache.shardingsphere.elasticjob.cloud.executor;
import org.apache.shardingsphere.elasticjob.cloud.exception.JobConfigurationException;
import org.apache.shardingsphere.elasticjob.cloud.executor.type.DataflowJobExecutor;
+import org.apache.shardingsphere.elasticjob.cloud.executor.type.ScriptJobExecutor;
+import org.apache.shardingsphere.elasticjob.cloud.executor.type.SimpleJobExecutor;
import org.apache.shardingsphere.elasticjob.cloud.fixture.config.TestDataflowJobConfiguration;
import org.apache.shardingsphere.elasticjob.cloud.fixture.config.TestScriptJobConfiguration;
import org.apache.shardingsphere.elasticjob.cloud.fixture.config.TestSimpleJobConfiguration;
-import org.apache.shardingsphere.elasticjob.cloud.fixture.job.TestDataflowJob;
-import org.apache.shardingsphere.elasticjob.cloud.executor.type.ScriptJobExecutor;
-import org.apache.shardingsphere.elasticjob.cloud.executor.type.SimpleJobExecutor;
import org.apache.shardingsphere.elasticjob.cloud.fixture.handler.IgnoreJobExceptionHandler;
import org.apache.shardingsphere.elasticjob.cloud.fixture.job.OtherJob;
+import org.apache.shardingsphere.elasticjob.cloud.fixture.job.TestDataflowJob;
import org.apache.shardingsphere.elasticjob.cloud.fixture.job.TestSimpleJob;
import org.hamcrest.CoreMatchers;
-import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.when;
+
@RunWith(MockitoJUnitRunner.class)
public final class JobExecutorFactoryTest {
@@ -44,20 +46,20 @@ public final class JobExecutorFactoryTest {
@Test
public void assertGetJobExecutorForScriptJob() {
- Mockito.when(jobFacade.loadJobRootConfiguration(true)).thenReturn(new TestScriptJobConfiguration("test.sh", IgnoreJobExceptionHandler.class));
- Assert.assertThat(JobExecutorFactory.getJobExecutor(null, jobFacade), CoreMatchers.instanceOf(ScriptJobExecutor.class));
+ when(jobFacade.loadJobRootConfiguration(true)).thenReturn(new TestScriptJobConfiguration("test.sh", IgnoreJobExceptionHandler.class));
+ assertThat(JobExecutorFactory.getJobExecutor(null, jobFacade), CoreMatchers.instanceOf(ScriptJobExecutor.class));
}
@Test
public void assertGetJobExecutorForSimpleJob() {
- Mockito.when(jobFacade.loadJobRootConfiguration(true)).thenReturn(new TestSimpleJobConfiguration());
- Assert.assertThat(JobExecutorFactory.getJobExecutor(new TestSimpleJob(null), jobFacade), CoreMatchers.instanceOf(SimpleJobExecutor.class));
+ when(jobFacade.loadJobRootConfiguration(true)).thenReturn(new TestSimpleJobConfiguration());
+ assertThat(JobExecutorFactory.getJobExecutor(new TestSimpleJob(null), jobFacade), CoreMatchers.instanceOf(SimpleJobExecutor.class));
}
@Test
public void assertGetJobExecutorForDataflowJob() {
- Mockito.when(jobFacade.loadJobRootConfiguration(true)).thenReturn(new TestDataflowJobConfiguration(false));
- Assert.assertThat(JobExecutorFactory.getJobExecutor(new TestDataflowJob(null), jobFacade), CoreMatchers.instanceOf(DataflowJobExecutor.class));
+ when(jobFacade.loadJobRootConfiguration(true)).thenReturn(new TestDataflowJobConfiguration(false));
+ assertThat(JobExecutorFactory.getJobExecutor(new TestDataflowJob(null), jobFacade), CoreMatchers.instanceOf(DataflowJobExecutor.class));
}
@Test(expected = JobConfigurationException.class)
@@ -67,9 +69,9 @@ public final class JobExecutorFactoryTest {
@Test
public void assertGetJobExecutorTwice() {
- Mockito.when(jobFacade.loadJobRootConfiguration(true)).thenReturn(new TestDataflowJobConfiguration(false));
+ when(jobFacade.loadJobRootConfiguration(true)).thenReturn(new TestDataflowJobConfiguration(false));
AbstractElasticJobExecutor executor = JobExecutorFactory.getJobExecutor(new TestSimpleJob(null), jobFacade);
AbstractElasticJobExecutor anotherExecutor = JobExecutorFactory.getJobExecutor(new TestSimpleJob(null), jobFacade);
- Assert.assertTrue(executor.hashCode() != anotherExecutor.hashCode());
+ assertTrue(executor.hashCode() != anotherExecutor.hashCode());
}
}
diff --git a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/handler/ExecutorServiceHandlerRegistryTest.java b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/handler/ExecutorServiceHandlerRegistryTest.java
index 5c154ca..43b50b4 100755
--- a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/handler/ExecutorServiceHandlerRegistryTest.java
+++ b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/handler/ExecutorServiceHandlerRegistryTest.java
@@ -17,12 +17,10 @@
package org.apache.shardingsphere.elasticjob.cloud.executor.handler;
-import org.apache.shardingsphere.elasticjob.cloud.executor.handler.impl.DefaultExecutorServiceHandler;
import lombok.RequiredArgsConstructor;
-import org.hamcrest.core.Is;
+import org.apache.shardingsphere.elasticjob.cloud.executor.handler.impl.DefaultExecutorServiceHandler;
import org.hamcrest.core.IsNot;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Test;
import java.util.Set;
@@ -33,6 +31,9 @@ import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public final class ExecutorServiceHandlerRegistryTest {
@After
@@ -44,13 +45,13 @@ public final class ExecutorServiceHandlerRegistryTest {
public void assertRemove() {
ExecutorService actual = ExecutorServiceHandlerRegistry.getExecutorServiceHandler("test_job", new DefaultExecutorServiceHandler());
ExecutorServiceHandlerRegistry.remove("test_job");
- Assert.assertThat(actual, IsNot.not(ExecutorServiceHandlerRegistry.getExecutorServiceHandler("test_job", new DefaultExecutorServiceHandler())));
+ assertThat(actual, IsNot.not(ExecutorServiceHandlerRegistry.getExecutorServiceHandler("test_job", new DefaultExecutorServiceHandler())));
}
@Test
public void assertGetExecutorServiceHandlerForSameThread() {
- Assert.assertThat(ExecutorServiceHandlerRegistry.getExecutorServiceHandler("test_job", new DefaultExecutorServiceHandler()),
- Is.is(ExecutorServiceHandlerRegistry.getExecutorServiceHandler("test_job", new DefaultExecutorServiceHandler())));
+ assertThat(ExecutorServiceHandlerRegistry.getExecutorServiceHandler("test_job", new DefaultExecutorServiceHandler()),
+ is(ExecutorServiceHandlerRegistry.getExecutorServiceHandler("test_job", new DefaultExecutorServiceHandler())));
}
@Test
@@ -64,8 +65,8 @@ public final class ExecutorServiceHandlerRegistryTest {
executorService.submit(new GetExecutorServiceHandlerTask(barrier, latch, set));
}
latch.await();
- Assert.assertThat(set.size(), Is.is(1));
- Assert.assertThat(ExecutorServiceHandlerRegistry.getExecutorServiceHandler("test_job", new DefaultExecutorServiceHandler()), Is.is(set.iterator().next()));
+ assertThat(set.size(), is(1));
+ assertThat(ExecutorServiceHandlerRegistry.getExecutorServiceHandler("test_job", new DefaultExecutorServiceHandler()), is(set.iterator().next()));
}
@RequiredArgsConstructor
diff --git a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/handler/JobPropertiesTest.java b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/handler/JobPropertiesTest.java
index 836e498..91c5906 100755
--- a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/handler/JobPropertiesTest.java
+++ b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/handler/JobPropertiesTest.java
@@ -21,34 +21,37 @@ import org.apache.shardingsphere.elasticjob.cloud.executor.handler.impl.DefaultE
import org.apache.shardingsphere.elasticjob.cloud.executor.handler.impl.DefaultJobExceptionHandler;
import org.apache.shardingsphere.elasticjob.cloud.fixture.APIJsonConstants;
import org.apache.shardingsphere.elasticjob.cloud.fixture.handler.IgnoreJobExceptionHandler;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Test;
import org.unitils.util.ReflectionUtils;
import java.util.Map;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
public final class JobPropertiesTest {
@Test
public void assertPutInvalidKey() throws NoSuchFieldException {
JobProperties actual = new JobProperties();
actual.put("invalid_key", "");
- Assert.assertTrue(getMap(actual).isEmpty());
+ assertTrue(getMap(actual).isEmpty());
}
@Test
public void assertPutNullValue() throws NoSuchFieldException {
JobProperties actual = new JobProperties();
actual.put(JobProperties.JobPropertiesEnum.JOB_EXCEPTION_HANDLER.getKey(), null);
- Assert.assertTrue(getMap(actual).isEmpty());
+ assertTrue(getMap(actual).isEmpty());
}
@Test
public void assertPutSuccess() throws NoSuchFieldException {
JobProperties actual = new JobProperties();
actual.put(JobProperties.JobPropertiesEnum.JOB_EXCEPTION_HANDLER.getKey(), DefaultJobExceptionHandler.class.getCanonicalName());
- Assert.assertThat(getMap(actual).size(), Is.is(1));
+ assertThat(getMap(actual).size(), is(1));
}
private Map getMap(final JobProperties jobProperties) throws NoSuchFieldException {
@@ -56,31 +59,31 @@ public final class JobPropertiesTest {
}
@Test
- public void assertGetWhenValueIsEmpty() throws NoSuchFieldException {
+ public void assertGetWhenValueIsEmpty() {
JobProperties actual = new JobProperties();
- Assert.assertThat(actual.get(JobProperties.JobPropertiesEnum.JOB_EXCEPTION_HANDLER), Is.is(DefaultJobExceptionHandler.class.getCanonicalName()));
- Assert.assertThat(actual.get(JobProperties.JobPropertiesEnum.EXECUTOR_SERVICE_HANDLER), Is.is(DefaultExecutorServiceHandler.class.getCanonicalName()));
+ assertThat(actual.get(JobProperties.JobPropertiesEnum.JOB_EXCEPTION_HANDLER), is(DefaultJobExceptionHandler.class.getCanonicalName()));
+ assertThat(actual.get(JobProperties.JobPropertiesEnum.EXECUTOR_SERVICE_HANDLER), is(DefaultExecutorServiceHandler.class.getCanonicalName()));
}
@Test
- public void assertGetWhenValueIsNotEmpty() throws NoSuchFieldException {
+ public void assertGetWhenValueIsNotEmpty() {
JobProperties actual = new JobProperties();
actual.put(JobProperties.JobPropertiesEnum.JOB_EXCEPTION_HANDLER.getKey(), IgnoreJobExceptionHandler.class.getCanonicalName());
- Assert.assertThat(actual.get(JobProperties.JobPropertiesEnum.JOB_EXCEPTION_HANDLER), Is.is(IgnoreJobExceptionHandler.class.getCanonicalName()));
+ assertThat(actual.get(JobProperties.JobPropertiesEnum.JOB_EXCEPTION_HANDLER), is(IgnoreJobExceptionHandler.class.getCanonicalName()));
}
@Test
public void assertJson() {
- Assert.assertThat(new JobProperties().json(), Is.is(APIJsonConstants.getJobPropertiesJson(DefaultJobExceptionHandler.class.getCanonicalName())));
+ assertThat(new JobProperties().json(), is(APIJsonConstants.getJobPropertiesJson(DefaultJobExceptionHandler.class.getCanonicalName())));
}
@Test
public void assertJobPropertiesEnumFromValidValue() {
- Assert.assertThat(JobProperties.JobPropertiesEnum.from(JobProperties.JobPropertiesEnum.JOB_EXCEPTION_HANDLER.getKey()), Is.is(JobProperties.JobPropertiesEnum.JOB_EXCEPTION_HANDLER));
+ assertThat(JobProperties.JobPropertiesEnum.from(JobProperties.JobPropertiesEnum.JOB_EXCEPTION_HANDLER.getKey()), is(JobProperties.JobPropertiesEnum.JOB_EXCEPTION_HANDLER));
}
@Test
public void assertJobPropertiesEnumFromInvalidValue() {
- Assert.assertNull(JobProperties.JobPropertiesEnum.from("invalid"));
+ assertNull(JobProperties.JobPropertiesEnum.from("invalid"));
}
}
diff --git a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/reg/zookeeper/ZookeeperConfigurationTest.java b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/reg/zookeeper/ZookeeperConfigurationTest.java
index f7c1fc0..f656855 100755
--- a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/reg/zookeeper/ZookeeperConfigurationTest.java
+++ b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/reg/zookeeper/ZookeeperConfigurationTest.java
@@ -17,19 +17,20 @@
package org.apache.shardingsphere.elasticjob.cloud.reg.zookeeper;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public final class ZookeeperConfigurationTest {
@Test
public void assertNewZookeeperConfigurationForServerListsAndNamespace() {
ZookeeperConfiguration zkConfig = new ZookeeperConfiguration("localhost:2181", "myNamespace");
- Assert.assertThat(zkConfig.getServerLists(), Is.is("localhost:2181"));
- Assert.assertThat(zkConfig.getNamespace(), Is.is("myNamespace"));
- Assert.assertThat(zkConfig.getBaseSleepTimeMilliseconds(), Is.is(1000));
- Assert.assertThat(zkConfig.getMaxSleepTimeMilliseconds(), Is.is(3000));
- Assert.assertThat(zkConfig.getMaxRetries(), Is.is(3));
+ assertThat(zkConfig.getServerLists(), is("localhost:2181"));
+ assertThat(zkConfig.getNamespace(), is("myNamespace"));
+ assertThat(zkConfig.getBaseSleepTimeMilliseconds(), is(1000));
+ assertThat(zkConfig.getMaxSleepTimeMilliseconds(), is(3000));
+ assertThat(zkConfig.getMaxRetries(), is(3));
}
}
diff --git a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/reg/zookeeper/ZookeeperRegistryCenterQueryWithoutCacheTest.java b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/reg/zookeeper/ZookeeperRegistryCenterQueryWithoutCacheTest.java
index 8ccaddb..6966013 100755
--- a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/reg/zookeeper/ZookeeperRegistryCenterQueryWithoutCacheTest.java
+++ b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/reg/zookeeper/ZookeeperRegistryCenterQueryWithoutCacheTest.java
@@ -19,14 +19,19 @@ package org.apache.shardingsphere.elasticjob.cloud.reg.zookeeper;
import org.apache.shardingsphere.elasticjob.cloud.fixture.EmbedTestingServer;
import org.apache.shardingsphere.elasticjob.cloud.reg.zookeeper.util.ZookeeperRegistryCenterTestUtil;
-import org.hamcrest.core.Is;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.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.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
public final class ZookeeperRegistryCenterQueryWithoutCacheTest {
private static final ZookeeperConfiguration ZOOKEEPER_CONFIGURATION =
@@ -51,44 +56,44 @@ public final class ZookeeperRegistryCenterQueryWithoutCacheTest {
@Test
public void assertGetFromServer() {
- Assert.assertThat(zkRegCenter.get("/test"), Is.is("test"));
- Assert.assertThat(zkRegCenter.get("/test/deep/nested"), Is.is("deepNested"));
+ assertThat(zkRegCenter.get("/test"), is("test"));
+ assertThat(zkRegCenter.get("/test/deep/nested"), is("deepNested"));
}
@Test
public void assertGetChildrenKeys() {
- Assert.assertThat(zkRegCenter.getChildrenKeys("/test"), Is.is(Arrays.asList("deep", "child")));
- Assert.assertThat(zkRegCenter.getChildrenKeys("/test/deep"), Is.is(Collections.singletonList("nested")));
- Assert.assertThat(zkRegCenter.getChildrenKeys("/test/child"), Is.is(Collections.<String>emptyList()));
- Assert.assertThat(zkRegCenter.getChildrenKeys("/test/notExisted"), Is.is(Collections.<String>emptyList()));
+ assertThat(zkRegCenter.getChildrenKeys("/test"), is(Arrays.asList("deep", "child")));
+ assertThat(zkRegCenter.getChildrenKeys("/test/deep"), is(Collections.singletonList("nested")));
+ assertThat(zkRegCenter.getChildrenKeys("/test/child"), is(Collections.<String>emptyList()));
+ assertThat(zkRegCenter.getChildrenKeys("/test/notExisted"), is(Collections.<String>emptyList()));
}
@Test
public void assertGetNumChildren() {
- Assert.assertThat(zkRegCenter.getNumChildren("/test"), Is.is(2));
- Assert.assertThat(zkRegCenter.getNumChildren("/test/deep"), Is.is(1));
- Assert.assertThat(zkRegCenter.getNumChildren("/test/child"), Is.is(0));
- Assert.assertThat(zkRegCenter.getNumChildren("/test/notExisted"), Is.is(0));
+ assertThat(zkRegCenter.getNumChildren("/test"), is(2));
+ assertThat(zkRegCenter.getNumChildren("/test/deep"), is(1));
+ assertThat(zkRegCenter.getNumChildren("/test/child"), is(0));
+ assertThat(zkRegCenter.getNumChildren("/test/notExisted"), is(0));
}
@Test
public void assertIsExisted() {
- Assert.assertTrue(zkRegCenter.isExisted("/test"));
- Assert.assertTrue(zkRegCenter.isExisted("/test/deep/nested"));
- Assert.assertFalse(zkRegCenter.isExisted("/notExisted"));
+ assertTrue(zkRegCenter.isExisted("/test"));
+ assertTrue(zkRegCenter.isExisted("/test/deep/nested"));
+ assertFalse(zkRegCenter.isExisted("/notExisted"));
}
@Test
public void assertGetRegistryCenterTime() {
long regCenterTime = zkRegCenter.getRegistryCenterTime("/_systemTime/current");
- Assert.assertTrue(regCenterTime <= System.currentTimeMillis());
+ assertTrue(regCenterTime <= System.currentTimeMillis());
long updatedRegCenterTime = zkRegCenter.getRegistryCenterTime("/_systemTime/current");
System.out.println(regCenterTime + "," + updatedRegCenterTime);
- Assert.assertTrue(regCenterTime < updatedRegCenterTime);
+ assertTrue(regCenterTime < updatedRegCenterTime);
}
@Test
public void assertGetWithoutNode() {
- Assert.assertNull(zkRegCenter.get("/notExisted"));
+ assertNull(zkRegCenter.get("/notExisted"));
}
}
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 dfd2b78..717eaf0 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,7 +23,6 @@ import org.apache.shardingsphere.elasticjob.cloud.statistics.type.job.JobRegiste
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.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -32,6 +31,7 @@ import java.util.Date;
import java.util.Optional;
import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
@@ -114,7 +114,7 @@ public class StatisticRdbRepositoryTest {
@Test
public void assertFindLatestTaskResultStatisticsWhenTableIsEmpty() {
for (StatisticInterval each : StatisticInterval.values()) {
- Assert.assertFalse(repository.findLatestTaskResultStatistics(each).isPresent());
+ assertFalse(repository.findLatestTaskResultStatistics(each).isPresent());
}
}
@@ -147,7 +147,7 @@ public class StatisticRdbRepositoryTest {
@Test
public void assertFindLatestTaskRunningStatisticsWhenTableIsEmpty() {
- Assert.assertFalse(repository.findLatestTaskRunningStatistics().isPresent());
+ assertFalse(repository.findLatestTaskRunningStatistics().isPresent());
}
@Test
@@ -176,7 +176,7 @@ public class StatisticRdbRepositoryTest {
@Test
public void assertFindLatestJobRunningStatisticsWhenTableIsEmpty() {
- Assert.assertFalse(repository.findLatestJobRunningStatistics().isPresent());
+ assertFalse(repository.findLatestJobRunningStatistics().isPresent());
}
@Test
@@ -205,7 +205,7 @@ public class StatisticRdbRepositoryTest {
@Test
public void assertFindLatestJobRegisterStatisticsWhenTableIsEmpty() {
- Assert.assertFalse(repository.findLatestJobRegisterStatistics().isPresent());
+ assertFalse(repository.findLatestJobRegisterStatistics().isPresent());
}
@Test
diff --git a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/util/concurrent/ExecutorServiceObjectTest.java b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/util/concurrent/ExecutorServiceObjectTest.java
index 3d9c318..c73147e 100755
--- a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/util/concurrent/ExecutorServiceObjectTest.java
+++ b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/util/concurrent/ExecutorServiceObjectTest.java
@@ -17,11 +17,15 @@
package org.apache.shardingsphere.elasticjob.cloud.util.concurrent;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Test;
+
import java.util.concurrent.ExecutorService;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
public final class ExecutorServiceObjectTest {
private ExecutorServiceObject executorServiceObject;
@@ -29,23 +33,23 @@ public final class ExecutorServiceObjectTest {
@Test
public void assertCreateExecutorService() {
executorServiceObject = new ExecutorServiceObject("executor-service-test", 1);
- Assert.assertThat(executorServiceObject.getActiveThreadCount(), Is.is(0));
- Assert.assertThat(executorServiceObject.getWorkQueueSize(), Is.is(0));
- Assert.assertFalse(executorServiceObject.isShutdown());
+ assertThat(executorServiceObject.getActiveThreadCount(), is(0));
+ assertThat(executorServiceObject.getWorkQueueSize(), is(0));
+ assertFalse(executorServiceObject.isShutdown());
ExecutorService executorService = executorServiceObject.createExecutorService();
executorService.submit(new FooTask());
BlockUtils.waitingShortTime();
- Assert.assertThat(executorServiceObject.getActiveThreadCount(), Is.is(1));
- Assert.assertThat(executorServiceObject.getWorkQueueSize(), Is.is(0));
- Assert.assertFalse(executorServiceObject.isShutdown());
+ assertThat(executorServiceObject.getActiveThreadCount(), is(1));
+ assertThat(executorServiceObject.getWorkQueueSize(), is(0));
+ assertFalse(executorServiceObject.isShutdown());
executorService.submit(new FooTask());
BlockUtils.waitingShortTime();
- Assert.assertThat(executorServiceObject.getActiveThreadCount(), Is.is(1));
- Assert.assertThat(executorServiceObject.getWorkQueueSize(), Is.is(1));
- Assert.assertFalse(executorServiceObject.isShutdown());
+ assertThat(executorServiceObject.getActiveThreadCount(), is(1));
+ assertThat(executorServiceObject.getWorkQueueSize(), is(1));
+ assertFalse(executorServiceObject.isShutdown());
executorService.shutdownNow();
- Assert.assertThat(executorServiceObject.getWorkQueueSize(), Is.is(0));
- Assert.assertTrue(executorServiceObject.isShutdown());
+ assertThat(executorServiceObject.getWorkQueueSize(), is(0));
+ assertTrue(executorServiceObject.isShutdown());
}
class FooTask implements Runnable {
diff --git a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/util/digest/EncryptionTest.java b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/util/digest/EncryptionTest.java
index 50e42ba..d673398 100755
--- a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/util/digest/EncryptionTest.java
+++ b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/util/digest/EncryptionTest.java
@@ -17,14 +17,15 @@
package org.apache.shardingsphere.elasticjob.cloud.util.digest;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public final class EncryptionTest {
@Test
public void assertMd5() {
- Assert.assertThat(Encryption.md5("test"), Is.is("98f6bcd4621d373cade4e832627b4f6"));
+ assertThat(Encryption.md5("test"), is("98f6bcd4621d373cade4e832627b4f6"));
}
}
diff --git a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/util/env/TimeServiceTest.java b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/util/env/TimeServiceTest.java
index 111ff10..1603ea1 100755
--- a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/util/env/TimeServiceTest.java
+++ b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/util/env/TimeServiceTest.java
@@ -17,15 +17,16 @@
package org.apache.shardingsphere.elasticjob.cloud.util.env;
-import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+
public class TimeServiceTest {
private TimeService timeService = new TimeService();
@Test
- public void assertGetCurrentMillis() throws Exception {
- Assert.assertTrue(timeService.getCurrentMillis() <= System.currentTimeMillis());
+ public void assertGetCurrentMillis() {
+ assertTrue(timeService.getCurrentMillis() <= System.currentTimeMillis());
}
}
diff --git a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/util/json/JobConfigurationGsonTypeAdapterTest.java b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/util/json/JobConfigurationGsonTypeAdapterTest.java
index 9253362..620d70e 100755
--- a/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/util/json/JobConfigurationGsonTypeAdapterTest.java
+++ b/elasticjob-cloud/elasticjob-cloud-common/src/test/java/org/apache/shardingsphere/elasticjob/cloud/util/json/JobConfigurationGsonTypeAdapterTest.java
@@ -20,22 +20,22 @@ package org.apache.shardingsphere.elasticjob.cloud.util.json;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter;
import org.apache.shardingsphere.elasticjob.cloud.config.JobTypeConfiguration;
+import org.apache.shardingsphere.elasticjob.cloud.executor.handler.impl.DefaultExecutorServiceHandler;
import org.apache.shardingsphere.elasticjob.cloud.fixture.APIJsonConstants;
import org.apache.shardingsphere.elasticjob.cloud.fixture.config.TestDataflowJobConfiguration;
import org.apache.shardingsphere.elasticjob.cloud.fixture.config.TestJobRootConfiguration;
import org.apache.shardingsphere.elasticjob.cloud.fixture.config.TestScriptJobConfiguration;
import org.apache.shardingsphere.elasticjob.cloud.fixture.config.TestSimpleJobConfiguration;
-import org.apache.shardingsphere.elasticjob.cloud.executor.handler.impl.DefaultExecutorServiceHandler;
import org.apache.shardingsphere.elasticjob.cloud.fixture.handler.IgnoreJobExceptionHandler;
import org.apache.shardingsphere.elasticjob.cloud.fixture.handler.ThrowJobExceptionHandler;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
-import java.io.IOException;
import java.util.Map;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public final class JobConfigurationGsonTypeAdapterTest {
@BeforeClass
@@ -45,21 +45,21 @@ public final class JobConfigurationGsonTypeAdapterTest {
@Test
public void assertToSimpleJobJson() {
- Assert.assertThat(GsonFactory.getGson().toJson(new TestJobRootConfiguration(
+ assertThat(GsonFactory.getGson().toJson(new TestJobRootConfiguration(
new TestSimpleJobConfiguration(ThrowJobExceptionHandler.class.getCanonicalName(), DefaultExecutorServiceHandler.class.getCanonicalName()).getTypeConfig())),
- Is.is(APIJsonConstants.getSimpleJobJson(ThrowJobExceptionHandler.class.getCanonicalName())));
+ is(APIJsonConstants.getSimpleJobJson(ThrowJobExceptionHandler.class.getCanonicalName())));
}
@Test
public void assertToDataflowJobJson() {
- Assert.assertThat(GsonFactory.getGson().toJson(new TestJobRootConfiguration(new TestDataflowJobConfiguration(true).getTypeConfig())),
- Is.is(APIJsonConstants.getDataflowJobJson(IgnoreJobExceptionHandler.class.getCanonicalName())));
+ assertThat(GsonFactory.getGson().toJson(new TestJobRootConfiguration(new TestDataflowJobConfiguration(true).getTypeConfig())),
+ is(APIJsonConstants.getDataflowJobJson(IgnoreJobExceptionHandler.class.getCanonicalName())));
}
@Test
public void assertToScriptJobJson() {
- Assert.assertThat(GsonFactory.getGson().toJson(new TestJobRootConfiguration(new TestScriptJobConfiguration("test.sh", ThrowJobExceptionHandler.class).getTypeConfig())),
- Is.is(APIJsonConstants.getScriptJobJson(ThrowJobExceptionHandler.class.getCanonicalName())));
+ assertThat(GsonFactory.getGson().toJson(new TestJobRootConfiguration(new TestScriptJobConfiguration("test.sh", ThrowJobExceptionHandler.class).getTypeConfig())),
+ is(APIJsonConstants.getScriptJobJson(ThrowJobExceptionHandler.class.getCanonicalName())));
}
@Test
@@ -68,7 +68,7 @@ public final class JobConfigurationGsonTypeAdapterTest {
APIJsonConstants.getSimpleJobJson(ThrowJobExceptionHandler.class.getCanonicalName()), TestJobRootConfiguration.class);
TestJobRootConfiguration expected = new TestJobRootConfiguration(
new TestSimpleJobConfiguration(ThrowJobExceptionHandler.class.getCanonicalName(), DefaultExecutorServiceHandler.class.getCanonicalName()).getTypeConfig());
- Assert.assertThat(GsonFactory.getGson().toJson(actual), Is.is(GsonFactory.getGson().toJson(expected)));
+ assertThat(GsonFactory.getGson().toJson(actual), is(GsonFactory.getGson().toJson(expected)));
}
@Test
@@ -76,7 +76,7 @@ public final class JobConfigurationGsonTypeAdapterTest {
TestJobRootConfiguration actual = GsonFactory.getGson().fromJson(
APIJsonConstants.getDataflowJobJson(IgnoreJobExceptionHandler.class.getCanonicalName()), TestJobRootConfiguration.class);
TestJobRootConfiguration expected = new TestJobRootConfiguration(new TestDataflowJobConfiguration(true).getTypeConfig());
- Assert.assertThat(GsonFactory.getGson().toJson(actual), Is.is(GsonFactory.getGson().toJson(expected)));
+ assertThat(GsonFactory.getGson().toJson(actual), is(GsonFactory.getGson().toJson(expected)));
}
@Test
@@ -84,13 +84,13 @@ public final class JobConfigurationGsonTypeAdapterTest {
TestJobRootConfiguration actual = GsonFactory.getGson().fromJson(
APIJsonConstants.getScriptJobJson(ThrowJobExceptionHandler.class.getCanonicalName()), TestJobRootConfiguration.class);
TestJobRootConfiguration expected = new TestJobRootConfiguration(new TestScriptJobConfiguration("test.sh", ThrowJobExceptionHandler.class).getTypeConfig());
- Assert.assertThat(GsonFactory.getGson().toJson(actual), Is.is(GsonFactory.getGson().toJson(expected)));
+ assertThat(GsonFactory.getGson().toJson(actual), is(GsonFactory.getGson().toJson(expected)));
}
private static class JobConfigurationGsonTypeAdapter extends AbstractJobConfigurationGsonTypeAdapter<TestJobRootConfiguration> {
@Override
- protected void addToCustomizedValueMap(final String jsonName, final JsonReader in, final Map<String, Object> customizedValueMap) throws IOException {
+ protected void addToCustomizedValueMap(final String jsonName, final JsonReader in, final Map<String, Object> customizedValueMap) {
}
@Override
@@ -99,7 +99,7 @@ public final class JobConfigurationGsonTypeAdapterTest {
}
@Override
- protected void writeCustomized(final JsonWriter out, final TestJobRootConfiguration value) throws IOException {
+ protected void writeCustomized(final JsonWriter out, final TestJobRootConfiguration value) {
}
}
}
diff --git a/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/CloudJobFacadeTest.java b/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/CloudJobFacadeTest.java
index 3f11535..08eace8 100755
--- a/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/CloudJobFacadeTest.java
+++ b/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/CloudJobFacadeTest.java
@@ -24,9 +24,11 @@ import org.apache.shardingsphere.elasticjob.cloud.exception.JobExecutionEnvironm
import org.apache.shardingsphere.elasticjob.tracing.JobEventBus;
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.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import java.util.HashMap;
import java.util.Map;
@@ -37,19 +39,20 @@ import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.verify;
+@RunWith(MockitoJUnitRunner.class)
public class CloudJobFacadeTest {
- private final ShardingContexts shardingContexts;
+ private ShardingContexts shardingContexts;
- private final JobConfigurationContext jobConfig;
+ private JobConfigurationContext jobConfig;
@Mock
private JobEventBus eventBus;
- private final JobFacade jobFacade;
+ private JobFacade jobFacade;
- public CloudJobFacadeTest() {
- MockitoAnnotations.initMocks(this);
+ @Before
+ public void setUp() {
shardingContexts = getShardingContexts();
jobConfig = new JobConfigurationContext(getJobConfigurationMap(JobType.SIMPLE, false));
jobFacade = new CloudJobFacade(shardingContexts, jobConfig, eventBus);
diff --git a/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/JobConfigurationContextTest.java b/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/JobConfigurationContextTest.java
index e990a9a..559d1df 100755
--- a/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/JobConfigurationContextTest.java
+++ b/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/JobConfigurationContextTest.java
@@ -18,50 +18,52 @@
package org.apache.shardingsphere.elasticjob.cloud.executor;
import org.apache.shardingsphere.elasticjob.cloud.api.JobType;
-import org.apache.shardingsphere.elasticjob.cloud.config.script.ScriptJobConfiguration;
-import org.apache.shardingsphere.elasticjob.cloud.executor.fixture.TestJob;
import org.apache.shardingsphere.elasticjob.cloud.config.dataflow.DataflowJobConfiguration;
+import org.apache.shardingsphere.elasticjob.cloud.config.script.ScriptJobConfiguration;
import org.apache.shardingsphere.elasticjob.cloud.config.simple.SimpleJobConfiguration;
-import org.apache.shardingsphere.elasticjob.cloud.exception.JobExecutionEnvironmentException;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
+import org.apache.shardingsphere.elasticjob.cloud.executor.fixture.TestJob;
import org.junit.Test;
import java.util.HashMap;
import java.util.Map;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
public class JobConfigurationContextTest {
@Test
- public void assertSimpleJobConfigurationContext() throws JobExecutionEnvironmentException {
- Assert.assertTrue(new JobConfigurationContext(buildJobConfigurationContextMap(JobType.SIMPLE)).getTypeConfig() instanceof SimpleJobConfiguration);
+ public void assertSimpleJobConfigurationContext() {
+ assertTrue(new JobConfigurationContext(buildJobConfigurationContextMap(JobType.SIMPLE)).getTypeConfig() instanceof SimpleJobConfiguration);
}
@Test
- public void assertDataflowJobConfigurationContext() throws JobExecutionEnvironmentException {
- Assert.assertTrue(new JobConfigurationContext(buildJobConfigurationContextMap(JobType.DATAFLOW)).getTypeConfig() instanceof DataflowJobConfiguration);
+ public void assertDataflowJobConfigurationContext() {
+ assertTrue(new JobConfigurationContext(buildJobConfigurationContextMap(JobType.DATAFLOW)).getTypeConfig() instanceof DataflowJobConfiguration);
}
@Test
- public void assertScriptJobConfigurationContext() throws JobExecutionEnvironmentException {
- Assert.assertTrue(new JobConfigurationContext(buildJobConfigurationContextMap(JobType.SCRIPT)).getTypeConfig() instanceof ScriptJobConfiguration);
+ public void assertScriptJobConfigurationContext() {
+ assertTrue(new JobConfigurationContext(buildJobConfigurationContextMap(JobType.SCRIPT)).getTypeConfig() instanceof ScriptJobConfiguration);
}
@Test
- public void assertSpringSimpleJobConfigurationContext() throws JobExecutionEnvironmentException {
+ public void assertSpringSimpleJobConfigurationContext() {
Map<String, String> context = buildJobConfigurationContextMap(JobType.SIMPLE);
context.put("beanName", "springSimpleJobName");
context.put("applicationContext", "applicationContext.xml");
- Assert.assertThat(new JobConfigurationContext(context).getBeanName(), Is.is("springSimpleJobName"));
- Assert.assertThat(new JobConfigurationContext(context).getApplicationContext(), Is.is("applicationContext.xml"));
+ assertThat(new JobConfigurationContext(context).getBeanName(), is("springSimpleJobName"));
+ assertThat(new JobConfigurationContext(context).getApplicationContext(), is("applicationContext.xml"));
}
@Test
- public void assertSimpleJobConfigurationContextWithExecutionType() throws JobExecutionEnvironmentException {
+ public void assertSimpleJobConfigurationContextWithExecutionType() {
Map<String, String> context = buildJobConfigurationContextMap(JobType.SIMPLE);
- Assert.assertTrue(new JobConfigurationContext(context).isTransient());
+ assertTrue(new JobConfigurationContext(context).isTransient());
context.put("cron", "0/1 * * * * ?");
- Assert.assertFalse(new JobConfigurationContext(context).isTransient());
+ assertFalse(new JobConfigurationContext(context).isTransient());
}
private Map<String, String> buildJobConfigurationContextMap(final JobType jobType) {
diff --git a/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/TaskExecutorThreadTest.java b/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/TaskExecutorThreadTest.java
index 9b12590..0bdbd70 100755
--- a/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/TaskExecutorThreadTest.java
+++ b/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/TaskExecutorThreadTest.java
@@ -28,11 +28,9 @@ import org.apache.shardingsphere.elasticjob.cloud.api.JobType;
import org.apache.shardingsphere.elasticjob.cloud.context.ExecutionType;
import org.apache.shardingsphere.elasticjob.cloud.exception.JobSystemException;
import org.apache.shardingsphere.elasticjob.cloud.executor.fixture.TestJob;
-import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import java.util.Collections;
@@ -40,6 +38,9 @@ import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.verify;
+
@RunWith(MockitoJUnitRunner.class)
public final class TaskExecutorThreadTest {
@@ -53,8 +54,8 @@ public final class TaskExecutorThreadTest {
TaskInfo taskInfo = buildJavaTransientTaskInfo();
TaskExecutor.TaskThread taskThread = new TaskExecutor().new TaskThread(executorDriver, taskInfo);
taskThread.run();
- Mockito.verify(executorDriver).sendStatusUpdate(Protos.TaskStatus.newBuilder().setTaskId(taskInfo.getTaskId()).setState(TaskState.TASK_RUNNING).build());
- Mockito.verify(executorDriver).sendStatusUpdate(Protos.TaskStatus.newBuilder().setTaskId(taskInfo.getTaskId()).setState(TaskState.TASK_FINISHED).build());
+ verify(executorDriver).sendStatusUpdate(Protos.TaskStatus.newBuilder().setTaskId(taskInfo.getTaskId()).setState(TaskState.TASK_RUNNING).build());
+ verify(executorDriver).sendStatusUpdate(Protos.TaskStatus.newBuilder().setTaskId(taskInfo.getTaskId()).setState(TaskState.TASK_FINISHED).build());
}
@Test
@@ -62,7 +63,7 @@ public final class TaskExecutorThreadTest {
TaskInfo taskInfo = buildSpringDaemonTaskInfo();
TaskExecutor.TaskThread taskThread = new TaskExecutor().new TaskThread(executorDriver, taskInfo);
taskThread.run();
- Mockito.verify(executorDriver).sendStatusUpdate(Protos.TaskStatus.newBuilder().setTaskId(taskInfo.getTaskId()).setState(TaskState.TASK_RUNNING).build());
+ verify(executorDriver).sendStatusUpdate(Protos.TaskStatus.newBuilder().setTaskId(taskInfo.getTaskId()).setState(TaskState.TASK_RUNNING).build());
}
@Test
@@ -70,8 +71,8 @@ public final class TaskExecutorThreadTest {
TaskInfo taskInfo = buildSpringScriptTransientTaskInfo();
TaskExecutor.TaskThread taskThread = new TaskExecutor().new TaskThread(executorDriver, taskInfo);
taskThread.run();
- Mockito.verify(executorDriver).sendStatusUpdate(Protos.TaskStatus.newBuilder().setTaskId(taskInfo.getTaskId()).setState(TaskState.TASK_RUNNING).build());
- Mockito.verify(executorDriver).sendStatusUpdate(Protos.TaskStatus.newBuilder().setTaskId(taskInfo.getTaskId()).setState(TaskState.TASK_FINISHED).build());
+ verify(executorDriver).sendStatusUpdate(Protos.TaskStatus.newBuilder().setTaskId(taskInfo.getTaskId()).setState(TaskState.TASK_RUNNING).build());
+ verify(executorDriver).sendStatusUpdate(Protos.TaskStatus.newBuilder().setTaskId(taskInfo.getTaskId()).setState(TaskState.TASK_FINISHED).build());
}
@Test
@@ -81,7 +82,7 @@ public final class TaskExecutorThreadTest {
try {
taskThread.run();
} catch (final JobSystemException ex) {
- Assert.assertTrue(ex.getMessage().startsWith("Elastic-Job: Class 'org.apache.shardingsphere.elasticjob.cloud.executor.TaskExecutorThreadTest' must implements ElasticJob interface."));
+ assertTrue(ex.getMessage().startsWith("Elastic-Job: Class 'org.apache.shardingsphere.elasticjob.cloud.executor.TaskExecutorThreadTest' must implements ElasticJob interface."));
}
}
@@ -92,7 +93,7 @@ public final class TaskExecutorThreadTest {
try {
taskThread.run();
} catch (final JobSystemException ex) {
- Assert.assertTrue(ex.getMessage().startsWith("Elastic-Job: Class 'WrongClass' initialize failure, the error message is 'WrongClass'."));
+ assertTrue(ex.getMessage().startsWith("Elastic-Job: Class 'WrongClass' initialize failure, the error message is 'WrongClass'."));
}
}
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 e9f1831..bbb5822 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
@@ -17,15 +17,13 @@
package org.apache.shardingsphere.elasticjob.cloud.executor.local;
-import org.apache.shardingsphere.elasticjob.cloud.config.script.ScriptJobConfiguration;
-import org.apache.shardingsphere.elasticjob.cloud.executor.local.fixture.TestDataflowJob;
-import org.apache.shardingsphere.elasticjob.cloud.executor.local.fixture.TestSimpleJob;
import org.apache.shardingsphere.elasticjob.cloud.config.JobCoreConfiguration;
import org.apache.shardingsphere.elasticjob.cloud.config.dataflow.DataflowJobConfiguration;
+import org.apache.shardingsphere.elasticjob.cloud.config.script.ScriptJobConfiguration;
import org.apache.shardingsphere.elasticjob.cloud.config.simple.SimpleJobConfiguration;
import org.apache.shardingsphere.elasticjob.cloud.exception.JobSystemException;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
+import org.apache.shardingsphere.elasticjob.cloud.executor.local.fixture.TestDataflowJob;
+import org.apache.shardingsphere.elasticjob.cloud.executor.local.fixture.TestSimpleJob;
import org.junit.Before;
import org.junit.Test;
@@ -36,6 +34,12 @@ import java.nio.file.Paths;
import java.nio.file.attribute.PosixFilePermissions;
import java.util.Arrays;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
public final class LocalTaskExecutorTest {
@Before
@@ -49,12 +53,12 @@ public final class LocalTaskExecutorTest {
public void assertSimpleJob() {
new LocalTaskExecutor(new LocalCloudJobConfiguration(new SimpleJobConfiguration(JobCoreConfiguration
.newBuilder(TestSimpleJob.class.getSimpleName(), "*/2 * * * * ?", 3).build(), TestSimpleJob.class.getName()), 1)).execute();
- Assert.assertThat(TestSimpleJob.getShardingContext().getJobName(), Is.is(TestSimpleJob.class.getSimpleName()));
- Assert.assertThat(TestSimpleJob.getShardingContext().getShardingItem(), Is.is(1));
- Assert.assertThat(TestSimpleJob.getShardingContext().getShardingTotalCount(), Is.is(3));
- Assert.assertThat(TestSimpleJob.getShardingContext().getShardingItem(), Is.is(1));
- Assert.assertNull(TestSimpleJob.getShardingContext().getShardingParameter());
- Assert.assertThat(TestSimpleJob.getShardingContext().getJobParameter(), Is.is(""));
+ assertThat(TestSimpleJob.getShardingContext().getJobName(), is(TestSimpleJob.class.getSimpleName()));
+ assertThat(TestSimpleJob.getShardingContext().getShardingItem(), is(1));
+ assertThat(TestSimpleJob.getShardingContext().getShardingTotalCount(), is(3));
+ assertThat(TestSimpleJob.getShardingContext().getShardingItem(), is(1));
+ assertNull(TestSimpleJob.getShardingContext().getShardingParameter());
+ assertThat(TestSimpleJob.getShardingContext().getJobParameter(), is(""));
}
@Test
@@ -62,12 +66,12 @@ public final class LocalTaskExecutorTest {
new LocalTaskExecutor(new LocalCloudJobConfiguration(new SimpleJobConfiguration(JobCoreConfiguration.newBuilder(
TestSimpleJob.class.getSimpleName(), "*/2 * * * * ?", 3).shardingItemParameters("0=Beijing,1=Shanghai,2=Guangzhou").jobParameter("dbName=dangdang").build(),
TestSimpleJob.class.getName()), 1, "testSimpleJob", "applicationContext.xml")).execute();
- Assert.assertThat(TestSimpleJob.getShardingContext().getJobName(), Is.is(TestSimpleJob.class.getSimpleName()));
- Assert.assertThat(TestSimpleJob.getShardingContext().getShardingTotalCount(), Is.is(3));
- Assert.assertThat(TestSimpleJob.getShardingContext().getJobParameter(), Is.is("dbName=dangdang"));
- Assert.assertThat(TestSimpleJob.getShardingContext().getShardingItem(), Is.is(1));
- Assert.assertThat(TestSimpleJob.getShardingParameters().size(), Is.is(1));
- Assert.assertThat(TestSimpleJob.getShardingParameters().iterator().next(), Is.is("Shanghai"));
+ assertThat(TestSimpleJob.getShardingContext().getJobName(), is(TestSimpleJob.class.getSimpleName()));
+ assertThat(TestSimpleJob.getShardingContext().getShardingTotalCount(), is(3));
+ assertThat(TestSimpleJob.getShardingContext().getJobParameter(), is("dbName=dangdang"));
+ assertThat(TestSimpleJob.getShardingContext().getShardingItem(), is(1));
+ assertThat(TestSimpleJob.getShardingParameters().size(), is(1));
+ assertThat(TestSimpleJob.getShardingParameters().iterator().next(), is("Shanghai"));
}
@Test
@@ -75,9 +79,9 @@ public final class LocalTaskExecutorTest {
TestDataflowJob.setInput(Arrays.asList("1", "2", "3"));
new LocalTaskExecutor(new LocalCloudJobConfiguration(new DataflowJobConfiguration(JobCoreConfiguration
.newBuilder(TestDataflowJob.class.getSimpleName(), "*/2 * * * * ?", 10).build(), TestDataflowJob.class.getName(), false), 5)).execute();
- Assert.assertFalse(TestDataflowJob.getOutput().isEmpty());
+ assertFalse(TestDataflowJob.getOutput().isEmpty());
for (String each : TestDataflowJob.getOutput()) {
- Assert.assertTrue(each.endsWith("-d"));
+ assertTrue(each.endsWith("-d"));
}
}
diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/restful/RestfulExceptionTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/restful/RestfulExceptionTest.java
index a5b6a66..d13fbe3 100755
--- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/restful/RestfulExceptionTest.java
+++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/restful/RestfulExceptionTest.java
@@ -18,13 +18,14 @@
package org.apache.shardingsphere.elasticjob.cloud.restful;
import org.hamcrest.core.IsInstanceOf;
-import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertThat;
+
public final class RestfulExceptionTest {
@Test
public void assertRestfulException() {
- Assert.assertThat(new RestfulException(new RuntimeException()).getCause(), IsInstanceOf.instanceOf(RuntimeException.class));
+ assertThat(new RestfulException(new RuntimeException()).getCause(), IsInstanceOf.instanceOf(RuntimeException.class));
}
}
diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/restful/RestfulServerTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/restful/RestfulServerTest.java
index f03a5e9..7fcee27 100755
--- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/restful/RestfulServerTest.java
+++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/restful/RestfulServerTest.java
@@ -23,19 +23,21 @@ import org.apache.shardingsphere.elasticjob.cloud.restful.fixture.TestRestfulApi
import org.eclipse.jetty.client.ContentExchange;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.io.ByteArrayBuffer;
-import org.hamcrest.core.Is;
import org.hamcrest.core.StringStartsWith;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import javax.ws.rs.core.MediaType;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
@RunWith(MockitoJUnitRunner.class)
public final class RestfulServerTest {
@@ -59,25 +61,25 @@ public final class RestfulServerTest {
@Before
public void setUp() {
- caller = Mockito.mock(Caller.class);
+ caller = mock(Caller.class);
TestRestfulApi.setCaller(caller);
}
@Test
public void assertCallSuccess() throws Exception {
ContentExchange actual = sentRequest("{\"string\":\"test\",\"integer\":1}");
- Assert.assertThat(actual.getResponseStatus(), Is.is(200));
- Assert.assertThat(actual.getResponseContent(), Is.is("{\"string\":\"test_processed\",\"integer\":\"1_processed\"}"));
- Mockito.verify(caller).call("test");
- Mockito.verify(caller).call(1);
+ assertThat(actual.getResponseStatus(), is(200));
+ assertThat(actual.getResponseContent(), is("{\"string\":\"test_processed\",\"integer\":\"1_processed\"}"));
+ verify(caller).call("test");
+ verify(caller).call(1);
}
@Test
public void assertCallFailure() throws Exception {
ContentExchange actual = sentRequest("{\"string\":\"test\",\"integer\":\"invalid_number\"}");
- Assert.assertThat(actual.getResponseStatus(), Is.is(500));
- Assert.assertThat(actual.getResponseContent(), StringStartsWith.startsWith("java.lang.NumberFormatException"));
- Mockito.verify(caller).call("test");
+ assertThat(actual.getResponseStatus(), is(500));
+ assertThat(actual.getResponseContent(), StringStartsWith.startsWith("java.lang.NumberFormatException"));
+ verify(caller).call("test");
}
private static ContentExchange sentRequest(final String content) throws Exception {
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 72005da..430b73d 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,14 +17,15 @@
package org.apache.shardingsphere.elasticjob.cloud.scheduler.config.app;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public final class CloudAppConfigurationNodeTest {
@Test
public void assertGetRootNodePath() {
- Assert.assertThat(CloudAppConfigurationNode.getRootNodePath("test_job_app"), Is.is("/config/app/test_job_app"));
+ assertThat(CloudAppConfigurationNode.getRootNodePath("test_job_app"), is("/config/app/test_job_app"));
}
}
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 a65d296..86e15f1 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
@@ -20,19 +20,23 @@ package org.apache.shardingsphere.elasticjob.cloud.scheduler.config.app;
import org.apache.shardingsphere.elasticjob.cloud.reg.base.CoordinatorRegistryCenter;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.CloudAppConfigurationBuilder;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.CloudAppJsonConstants;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
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.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
@RunWith(MockitoJUnitRunner.class)
public final class CloudAppConfigurationServiceTest {
@@ -46,54 +50,53 @@ public final class CloudAppConfigurationServiceTest {
public void assertAdd() {
CloudAppConfiguration appConfig = CloudAppConfigurationBuilder.createCloudAppConfiguration("test_app");
configService.add(appConfig);
- Mockito.verify(regCenter).persist("/config/app/test_app", CloudAppJsonConstants.getAppJson("test_app"));
+ verify(regCenter).persist("/config/app/test_app", CloudAppJsonConstants.getAppJson("test_app"));
}
@Test
public void assertUpdate() {
CloudAppConfiguration appConfig = CloudAppConfigurationBuilder.createCloudAppConfiguration("test_app");
configService.update(appConfig);
- Mockito.verify(regCenter).update("/config/app/test_app", CloudAppJsonConstants.getAppJson("test_app"));
+ verify(regCenter).update("/config/app/test_app", CloudAppJsonConstants.getAppJson("test_app"));
}
@Test
public void assertLoadAllWithoutRootNode() {
- Mockito.when(regCenter.isExisted("/config/app")).thenReturn(false);
- Assert.assertTrue(configService.loadAll().isEmpty());
- Mockito.verify(regCenter).isExisted("/config/app");
+ when(regCenter.isExisted("/config/app")).thenReturn(false);
+ assertTrue(configService.loadAll().isEmpty());
+ verify(regCenter).isExisted("/config/app");
}
@Test
public void assertLoadAllWithRootNode() {
- Mockito.when(regCenter.isExisted("/config/app")).thenReturn(true);
- Mockito.when(regCenter.getChildrenKeys(CloudAppConfigurationNode.ROOT)).thenReturn(Arrays.asList("test_app_1", "test_app_2"));
- Mockito.when(regCenter.get("/config/app/test_app_1")).thenReturn(CloudAppJsonConstants.getAppJson("test_app_1"));
+ when(regCenter.isExisted("/config/app")).thenReturn(true);
+ when(regCenter.getChildrenKeys(CloudAppConfigurationNode.ROOT)).thenReturn(Arrays.asList("test_app_1", "test_app_2"));
+ when(regCenter.get("/config/app/test_app_1")).thenReturn(CloudAppJsonConstants.getAppJson("test_app_1"));
Collection<CloudAppConfiguration> actual = configService.loadAll();
- Assert.assertThat(actual.size(), Is.is(1));
- Assert.assertThat(actual.iterator().next().getAppName(), Is.is("test_app_1"));
- Mockito.verify(regCenter).isExisted("/config/app");
- Mockito.verify(regCenter).getChildrenKeys("/config/app");
- Mockito.verify(regCenter).get("/config/app/test_app_1");
- Mockito.verify(regCenter).get("/config/app/test_app_2");
+ assertThat(actual.size(), is(1));
+ assertThat(actual.iterator().next().getAppName(), is("test_app_1"));
+ verify(regCenter).isExisted("/config/app");
+ verify(regCenter).getChildrenKeys("/config/app");
+ verify(regCenter).get("/config/app/test_app_1");
+ verify(regCenter).get("/config/app/test_app_2");
}
@Test
public void assertLoadWithoutConfig() {
- Optional<CloudAppConfiguration> actual = configService.load("test_app");
- Assert.assertFalse(actual.isPresent());
+ assertFalse(configService.load("test_app").isPresent());
}
@Test
public void assertLoadWithConfig() {
- Mockito.when(regCenter.get("/config/app/test_app")).thenReturn(CloudAppJsonConstants.getAppJson("test_app"));
+ when(regCenter.get("/config/app/test_app")).thenReturn(CloudAppJsonConstants.getAppJson("test_app"));
Optional<CloudAppConfiguration> actual = configService.load("test_app");
- Assert.assertTrue(actual.isPresent());
- Assert.assertThat(actual.get().getAppName(), Is.is("test_app"));
+ assertTrue(actual.isPresent());
+ assertThat(actual.get().getAppName(), is("test_app"));
}
@Test
public void assertRemove() {
configService.remove("test_app");
- Mockito.verify(regCenter).remove("/config/app/test_app");
+ verify(regCenter).remove("/config/app/test_app");
}
}
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 ea14ea5..bc32a10 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,14 +17,15 @@
package org.apache.shardingsphere.elasticjob.cloud.scheduler.config.job;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public final class CloudJobConfigurationNodeTest {
@Test
public void assertGetRootNodePath() {
- Assert.assertThat(CloudJobConfigurationNode.getRootNodePath("test_job"), Is.is("/config/job/test_job"));
+ assertThat(CloudJobConfigurationNode.getRootNodePath("test_job"), is("/config/job/test_job"));
}
}
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 e0adc54..a52eb0a 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
@@ -20,19 +20,23 @@ package org.apache.shardingsphere.elasticjob.cloud.scheduler.config.job;
import org.apache.shardingsphere.elasticjob.cloud.reg.base.CoordinatorRegistryCenter;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.CloudJobConfigurationBuilder;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.CloudJsonConstants;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
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.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
@RunWith(MockitoJUnitRunner.class)
public final class CloudJobConfigurationServiceTest {
@@ -46,70 +50,69 @@ public final class CloudJobConfigurationServiceTest {
public void assertAdd() {
CloudJobConfiguration jobConfig = CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job");
configService.add(jobConfig);
- Mockito.verify(regCenter).persist("/config/job/test_job", CloudJsonConstants.getJobJson());
+ verify(regCenter).persist("/config/job/test_job", CloudJsonConstants.getJobJson());
}
@Test
public void assertUpdate() {
CloudJobConfiguration jobConfig = CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job");
configService.update(jobConfig);
- Mockito.verify(regCenter).update("/config/job/test_job", CloudJsonConstants.getJobJson());
+ verify(regCenter).update("/config/job/test_job", CloudJsonConstants.getJobJson());
}
@Test
public void assertAddSpringJob() {
CloudJobConfiguration jobConfig = CloudJobConfigurationBuilder.createCloudSpringJobConfiguration("test_spring_job");
configService.add(jobConfig);
- Mockito.verify(regCenter).persist("/config/job/test_spring_job", CloudJsonConstants.getSpringJobJson());
+ verify(regCenter).persist("/config/job/test_spring_job", CloudJsonConstants.getSpringJobJson());
}
@Test
public void assertLoadAllWithoutRootNode() {
- Mockito.when(regCenter.isExisted("/config/job")).thenReturn(false);
- Assert.assertTrue(configService.loadAll().isEmpty());
- Mockito.verify(regCenter).isExisted("/config/job");
+ when(regCenter.isExisted("/config/job")).thenReturn(false);
+ assertTrue(configService.loadAll().isEmpty());
+ verify(regCenter).isExisted("/config/job");
}
@Test
public void assertLoadAllWithRootNode() {
- Mockito.when(regCenter.isExisted("/config/job")).thenReturn(true);
- Mockito.when(regCenter.getChildrenKeys(CloudJobConfigurationNode.ROOT)).thenReturn(Arrays.asList("test_job_1", "test_job_2"));
- Mockito.when(regCenter.get("/config/job/test_job_1")).thenReturn(CloudJsonConstants.getJobJson("test_job_1"));
+ when(regCenter.isExisted("/config/job")).thenReturn(true);
+ when(regCenter.getChildrenKeys(CloudJobConfigurationNode.ROOT)).thenReturn(Arrays.asList("test_job_1", "test_job_2"));
+ when(regCenter.get("/config/job/test_job_1")).thenReturn(CloudJsonConstants.getJobJson("test_job_1"));
Collection<CloudJobConfiguration> actual = configService.loadAll();
- Assert.assertThat(actual.size(), Is.is(1));
- Assert.assertThat(actual.iterator().next().getJobName(), Is.is("test_job_1"));
- Mockito.verify(regCenter).isExisted("/config/job");
- Mockito.verify(regCenter).getChildrenKeys("/config/job");
- Mockito.verify(regCenter).get("/config/job/test_job_1");
- Mockito.verify(regCenter).get("/config/job/test_job_2");
+ assertThat(actual.size(), is(1));
+ assertThat(actual.iterator().next().getJobName(), is("test_job_1"));
+ verify(regCenter).isExisted("/config/job");
+ verify(regCenter).getChildrenKeys("/config/job");
+ verify(regCenter).get("/config/job/test_job_1");
+ verify(regCenter).get("/config/job/test_job_2");
}
@Test
public void assertLoadWithoutConfig() {
- Optional<CloudJobConfiguration> actual = configService.load("test_job");
- Assert.assertFalse(actual.isPresent());
+ assertFalse(configService.load("test_job").isPresent());
}
@Test
public void assertLoadWithConfig() {
- Mockito.when(regCenter.get("/config/job/test_job")).thenReturn(CloudJsonConstants.getJobJson());
+ when(regCenter.get("/config/job/test_job")).thenReturn(CloudJsonConstants.getJobJson());
Optional<CloudJobConfiguration> actual = configService.load("test_job");
- Assert.assertTrue(actual.isPresent());
- Assert.assertThat(actual.get().getJobName(), Is.is("test_job"));
+ assertTrue(actual.isPresent());
+ assertThat(actual.get().getJobName(), is("test_job"));
}
@Test
public void assertLoadWithSpringConfig() {
- Mockito.when(regCenter.get("/config/job/test_spring_job")).thenReturn(CloudJsonConstants.getSpringJobJson());
+ when(regCenter.get("/config/job/test_spring_job")).thenReturn(CloudJsonConstants.getSpringJobJson());
Optional<CloudJobConfiguration> actual = configService.load("test_spring_job");
- Assert.assertTrue(actual.isPresent());
- Assert.assertThat(actual.get().getBeanName(), Is.is("springSimpleJob"));
- Assert.assertThat(actual.get().getApplicationContext(), Is.is("applicationContext.xml"));
+ assertTrue(actual.isPresent());
+ assertThat(actual.get().getBeanName(), is("springSimpleJob"));
+ assertThat(actual.get().getApplicationContext(), is("applicationContext.xml"));
}
@Test
public void assertRemove() {
configService.remove("test_job");
- Mockito.verify(regCenter).remove("/config/job/test_job");
+ verify(regCenter).remove("/config/job/test_job");
}
}
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 273adce..bb803af 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
@@ -17,22 +17,23 @@
package org.apache.shardingsphere.elasticjob.cloud.scheduler.context;
+import org.apache.shardingsphere.elasticjob.cloud.context.ExecutionType;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.config.job.CloudJobConfiguration;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.CloudJobConfigurationBuilder;
-import org.apache.shardingsphere.elasticjob.cloud.context.ExecutionType;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public final class JobContextTest {
@Test
public void assertFrom() {
CloudJobConfiguration jobConfig = CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job");
JobContext actual = JobContext.from(jobConfig, ExecutionType.READY);
- Assert.assertThat(actual.getAssignedShardingItems().size(), Is.is(10));
+ assertThat(actual.getAssignedShardingItems().size(), is(10));
for (int i = 0; i < actual.getAssignedShardingItems().size(); i++) {
- Assert.assertThat(actual.getAssignedShardingItems().get(i), Is.is(i));
+ assertThat(actual.getAssignedShardingItems().get(i), is(i));
}
}
}
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 ea308ec..e5e2dad 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,9 +20,7 @@ package org.apache.shardingsphere.elasticjob.cloud.scheduler.env;
import org.apache.commons.dbcp.BasicDataSource;
import org.apache.shardingsphere.elasticjob.cloud.reg.zookeeper.ZookeeperConfiguration;
import org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration;
-import org.hamcrest.core.Is;
import org.hamcrest.core.IsInstanceOf;
-import org.junit.Assert;
import org.junit.Test;
import org.unitils.util.ReflectionUtils;
@@ -30,6 +28,10 @@ import java.util.Map;
import java.util.Optional;
import java.util.Properties;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+
public final class BootstrapEnvironmentTest {
private final BootstrapEnvironment bootstrapEnvironment = BootstrapEnvironment.getInstance();
@@ -37,9 +39,9 @@ public final class BootstrapEnvironmentTest {
@Test
public void assertGetMesosConfiguration() {
MesosConfiguration mesosConfig = bootstrapEnvironment.getMesosConfiguration();
- Assert.assertThat(mesosConfig.getHostname(), Is.is("localhost"));
- Assert.assertThat(mesosConfig.getUser(), Is.is(""));
- Assert.assertThat(mesosConfig.getUrl(), Is.is("zk://localhost:2181/mesos"));
+ assertThat(mesosConfig.getHostname(), is("localhost"));
+ assertThat(mesosConfig.getUser(), is(""));
+ assertThat(mesosConfig.getUrl(), is("zk://localhost:2181/mesos"));
}
@Test
@@ -48,21 +50,21 @@ public final class BootstrapEnvironmentTest {
properties.setProperty(BootstrapEnvironment.EnvironmentArgument.ZOOKEEPER_DIGEST.getKey(), "test");
ReflectionUtils.setFieldValue(bootstrapEnvironment, "properties", properties);
ZookeeperConfiguration zkConfig = bootstrapEnvironment.getZookeeperConfiguration();
- Assert.assertThat(zkConfig.getServerLists(), Is.is("localhost:2181"));
- Assert.assertThat(zkConfig.getNamespace(), Is.is("elasticjob-cloud"));
- Assert.assertThat(zkConfig.getDigest(), Is.is("test"));
+ assertThat(zkConfig.getServerLists(), is("localhost:2181"));
+ assertThat(zkConfig.getNamespace(), is("elasticjob-cloud"));
+ assertThat(zkConfig.getDigest(), is("test"));
}
@Test
public void assertGetRestfulServerConfiguration() {
RestfulServerConfiguration restfulServerConfig = bootstrapEnvironment.getRestfulServerConfiguration();
- Assert.assertThat(restfulServerConfig.getPort(), Is.is(8899));
+ assertThat(restfulServerConfig.getPort(), is(8899));
}
@Test
public void assertGetFrameworkConfiguration() {
FrameworkConfiguration frameworkConfig = bootstrapEnvironment.getFrameworkConfiguration();
- Assert.assertThat(frameworkConfig.getJobStateQueueSize(), Is.is(10000));
+ assertThat(frameworkConfig.getJobStateQueueSize(), is(10000));
}
@Test
@@ -74,12 +76,12 @@ public final class BootstrapEnvironmentTest {
properties.setProperty(BootstrapEnvironment.EnvironmentArgument.EVENT_TRACE_RDB_PASSWORD.getKey(), "password");
ReflectionUtils.setFieldValue(bootstrapEnvironment, "properties", properties);
Optional<TracingConfiguration> tracingConfiguration = bootstrapEnvironment.getTracingConfiguration();
- tracingConfiguration.ifPresent(tracingConfiguration1 -> Assert.assertThat(tracingConfiguration1.getStorage(), IsInstanceOf.instanceOf(BasicDataSource.class)));
+ tracingConfiguration.ifPresent(tracingConfiguration1 -> assertThat(tracingConfiguration1.getStorage(), IsInstanceOf.instanceOf(BasicDataSource.class)));
}
@Test
public void assertWithoutEventTraceRdbConfiguration() {
- Assert.assertFalse(bootstrapEnvironment.getTracingConfiguration().isPresent());
+ assertFalse(bootstrapEnvironment.getTracingConfiguration().isPresent());
}
@Test
@@ -91,22 +93,22 @@ public final class BootstrapEnvironmentTest {
properties.setProperty(BootstrapEnvironment.EnvironmentArgument.EVENT_TRACE_RDB_PASSWORD.getKey(), "password");
ReflectionUtils.setFieldValue(bootstrapEnvironment, "properties", properties);
Map<String, String> jobEventRdbConfigurationMap = bootstrapEnvironment.getJobEventRdbConfigurationMap();
- Assert.assertThat(jobEventRdbConfigurationMap.get(BootstrapEnvironment.EnvironmentArgument.EVENT_TRACE_RDB_DRIVER.getKey()), Is.is("org.h2.Driver"));
- Assert.assertThat(jobEventRdbConfigurationMap.get(BootstrapEnvironment.EnvironmentArgument.EVENT_TRACE_RDB_URL.getKey()), Is.is("jdbc:h2:mem:job_event_trace"));
- Assert.assertThat(jobEventRdbConfigurationMap.get(BootstrapEnvironment.EnvironmentArgument.EVENT_TRACE_RDB_USERNAME.getKey()), Is.is("sa"));
- Assert.assertThat(jobEventRdbConfigurationMap.get(BootstrapEnvironment.EnvironmentArgument.EVENT_TRACE_RDB_PASSWORD.getKey()), Is.is("password"));
+ assertThat(jobEventRdbConfigurationMap.get(BootstrapEnvironment.EnvironmentArgument.EVENT_TRACE_RDB_DRIVER.getKey()), is("org.h2.Driver"));
+ assertThat(jobEventRdbConfigurationMap.get(BootstrapEnvironment.EnvironmentArgument.EVENT_TRACE_RDB_URL.getKey()), is("jdbc:h2:mem:job_event_trace"));
+ assertThat(jobEventRdbConfigurationMap.get(BootstrapEnvironment.EnvironmentArgument.EVENT_TRACE_RDB_USERNAME.getKey()), is("sa"));
+ assertThat(jobEventRdbConfigurationMap.get(BootstrapEnvironment.EnvironmentArgument.EVENT_TRACE_RDB_PASSWORD.getKey()), is("password"));
}
@Test
public void assertReconcileConfiguration() throws NoSuchFieldException {
FrameworkConfiguration configuration = bootstrapEnvironment.getFrameworkConfiguration();
- Assert.assertThat(configuration.getReconcileIntervalMinutes(), Is.is(-1));
- Assert.assertFalse(configuration.isEnabledReconcile());
+ assertThat(configuration.getReconcileIntervalMinutes(), is(-1));
+ assertFalse(configuration.isEnabledReconcile());
Properties properties = new Properties();
properties.setProperty(BootstrapEnvironment.EnvironmentArgument.RECONCILE_INTERVAL_MINUTES.getKey(), "0");
ReflectionUtils.setFieldValue(bootstrapEnvironment, "properties", properties);
configuration = bootstrapEnvironment.getFrameworkConfiguration();
- Assert.assertThat(configuration.getReconcileIntervalMinutes(), Is.is(0));
- Assert.assertFalse(configuration.isEnabledReconcile());
+ assertThat(configuration.getReconcileIntervalMinutes(), is(0));
+ assertFalse(configuration.isEnabledReconcile());
}
}
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 3dde3a4..598cc92 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
@@ -20,8 +20,9 @@ package org.apache.shardingsphere.elasticjob.cloud.scheduler.ha;
import org.apache.shardingsphere.elasticjob.cloud.reg.base.CoordinatorRegistryCenter;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import java.util.Optional;
@@ -31,6 +32,7 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
public class FrameworkIDServiceTest {
@Mock
@@ -40,7 +42,6 @@ public class FrameworkIDServiceTest {
@Before
public void init() {
- MockitoAnnotations.initMocks(this);
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 6fd50c0..9738906 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,13 +31,10 @@ import org.apache.shardingsphere.elasticjob.cloud.context.TaskContext;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.CloudAppConfigurationBuilder;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.CloudJobConfigurationBuilder;
import org.codehaus.jettison.json.JSONException;
-import org.hamcrest.core.Is;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.mockito.Mockito;
import org.mockito.stubbing.Answer;
import java.util.ArrayList;
@@ -46,6 +43,12 @@ import java.util.Collections;
import java.util.List;
import java.util.Optional;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
public final class AppConstraintEvaluatorTest {
private static final double SUFFICIENT_CPU = 1.0 * 13;
@@ -62,7 +65,7 @@ public final class AppConstraintEvaluatorTest {
@BeforeClass
public static void init() {
- facadeService = Mockito.mock(FacadeService.class);
+ facadeService = mock(FacadeService.class);
AppConstraintEvaluator.init(facadeService);
}
@@ -79,58 +82,58 @@ public final class AppConstraintEvaluatorTest {
@Test
public void assertFirstLaunch() {
SchedulingResult result = taskScheduler.scheduleOnce(getTasks(), Arrays.asList(getLease(0, SUFFICIENT_CPU, SUFFICIENT_MEM), getLease(1, SUFFICIENT_CPU, SUFFICIENT_MEM)));
- Assert.assertThat(result.getResultMap().size(), Is.is(2));
- Assert.assertThat(result.getFailures().size(), Is.is(0));
- Assert.assertThat(getAssignedTaskNumber(result), Is.is(20));
+ assertThat(result.getResultMap().size(), is(2));
+ assertThat(result.getFailures().size(), is(0));
+ assertThat(getAssignedTaskNumber(result), is(20));
}
@Test
public void assertFirstLaunchLackCpu() {
SchedulingResult result = taskScheduler.scheduleOnce(getTasks(), Arrays.asList(getLease(0, INSUFFICIENT_CPU, SUFFICIENT_MEM), getLease(1, INSUFFICIENT_CPU, SUFFICIENT_MEM)));
- Assert.assertThat(result.getResultMap().size(), Is.is(2));
- Assert.assertThat(getAssignedTaskNumber(result), Is.is(18));
+ assertThat(result.getResultMap().size(), is(2));
+ assertThat(getAssignedTaskNumber(result), is(18));
}
@Test
public void assertFirstLaunchLackMem() {
SchedulingResult result = taskScheduler.scheduleOnce(getTasks(), Arrays.asList(getLease(0, SUFFICIENT_CPU, INSUFFICIENT_MEM), getLease(1, SUFFICIENT_CPU, INSUFFICIENT_MEM)));
- Assert.assertThat(result.getResultMap().size(), Is.is(2));
- Assert.assertThat(getAssignedTaskNumber(result), Is.is(18));
+ assertThat(result.getResultMap().size(), is(2));
+ assertThat(getAssignedTaskNumber(result), is(18));
}
@Test
public void assertExistExecutorOnS0() throws Exception {
- Mockito.when(facadeService.loadExecutorInfo()).thenReturn(ImmutableList.of(new MesosStateService.ExecutorStateInfo("foo-app@-@S0", "S0")));
+ when(facadeService.loadExecutorInfo()).thenReturn(ImmutableList.of(new MesosStateService.ExecutorStateInfo("foo-app@-@S0", "S0")));
AppConstraintEvaluator.getInstance().loadAppRunningState();
SchedulingResult result = taskScheduler.scheduleOnce(getTasks(), Arrays.asList(getLease(0, INSUFFICIENT_CPU, INSUFFICIENT_MEM), getLease(1, INSUFFICIENT_CPU, INSUFFICIENT_MEM)));
- Assert.assertThat(result.getResultMap().size(), Is.is(2));
- Assert.assertTrue(getAssignedTaskNumber(result) > 18);
+ assertThat(result.getResultMap().size(), is(2));
+ assertTrue(getAssignedTaskNumber(result) > 18);
}
@Test
public void assertGetExecutorError() throws Exception {
- Mockito.when(facadeService.loadExecutorInfo()).thenThrow(JSONException.class);
+ when(facadeService.loadExecutorInfo()).thenThrow(JSONException.class);
AppConstraintEvaluator.getInstance().loadAppRunningState();
SchedulingResult result = taskScheduler.scheduleOnce(getTasks(), Arrays.asList(getLease(0, INSUFFICIENT_CPU, INSUFFICIENT_MEM), getLease(1, INSUFFICIENT_CPU, INSUFFICIENT_MEM)));
- Assert.assertThat(result.getResultMap().size(), Is.is(2));
- Assert.assertThat(getAssignedTaskNumber(result), Is.is(18));
+ assertThat(result.getResultMap().size(), is(2));
+ assertThat(getAssignedTaskNumber(result), is(18));
}
@Test
public void assertLackJobConfig() {
- Mockito.when(facadeService.load("test")).thenReturn(Optional.empty());
+ when(facadeService.load("test")).thenReturn(Optional.empty());
SchedulingResult result = taskScheduler.scheduleOnce(Collections.singletonList(getTask("test")), Collections.singletonList(getLease(0, 1.5, 192)));
- Assert.assertThat(result.getResultMap().size(), Is.is(1));
- Assert.assertThat(getAssignedTaskNumber(result), Is.is(1));
+ assertThat(result.getResultMap().size(), is(1));
+ assertThat(getAssignedTaskNumber(result), is(1));
}
@Test
public void assertLackAppConfig() {
- Mockito.when(facadeService.load("test")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test")));
- Mockito.when(facadeService.loadAppConfig("test_app")).thenReturn(Optional.empty());
+ when(facadeService.load("test")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test")));
+ when(facadeService.loadAppConfig("test_app")).thenReturn(Optional.empty());
SchedulingResult result = taskScheduler.scheduleOnce(Collections.singletonList(getTask("test")), Collections.singletonList(getLease(0, 1.5, 192)));
- Assert.assertThat(result.getResultMap().size(), Is.is(1));
- Assert.assertThat(getAssignedTaskNumber(result), Is.is(1));
+ assertThat(result.getResultMap().size(), is(1));
+ assertThat(getAssignedTaskNumber(result), is(1));
}
private VirtualMachineLease getLease(final int index, final double cpus, final double mem) {
@@ -157,19 +160,19 @@ public final class AppConstraintEvaluatorTest {
appName = "bar-app";
}
result.add(getTask(jobName));
- Mockito.when(facadeService.load(jobName)).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration(jobName, appName)));
+ when(facadeService.load(jobName)).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration(jobName, appName)));
}
- Mockito.when(facadeService.loadAppConfig("foo-app")).thenReturn(Optional.of(CloudAppConfigurationBuilder.createCloudAppConfiguration("foo-app")));
- Mockito.when(facadeService.loadAppConfig("bar-app")).thenReturn(Optional.of(CloudAppConfigurationBuilder.createCloudAppConfiguration("bar-app")));
+ when(facadeService.loadAppConfig("foo-app")).thenReturn(Optional.of(CloudAppConfigurationBuilder.createCloudAppConfiguration("foo-app")));
+ when(facadeService.loadAppConfig("bar-app")).thenReturn(Optional.of(CloudAppConfigurationBuilder.createCloudAppConfiguration("bar-app")));
return result;
}
private TaskRequest getTask(final String jobName) {
- TaskRequest result = Mockito.mock(TaskRequest.class);
- Mockito.when(result.getCPUs()).thenReturn(1.0d);
- Mockito.when(result.getMemory()).thenReturn(128.0d);
- Mockito.when(result.getHardConstraints()).thenAnswer((Answer<List<? extends ConstraintEvaluator>>) invocationOnMock -> ImmutableList.of(AppConstraintEvaluator.getInstance()));
- Mockito.when(result.getId()).thenReturn(new TaskContext(jobName, Collections.singletonList(0), ExecutionType.READY).getId());
+ TaskRequest result = mock(TaskRequest.class);
+ when(result.getCPUs()).thenReturn(1.0d);
+ when(result.getMemory()).thenReturn(128.0d);
+ when(result.getHardConstraints()).thenAnswer((Answer<List<? extends ConstraintEvaluator>>) invocationOnMock -> ImmutableList.of(AppConstraintEvaluator.getInstance()));
+ when(result.getId()).thenReturn(new TaskContext(jobName, Collections.singletonList(0), ExecutionType.READY).getId());
return result;
}
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 cfa41ed..a87ad6d 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
@@ -35,13 +35,10 @@ import org.apache.shardingsphere.elasticjob.cloud.scheduler.state.disable.job.Di
import org.apache.shardingsphere.elasticjob.cloud.scheduler.state.failover.FailoverService;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.state.ready.ReadyService;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.state.running.RunningService;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.unitils.util.ReflectionUtils;
@@ -50,6 +47,14 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Optional;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
@RunWith(MockitoJUnitRunner.class)
public final class FacadeServiceTest {
@@ -98,25 +103,25 @@ public final class FacadeServiceTest {
@Test
public void assertStart() {
facadeService.start();
- Mockito.verify(runningService).start();
+ verify(runningService).start();
}
@Test
public void assertGetEligibleJobContext() {
Collection<JobContext> failoverJobContexts = Collections.singletonList(JobContext.from(CloudJobConfigurationBuilder.createCloudJobConfiguration("failover_job"), ExecutionType.FAILOVER));
Collection<JobContext> readyJobContexts = Collections.singletonList(JobContext.from(CloudJobConfigurationBuilder.createCloudJobConfiguration("ready_job"), ExecutionType.READY));
- Mockito.when(failoverService.getAllEligibleJobContexts()).thenReturn(failoverJobContexts);
- Mockito.when(readyService.getAllEligibleJobContexts(failoverJobContexts)).thenReturn(readyJobContexts);
+ when(failoverService.getAllEligibleJobContexts()).thenReturn(failoverJobContexts);
+ when(readyService.getAllEligibleJobContexts(failoverJobContexts)).thenReturn(readyJobContexts);
Collection<JobContext> actual = facadeService.getEligibleJobContext();
- Assert.assertThat(actual.size(), Is.is(2));
+ assertThat(actual.size(), is(2));
int i = 0;
for (JobContext each : actual) {
switch (i) {
case 0:
- Assert.assertThat(each.getJobConfig().getJobName(), Is.is("failover_job"));
+ assertThat(each.getJobConfig().getJobName(), is("failover_job"));
break;
case 1:
- Assert.assertThat(each.getJobConfig().getJobName(), Is.is("ready_job"));
+ assertThat(each.getJobConfig().getJobName(), is("ready_job"));
break;
default:
break;
@@ -130,22 +135,22 @@ public final class FacadeServiceTest {
facadeService.removeLaunchTasksFromQueue(Arrays.asList(
TaskContext.from(TaskNode.builder().type(ExecutionType.FAILOVER).build().getTaskNodeValue()),
TaskContext.from(TaskNode.builder().build().getTaskNodeValue())));
- Mockito.verify(failoverService).remove(Collections.singletonList(TaskContext.MetaInfo.from(TaskNode.builder().build().getTaskNodePath())));
- Mockito.verify(readyService).remove(Sets.newHashSet("test_job"));
+ verify(failoverService).remove(Collections.singletonList(TaskContext.MetaInfo.from(TaskNode.builder().build().getTaskNodePath())));
+ verify(readyService).remove(Sets.newHashSet("test_job"));
}
@Test
public void assertAddRunning() {
TaskContext taskContext = TaskContext.from(TaskNode.builder().build().getTaskNodeValue());
facadeService.addRunning(taskContext);
- Mockito.verify(runningService).add(taskContext);
+ verify(runningService).add(taskContext);
}
@Test
public void assertUpdateDaemonStatus() {
TaskContext taskContext = TaskContext.from(TaskNode.builder().build().getTaskNodeValue());
facadeService.updateDaemonStatus(taskContext, true);
- Mockito.verify(runningService).updateIdle(taskContext, true);
+ verify(runningService).updateIdle(taskContext, true);
}
@Test
@@ -153,166 +158,166 @@ public final class FacadeServiceTest {
String taskNodeValue = TaskNode.builder().build().getTaskNodeValue();
TaskContext taskContext = TaskContext.from(taskNodeValue);
facadeService.removeRunning(taskContext);
- Mockito.verify(runningService).remove(taskContext);
+ verify(runningService).remove(taskContext);
}
@Test
public void assertRecordFailoverTaskWhenJobConfigNotExisted() {
TaskNode taskNode = TaskNode.builder().type(ExecutionType.FAILOVER).build();
- Mockito.when(jobConfigService.load("test_job")).thenReturn(Optional.empty());
+ when(jobConfigService.load("test_job")).thenReturn(Optional.empty());
facadeService.recordFailoverTask(TaskContext.from(taskNode.getTaskNodeValue()));
- Mockito.verify(failoverService, Mockito.times(0)).add(TaskContext.from(taskNode.getTaskNodeValue()));
+ verify(failoverService, times(0)).add(TaskContext.from(taskNode.getTaskNodeValue()));
}
@Test
public void assertRecordFailoverTaskWhenIsFailoverDisabled() {
TaskNode taskNode = TaskNode.builder().type(ExecutionType.FAILOVER).build();
- Mockito.when(jobConfigService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createOtherCloudJobConfiguration("test_job")));
+ when(jobConfigService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createOtherCloudJobConfiguration("test_job")));
facadeService.recordFailoverTask(TaskContext.from(taskNode.getTaskNodeValue()));
- Mockito.verify(failoverService, Mockito.times(0)).add(TaskContext.from(taskNode.getTaskNodeValue()));
+ verify(failoverService, times(0)).add(TaskContext.from(taskNode.getTaskNodeValue()));
}
@Test
public void assertRecordFailoverTaskWhenIsFailoverDisabledAndIsDaemonJob() {
TaskNode taskNode = TaskNode.builder().type(ExecutionType.FAILOVER).build();
- Mockito.when(jobConfigService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job", CloudJobExecutionType.DAEMON)));
+ when(jobConfigService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job", CloudJobExecutionType.DAEMON)));
facadeService.recordFailoverTask(TaskContext.from(taskNode.getTaskNodeValue()));
- Mockito.verify(failoverService).add(TaskContext.from(taskNode.getTaskNodeValue()));
+ verify(failoverService).add(TaskContext.from(taskNode.getTaskNodeValue()));
}
@Test
public void assertRecordFailoverTaskWhenIsFailoverEnabled() {
TaskNode taskNode = TaskNode.builder().type(ExecutionType.FAILOVER).build();
- Mockito.when(jobConfigService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job")));
+ when(jobConfigService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job")));
TaskContext taskContext = TaskContext.from(taskNode.getTaskNodeValue());
facadeService.recordFailoverTask(taskContext);
- Mockito.verify(failoverService).add(taskContext);
+ verify(failoverService).add(taskContext);
}
@Test
public void assertLoadAppConfig() {
Optional<CloudAppConfiguration> appConfigOptional = Optional.of(CloudAppConfigurationBuilder.createCloudAppConfiguration("test_app"));
- Mockito.when(appConfigService.load("test_app")).thenReturn(appConfigOptional);
- Assert.assertThat(facadeService.loadAppConfig("test_app"), Is.is(appConfigOptional));
+ when(appConfigService.load("test_app")).thenReturn(appConfigOptional);
+ assertThat(facadeService.loadAppConfig("test_app"), is(appConfigOptional));
}
@Test
public void assertLoadJobConfig() {
Optional<CloudJobConfiguration> jobConfigOptional = Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job"));
- Mockito.when(jobConfigService.load("test_job")).thenReturn(jobConfigOptional);
- Assert.assertThat(facadeService.load("test_job"), Is.is(jobConfigOptional));
+ when(jobConfigService.load("test_job")).thenReturn(jobConfigOptional);
+ assertThat(facadeService.load("test_job"), is(jobConfigOptional));
}
@Test
public void assertLoadAppConfigWhenAbsent() {
- Mockito.when(appConfigService.load("test_app")).thenReturn(Optional.empty());
- Assert.assertThat(facadeService.loadAppConfig("test_app"), Is.is(Optional.<CloudAppConfiguration>empty()));
+ when(appConfigService.load("test_app")).thenReturn(Optional.empty());
+ assertThat(facadeService.loadAppConfig("test_app"), is(Optional.<CloudAppConfiguration>empty()));
}
@Test
public void assertLoadJobConfigWhenAbsent() {
- Mockito.when(jobConfigService.load("test_job")).thenReturn(Optional.empty());
- Assert.assertThat(facadeService.load("test_job"), Is.is(Optional.<CloudJobConfiguration>empty()));
+ when(jobConfigService.load("test_job")).thenReturn(Optional.empty());
+ assertThat(facadeService.load("test_job"), is(Optional.<CloudJobConfiguration>empty()));
}
@Test
public void assertAddDaemonJobToReadyQueue() {
- Mockito.when(jobConfigService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job")));
+ when(jobConfigService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job")));
facadeService.addDaemonJobToReadyQueue("test_job");
- Mockito.verify(readyService).addDaemon("test_job");
+ verify(readyService).addDaemon("test_job");
}
@Test
public void assertIsRunningForReadyJobAndNotRunning() {
- Mockito.when(runningService.getRunningTasks("test_job")).thenReturn(Collections.emptyList());
- Assert.assertFalse(facadeService.isRunning(TaskContext.from(TaskNode.builder().type(ExecutionType.READY).build().getTaskNodeValue())));
+ when(runningService.getRunningTasks("test_job")).thenReturn(Collections.emptyList());
+ assertFalse(facadeService.isRunning(TaskContext.from(TaskNode.builder().type(ExecutionType.READY).build().getTaskNodeValue())));
}
@Test
public void assertIsRunningForFailoverJobAndNotRunning() {
- Mockito.when(runningService.isTaskRunning(TaskContext.from(TaskNode.builder().type(ExecutionType.FAILOVER).build().getTaskNodeValue()).getMetaInfo())).thenReturn(false);
- Assert.assertFalse(facadeService.isRunning(TaskContext.from(TaskNode.builder().type(ExecutionType.FAILOVER).build().getTaskNodeValue())));
+ when(runningService.isTaskRunning(TaskContext.from(TaskNode.builder().type(ExecutionType.FAILOVER).build().getTaskNodeValue()).getMetaInfo())).thenReturn(false);
+ assertFalse(facadeService.isRunning(TaskContext.from(TaskNode.builder().type(ExecutionType.FAILOVER).build().getTaskNodeValue())));
}
@Test
public void assertIsRunningForFailoverJobAndRunning() {
- Mockito.when(runningService.isTaskRunning(TaskContext.from(TaskNode.builder().type(ExecutionType.FAILOVER).build().getTaskNodeValue()).getMetaInfo())).thenReturn(true);
- Assert.assertTrue(facadeService.isRunning(TaskContext.from(TaskNode.builder().type(ExecutionType.FAILOVER).build().getTaskNodeValue())));
+ when(runningService.isTaskRunning(TaskContext.from(TaskNode.builder().type(ExecutionType.FAILOVER).build().getTaskNodeValue()).getMetaInfo())).thenReturn(true);
+ assertTrue(facadeService.isRunning(TaskContext.from(TaskNode.builder().type(ExecutionType.FAILOVER).build().getTaskNodeValue())));
}
@Test
public void assertAddMapping() {
facadeService.addMapping("taskId", "localhost");
- Mockito.verify(runningService).addMapping("taskId", "localhost");
+ verify(runningService).addMapping("taskId", "localhost");
}
@Test
public void assertPopMapping() {
facadeService.popMapping("taskId");
- Mockito.verify(runningService).popMapping("taskId");
+ verify(runningService).popMapping("taskId");
}
@Test
public void assertStop() {
facadeService.stop();
- Mockito.verify(runningService).clear();
+ verify(runningService).clear();
}
@Test
public void assertGetFailoverTaskId() {
TaskNode taskNode = TaskNode.builder().type(ExecutionType.FAILOVER).build();
- Mockito.when(jobConfigService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job")));
+ when(jobConfigService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job")));
TaskContext taskContext = TaskContext.from(taskNode.getTaskNodeValue());
facadeService.recordFailoverTask(taskContext);
- Mockito.verify(failoverService).add(taskContext);
+ verify(failoverService).add(taskContext);
facadeService.getFailoverTaskId(taskContext.getMetaInfo());
- Mockito.verify(failoverService).getTaskId(taskContext.getMetaInfo());
+ verify(failoverService).getTaskId(taskContext.getMetaInfo());
}
@Test
public void assertJobDisabledWhenAppEnabled() {
- Mockito.when(jobConfigService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job")));
- Mockito.when(disableAppService.isDisabled("test_app")).thenReturn(false);
- Mockito.when(disableJobService.isDisabled("test_job")).thenReturn(true);
- Assert.assertTrue(facadeService.isJobDisabled("test_job"));
+ when(jobConfigService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job")));
+ when(disableAppService.isDisabled("test_app")).thenReturn(false);
+ when(disableJobService.isDisabled("test_job")).thenReturn(true);
+ assertTrue(facadeService.isJobDisabled("test_job"));
}
@Test
public void assertIsJobEnabled() {
- Mockito.when(jobConfigService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job")));
- Assert.assertFalse(facadeService.isJobDisabled("test_job"));
+ when(jobConfigService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job")));
+ assertFalse(facadeService.isJobDisabled("test_job"));
}
@Test
public void assertIsJobDisabledWhenAppDisabled() {
- Mockito.when(jobConfigService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job")));
- Mockito.when(disableAppService.isDisabled("test_app")).thenReturn(true);
- Assert.assertTrue(facadeService.isJobDisabled("test_job"));
+ when(jobConfigService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job")));
+ when(disableAppService.isDisabled("test_app")).thenReturn(true);
+ assertTrue(facadeService.isJobDisabled("test_job"));
}
@Test
public void assertIsJobDisabledWhenAppEnabled() {
- Mockito.when(jobConfigService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job")));
- Mockito.when(disableAppService.isDisabled("test_app")).thenReturn(false);
- Mockito.when(disableJobService.isDisabled("test_job")).thenReturn(true);
- Assert.assertTrue(facadeService.isJobDisabled("test_job"));
+ when(jobConfigService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job")));
+ when(disableAppService.isDisabled("test_app")).thenReturn(false);
+ when(disableJobService.isDisabled("test_job")).thenReturn(true);
+ assertTrue(facadeService.isJobDisabled("test_job"));
}
@Test
public void assertEnableJob() {
facadeService.enableJob("test_job");
- Mockito.verify(disableJobService).remove("test_job");
+ verify(disableJobService).remove("test_job");
}
@Test
public void assertDisableJob() {
facadeService.disableJob("test_job");
- Mockito.verify(disableJobService).add("test_job");
+ verify(disableJobService).add("test_job");
}
@Test
public void assertLoadExecutor() throws Exception {
facadeService.loadExecutorInfo();
- Mockito.verify(mesosStateService).executors();
+ verify(mesosStateService).executors();
}
}
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 1723bc7..604ad31 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
@@ -17,17 +17,19 @@
package org.apache.shardingsphere.elasticjob.cloud.scheduler.mesos;
-import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.CloudJobConfigurationBuilder;
+import com.netflix.fenzo.TaskRequest;
import org.apache.shardingsphere.elasticjob.cloud.context.ExecutionType;
import org.apache.shardingsphere.elasticjob.cloud.context.TaskContext;
-import com.netflix.fenzo.TaskRequest;
-import org.hamcrest.core.Is;
+import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.CloudJobConfigurationBuilder;
import org.hamcrest.core.StringStartsWith;
-import org.junit.Assert;
import org.junit.Test;
import java.util.Collections;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+
public final class JobTaskRequestTest {
private final JobTaskRequest jobTaskRequest =
@@ -36,53 +38,53 @@ public final class JobTaskRequestTest {
@Test
public void assertGetId() {
- Assert.assertThat(jobTaskRequest.getId(), StringStartsWith.startsWith("test_job@-@0@-@READY@-@unassigned-slave"));
+ assertThat(jobTaskRequest.getId(), StringStartsWith.startsWith("test_job@-@0@-@READY@-@unassigned-slave"));
}
@Test
public void assertTaskGroupName() {
- Assert.assertThat(jobTaskRequest.taskGroupName(), Is.is(""));
+ assertThat(jobTaskRequest.taskGroupName(), is(""));
}
@Test
public void assertGetCPUs() {
- Assert.assertThat(jobTaskRequest.getCPUs(), Is.is(1.0d));
+ assertThat(jobTaskRequest.getCPUs(), is(1.0d));
}
@Test
public void assertGetMemory() {
- Assert.assertThat(jobTaskRequest.getMemory(), Is.is(128.0d));
+ assertThat(jobTaskRequest.getMemory(), is(128.0d));
}
@Test
public void assertGetNetworkMbps() {
- Assert.assertThat(jobTaskRequest.getNetworkMbps(), Is.is(0d));
+ assertThat(jobTaskRequest.getNetworkMbps(), is(0d));
}
@Test
public void assertGetDisk() {
- Assert.assertThat(jobTaskRequest.getDisk(), Is.is(10d));
+ assertThat(jobTaskRequest.getDisk(), is(10d));
}
@Test
public void assertGetPorts() {
- Assert.assertThat(jobTaskRequest.getPorts(), Is.is(1));
+ assertThat(jobTaskRequest.getPorts(), is(1));
}
@Test
public void assertGetScalarRequests() {
- Assert.assertNull(jobTaskRequest.getScalarRequests());
+ assertNull(jobTaskRequest.getScalarRequests());
}
@Test
public void assertGetHardConstraints() {
AppConstraintEvaluator.init(null);
- Assert.assertThat(jobTaskRequest.getHardConstraints().size(), Is.is(1));
+ assertThat(jobTaskRequest.getHardConstraints().size(), is(1));
}
@Test
public void assertGetSoftConstraints() {
- Assert.assertNull(jobTaskRequest.getSoftConstraints());
+ assertNull(jobTaskRequest.getSoftConstraints());
}
@Test
@@ -92,11 +94,11 @@ public final class JobTaskRequestTest {
@Test
public void assertGetAssignedResources() {
- Assert.assertNull(jobTaskRequest.getAssignedResources());
+ assertNull(jobTaskRequest.getAssignedResources());
}
@Test
public void assertGetCustomNamedResources() {
- Assert.assertThat(jobTaskRequest.getCustomNamedResources(), Is.is(Collections.<String, TaskRequest.NamedResourceSetRequest>emptyMap()));
+ assertThat(jobTaskRequest.getCustomNamedResources(), is(Collections.<String, TaskRequest.NamedResourceSetRequest>emptyMap()));
}
}
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 0cc4857..f4535ca 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
@@ -17,28 +17,29 @@
package org.apache.shardingsphere.elasticjob.cloud.scheduler.mesos;
+import com.netflix.fenzo.TaskRequest;
+import org.apache.shardingsphere.elasticjob.cloud.context.ExecutionType;
+import org.apache.shardingsphere.elasticjob.cloud.reg.base.CoordinatorRegistryCenter;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.config.job.CloudJobConfigurationService;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.context.JobContext;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.CloudJobConfigurationBuilder;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.state.failover.FailoverService;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.state.ready.ReadyService;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.state.running.RunningService;
-import org.apache.shardingsphere.elasticjob.cloud.context.ExecutionType;
-import org.apache.shardingsphere.elasticjob.cloud.reg.base.CoordinatorRegistryCenter;
-import com.netflix.fenzo.TaskRequest;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.unitils.util.ReflectionUtils;
import java.util.Arrays;
import java.util.List;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.when;
+
@RunWith(MockitoJUnitRunner.class)
public final class LaunchingTasksTest {
@@ -68,7 +69,7 @@ public final class LaunchingTasksTest {
ReflectionUtils.setFieldValue(facadeService, "readyService", readyService);
ReflectionUtils.setFieldValue(facadeService, "runningService", runningService);
ReflectionUtils.setFieldValue(facadeService, "failoverService", failoverService);
- Mockito.when(facadeService.getEligibleJobContext()).thenReturn(Arrays.asList(
+ when(facadeService.getEligibleJobContext()).thenReturn(Arrays.asList(
JobContext.from(CloudJobConfigurationBuilder.createCloudJobConfiguration("ready_job"), ExecutionType.READY),
JobContext.from(CloudJobConfigurationBuilder.createCloudJobConfiguration("failover_job"), ExecutionType.FAILOVER)));
launchingTasks = new LaunchingTasks(facadeService.getEligibleJobContext());
@@ -77,6 +78,6 @@ public final class LaunchingTasksTest {
@Test
public void assertGetPendingTasks() {
List<TaskRequest> actual = launchingTasks.getPendingTasks();
- Assert.assertThat(actual.size(), Is.is(20));
+ assertThat(actual.size(), is(20));
}
}
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 73cb868..8c52860 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,19 +18,21 @@
package org.apache.shardingsphere.elasticjob.cloud.scheduler.mesos;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.mesos.fixture.OfferBuilder;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
public final class LeasesQueueTest {
private LeasesQueue leasesQueue = LeasesQueue.getInstance();
@Test
public void assertOperate() {
- Assert.assertTrue(leasesQueue.drainTo().isEmpty());
+ assertTrue(leasesQueue.drainTo().isEmpty());
leasesQueue.offer(OfferBuilder.createOffer("offer_1"));
leasesQueue.offer(OfferBuilder.createOffer("offer_2"));
- Assert.assertThat(leasesQueue.drainTo().size(), Is.is(2));
+ assertThat(leasesQueue.drainTo().size(), is(2));
}
}
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 0ae217e..9a12d77 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
@@ -17,20 +17,21 @@
package org.apache.shardingsphere.elasticjob.cloud.scheduler.mesos;
+import com.google.gson.JsonArray;
+import org.apache.shardingsphere.elasticjob.cloud.reg.base.CoordinatorRegistryCenter;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.ha.HANode;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.restful.AbstractCloudRestfulApiTest;
-import org.apache.shardingsphere.elasticjob.cloud.reg.base.CoordinatorRegistryCenter;
-import com.google.gson.JsonArray;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import java.util.Collection;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.when;
+
@RunWith(MockitoJUnitRunner.class)
public class MesosStateServiceTest extends AbstractCloudRestfulApiTest {
@@ -39,34 +40,34 @@ public class MesosStateServiceTest extends AbstractCloudRestfulApiTest {
@Test
public void assertSandbox() throws Exception {
- Mockito.when(registryCenter.getDirectly(HANode.FRAMEWORK_ID_NODE)).thenReturn("d8701508-41b7-471e-9b32-61cf824a660d-0000");
+ when(registryCenter.getDirectly(HANode.FRAMEWORK_ID_NODE)).thenReturn("d8701508-41b7-471e-9b32-61cf824a660d-0000");
MesosStateService service = new MesosStateService(registryCenter);
JsonArray sandbox = service.sandbox("foo_app");
- Assert.assertThat(sandbox.size(), Is.is(1));
- Assert.assertThat(sandbox.get(0).getAsJsonObject().get("hostname").getAsString(), Is.is("127.0.0.1"));
- Assert.assertThat(sandbox.get(0).getAsJsonObject().get("path").getAsString(), Is.is("/slaves/d8701508-41b7-471e-9b32-61cf824a660d-S0/"
+ assertThat(sandbox.size(), is(1));
+ assertThat(sandbox.get(0).getAsJsonObject().get("hostname").getAsString(), is("127.0.0.1"));
+ assertThat(sandbox.get(0).getAsJsonObject().get("path").getAsString(), is("/slaves/d8701508-41b7-471e-9b32-61cf824a660d-S0/"
+ "frameworks/d8701508-41b7-471e-9b32-61cf824a660d-0000/executors/foo_app@-@d8701508-41b7-471e-9b32-61cf824a660d-S0/runs/53fb4af7-aee2-44f6-9e47-6f418d9f27e1"));
}
@Test
public void assertExecutors() throws Exception {
- Mockito.when(registryCenter.getDirectly(HANode.FRAMEWORK_ID_NODE)).thenReturn("d8701508-41b7-471e-9b32-61cf824a660d-0000");
+ when(registryCenter.getDirectly(HANode.FRAMEWORK_ID_NODE)).thenReturn("d8701508-41b7-471e-9b32-61cf824a660d-0000");
MesosStateService service = new MesosStateService(registryCenter);
Collection<MesosStateService.ExecutorStateInfo> executorStateInfo = service.executors("foo_app");
- Assert.assertThat(executorStateInfo.size(), Is.is(1));
+ assertThat(executorStateInfo.size(), is(1));
MesosStateService.ExecutorStateInfo executor = executorStateInfo.iterator().next();
- Assert.assertThat(executor.getId(), Is.is("foo_app@-@d8701508-41b7-471e-9b32-61cf824a660d-S0"));
- Assert.assertThat(executor.getSlaveId(), Is.is("d8701508-41b7-471e-9b32-61cf824a660d-S0"));
+ assertThat(executor.getId(), is("foo_app@-@d8701508-41b7-471e-9b32-61cf824a660d-S0"));
+ assertThat(executor.getSlaveId(), is("d8701508-41b7-471e-9b32-61cf824a660d-S0"));
}
@Test
public void assertAllExecutors() throws Exception {
- Mockito.when(registryCenter.getDirectly(HANode.FRAMEWORK_ID_NODE)).thenReturn("d8701508-41b7-471e-9b32-61cf824a660d-0000");
+ when(registryCenter.getDirectly(HANode.FRAMEWORK_ID_NODE)).thenReturn("d8701508-41b7-471e-9b32-61cf824a660d-0000");
MesosStateService service = new MesosStateService(registryCenter);
Collection<MesosStateService.ExecutorStateInfo> executorStateInfo = service.executors();
- Assert.assertThat(executorStateInfo.size(), Is.is(1));
+ assertThat(executorStateInfo.size(), is(1));
MesosStateService.ExecutorStateInfo executor = executorStateInfo.iterator().next();
- Assert.assertThat(executor.getId(), Is.is("foo_app@-@d8701508-41b7-471e-9b32-61cf824a660d-S0"));
- Assert.assertThat(executor.getSlaveId(), Is.is("d8701508-41b7-471e-9b32-61cf824a660d-S0"));
+ assertThat(executor.getId(), is("foo_app@-@d8701508-41b7-471e-9b32-61cf824a660d-S0"));
+ assertThat(executor.getSlaveId(), is("d8701508-41b7-471e-9b32-61cf824a660d-S0"));
}
}
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 1fcd854..47d7301 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
@@ -30,14 +30,11 @@ import org.apache.shardingsphere.elasticjob.cloud.scheduler.mesos.fixture.OfferB
import org.apache.shardingsphere.elasticjob.cloud.scheduler.state.running.RunningService;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.statistics.StatisticManager;
import org.apache.shardingsphere.elasticjob.tracing.JobEventBus;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
-import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.unitils.util.ReflectionUtils;
@@ -45,6 +42,13 @@ import java.util.Arrays;
import java.util.List;
import java.util.Optional;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+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)
public final class SchedulerEngineTest {
@@ -66,35 +70,35 @@ public final class SchedulerEngineTest {
public void setUp() throws NoSuchFieldException {
schedulerEngine = new SchedulerEngine(taskScheduler, facadeService, new JobEventBus(), frameworkIDService, statisticManager);
ReflectionUtils.setFieldValue(schedulerEngine, "facadeService", facadeService);
- Mockito.when(facadeService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job")));
- new RunningService(Mockito.mock(CoordinatorRegistryCenter.class)).clear();
+ when(facadeService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job")));
+ new RunningService(mock(CoordinatorRegistryCenter.class)).clear();
}
@Test
public void assertRegistered() {
schedulerEngine.registered(null, Protos.FrameworkID.newBuilder().setValue("1").build(), Protos.MasterInfo.getDefaultInstance());
- Mockito.verify(taskScheduler).expireAllLeases();
- Mockito.verify(frameworkIDService).save("1");
+ verify(taskScheduler).expireAllLeases();
+ verify(frameworkIDService).save("1");
}
@Test
public void assertReregistered() {
schedulerEngine.reregistered(null, Protos.MasterInfo.getDefaultInstance());
- Mockito.verify(taskScheduler).expireAllLeases();
+ verify(taskScheduler).expireAllLeases();
}
@Test
public void assertResourceOffers() {
- SchedulerDriver schedulerDriver = Mockito.mock(SchedulerDriver.class);
+ SchedulerDriver schedulerDriver = mock(SchedulerDriver.class);
List<Protos.Offer> offers = Arrays.asList(OfferBuilder.createOffer("offer_0"), OfferBuilder.createOffer("offer_1"));
schedulerEngine.resourceOffers(schedulerDriver, offers);
- Assert.assertThat(LeasesQueue.getInstance().drainTo().size(), Is.is(2));
+ assertThat(LeasesQueue.getInstance().drainTo().size(), is(2));
}
@Test
public void assertOfferRescinded() {
schedulerEngine.offerRescinded(null, Protos.OfferID.newBuilder().setValue("myOffer").build());
- Mockito.verify(taskScheduler).expireLease("myOffer");
+ verify(taskScheduler).expireLease("myOffer");
}
@Test
@@ -102,7 +106,7 @@ public final class SchedulerEngineTest {
TaskNode taskNode = TaskNode.builder().build();
schedulerEngine.statusUpdate(null, Protos.TaskStatus.newBuilder().setTaskId(Protos.TaskID.newBuilder().setValue(taskNode.getTaskNodeValue()))
.setState(Protos.TaskState.TASK_RUNNING).setMessage("BEGIN").setSlaveId(Protos.SlaveID.newBuilder().setValue("slave-S0")).build());
- Mockito.verify(facadeService).updateDaemonStatus(TaskContext.from(taskNode.getTaskNodeValue()), false);
+ verify(facadeService).updateDaemonStatus(TaskContext.from(taskNode.getTaskNodeValue()), false);
}
@Test
@@ -110,7 +114,7 @@ public final class SchedulerEngineTest {
TaskNode taskNode = TaskNode.builder().build();
schedulerEngine.statusUpdate(null, Protos.TaskStatus.newBuilder().setTaskId(Protos.TaskID.newBuilder().setValue(taskNode.getTaskNodeValue()))
.setState(Protos.TaskState.TASK_RUNNING).setMessage("COMPLETE").setSlaveId(Protos.SlaveID.newBuilder().setValue("slave-S0")).build());
- Mockito.verify(facadeService).updateDaemonStatus(TaskContext.from(taskNode.getTaskNodeValue()), true);
+ verify(facadeService).updateDaemonStatus(TaskContext.from(taskNode.getTaskNodeValue()), true);
}
@Test
@@ -118,7 +122,7 @@ public final class SchedulerEngineTest {
TaskNode taskNode = TaskNode.builder().build();
schedulerEngine.statusUpdate(null, Protos.TaskStatus.newBuilder().setTaskId(Protos.TaskID.newBuilder().setValue(taskNode.getTaskNodeValue()))
.setState(Protos.TaskState.TASK_RUNNING).setSlaveId(Protos.SlaveID.newBuilder().setValue("slave-S0")).build());
- Mockito.verify(facadeService, Mockito.times(0)).updateDaemonStatus(TaskContext.from(taskNode.getTaskNodeValue()), ArgumentMatchers.eq(ArgumentMatchers.anyBoolean()));
+ verify(facadeService, times(0)).updateDaemonStatus(TaskContext.from(taskNode.getTaskNodeValue()), ArgumentMatchers.eq(ArgumentMatchers.anyBoolean()));
}
@Test
@@ -126,128 +130,128 @@ public final class SchedulerEngineTest {
TaskNode taskNode = TaskNode.builder().build();
schedulerEngine.statusUpdate(null, Protos.TaskStatus.newBuilder().setTaskId(Protos.TaskID.newBuilder().setValue(taskNode.getTaskNodeValue()))
.setState(Protos.TaskState.TASK_FINISHED).setSlaveId(Protos.SlaveID.newBuilder().setValue("slave-S0")).build());
- Mockito.verify(facadeService).removeRunning(TaskContext.from(taskNode.getTaskNodeValue()));
- Mockito.verify(taskScheduler, Mockito.times(0)).getTaskUnAssigner();
+ verify(facadeService).removeRunning(TaskContext.from(taskNode.getTaskNodeValue()));
+ verify(taskScheduler, times(0)).getTaskUnAssigner();
}
@Test
public void assertFinishedStatusUpdate() {
@SuppressWarnings("unchecked")
- Action2<String, String> taskUnAssigner = Mockito.mock(Action2.class);
- Mockito.when(taskScheduler.getTaskUnAssigner()).thenReturn(taskUnAssigner);
+ Action2<String, String> taskUnAssigner = mock(Action2.class);
+ when(taskScheduler.getTaskUnAssigner()).thenReturn(taskUnAssigner);
TaskNode taskNode = TaskNode.builder().build();
- Mockito.when(facadeService.popMapping(taskNode.getTaskNodeValue())).thenReturn("localhost");
+ when(facadeService.popMapping(taskNode.getTaskNodeValue())).thenReturn("localhost");
schedulerEngine.statusUpdate(null, Protos.TaskStatus.newBuilder().setTaskId(Protos.TaskID.newBuilder().setValue(taskNode.getTaskNodeValue()))
.setState(Protos.TaskState.TASK_FINISHED).setSlaveId(Protos.SlaveID.newBuilder().setValue("slave-S0")).build());
- Mockito.verify(facadeService).removeRunning(TaskContext.from(taskNode.getTaskNodeValue()));
- Mockito.verify(taskUnAssigner).call(TaskContext.getIdForUnassignedSlave(taskNode.getTaskNodeValue()), "localhost");
- Mockito.verify(statisticManager).taskRunSuccessfully();
+ verify(facadeService).removeRunning(TaskContext.from(taskNode.getTaskNodeValue()));
+ verify(taskUnAssigner).call(TaskContext.getIdForUnassignedSlave(taskNode.getTaskNodeValue()), "localhost");
+ verify(statisticManager).taskRunSuccessfully();
}
@Test
public void assertKilledStatusUpdate() {
@SuppressWarnings("unchecked")
- Action2<String, String> taskUnAssigner = Mockito.mock(Action2.class);
- Mockito.when(taskScheduler.getTaskUnAssigner()).thenReturn(taskUnAssigner);
+ Action2<String, String> taskUnAssigner = mock(Action2.class);
+ when(taskScheduler.getTaskUnAssigner()).thenReturn(taskUnAssigner);
TaskNode taskNode = TaskNode.builder().build();
- Mockito.when(facadeService.popMapping(taskNode.getTaskNodeValue())).thenReturn("localhost");
+ when(facadeService.popMapping(taskNode.getTaskNodeValue())).thenReturn("localhost");
schedulerEngine.statusUpdate(null, Protos.TaskStatus.newBuilder().setTaskId(Protos.TaskID.newBuilder().setValue(taskNode.getTaskNodeValue()))
.setState(Protos.TaskState.TASK_KILLED).setSlaveId(Protos.SlaveID.newBuilder().setValue("slave-S0")).build());
- Mockito.verify(facadeService).removeRunning(TaskContext.from(taskNode.getTaskNodeValue()));
- Mockito.verify(facadeService).addDaemonJobToReadyQueue("test_job");
- Mockito.verify(taskUnAssigner).call(TaskContext.getIdForUnassignedSlave(taskNode.getTaskNodeValue()), "localhost");
+ verify(facadeService).removeRunning(TaskContext.from(taskNode.getTaskNodeValue()));
+ verify(facadeService).addDaemonJobToReadyQueue("test_job");
+ verify(taskUnAssigner).call(TaskContext.getIdForUnassignedSlave(taskNode.getTaskNodeValue()), "localhost");
}
@Test
public void assertFailedStatusUpdate() {
@SuppressWarnings("unchecked")
- Action2<String, String> taskUnAssigner = Mockito.mock(Action2.class);
- Mockito.when(taskScheduler.getTaskUnAssigner()).thenReturn(taskUnAssigner);
+ Action2<String, String> taskUnAssigner = mock(Action2.class);
+ when(taskScheduler.getTaskUnAssigner()).thenReturn(taskUnAssigner);
TaskNode taskNode = TaskNode.builder().build();
- Mockito.when(facadeService.popMapping(taskNode.getTaskNodeValue())).thenReturn("localhost");
+ when(facadeService.popMapping(taskNode.getTaskNodeValue())).thenReturn("localhost");
schedulerEngine.statusUpdate(null, Protos.TaskStatus.newBuilder().setTaskId(Protos.TaskID.newBuilder().setValue(taskNode.getTaskNodeValue()))
.setState(Protos.TaskState.TASK_FAILED).setSlaveId(Protos.SlaveID.newBuilder().setValue("slave-S0")).build());
- Mockito.verify(facadeService).recordFailoverTask(TaskContext.from(taskNode.getTaskNodeValue()));
- Mockito.verify(facadeService).removeRunning(TaskContext.from(taskNode.getTaskNodeValue()));
- Mockito.verify(taskUnAssigner).call(TaskContext.getIdForUnassignedSlave(taskNode.getTaskNodeValue()), "localhost");
- Mockito.verify(statisticManager).taskRunFailed();
+ verify(facadeService).recordFailoverTask(TaskContext.from(taskNode.getTaskNodeValue()));
+ verify(facadeService).removeRunning(TaskContext.from(taskNode.getTaskNodeValue()));
+ verify(taskUnAssigner).call(TaskContext.getIdForUnassignedSlave(taskNode.getTaskNodeValue()), "localhost");
+ verify(statisticManager).taskRunFailed();
}
@Test
public void assertErrorStatusUpdate() {
@SuppressWarnings("unchecked")
- Action2<String, String> taskUnAssigner = Mockito.mock(Action2.class);
- Mockito.when(taskScheduler.getTaskUnAssigner()).thenReturn(taskUnAssigner);
+ Action2<String, String> taskUnAssigner = mock(Action2.class);
+ when(taskScheduler.getTaskUnAssigner()).thenReturn(taskUnAssigner);
TaskNode taskNode = TaskNode.builder().build();
- Mockito.when(facadeService.popMapping(taskNode.getTaskNodeValue())).thenReturn("localhost");
+ when(facadeService.popMapping(taskNode.getTaskNodeValue())).thenReturn("localhost");
schedulerEngine.statusUpdate(null, Protos.TaskStatus.newBuilder().setTaskId(Protos.TaskID.newBuilder().setValue(taskNode.getTaskNodeValue()))
.setState(Protos.TaskState.TASK_ERROR).setSlaveId(Protos.SlaveID.newBuilder().setValue("slave-S0")).build());
- Mockito.verify(facadeService).recordFailoverTask(TaskContext.from(taskNode.getTaskNodeValue()));
- Mockito.verify(facadeService).removeRunning(TaskContext.from(taskNode.getTaskNodeValue()));
- Mockito.verify(taskUnAssigner).call(TaskContext.getIdForUnassignedSlave(taskNode.getTaskNodeValue()), "localhost");
- Mockito.verify(statisticManager).taskRunFailed();
+ verify(facadeService).recordFailoverTask(TaskContext.from(taskNode.getTaskNodeValue()));
+ verify(facadeService).removeRunning(TaskContext.from(taskNode.getTaskNodeValue()));
+ verify(taskUnAssigner).call(TaskContext.getIdForUnassignedSlave(taskNode.getTaskNodeValue()), "localhost");
+ verify(statisticManager).taskRunFailed();
}
@Test
public void assertLostStatusUpdate() {
@SuppressWarnings("unchecked")
- Action2<String, String> taskUnAssigner = Mockito.mock(Action2.class);
- Mockito.when(taskScheduler.getTaskUnAssigner()).thenReturn(taskUnAssigner);
+ Action2<String, String> taskUnAssigner = mock(Action2.class);
+ when(taskScheduler.getTaskUnAssigner()).thenReturn(taskUnAssigner);
TaskNode taskNode = TaskNode.builder().build();
- Mockito.when(facadeService.popMapping(taskNode.getTaskNodeValue())).thenReturn("localhost");
+ when(facadeService.popMapping(taskNode.getTaskNodeValue())).thenReturn("localhost");
schedulerEngine.statusUpdate(null, Protos.TaskStatus.newBuilder()
.setTaskId(Protos.TaskID.newBuilder().setValue(taskNode.getTaskNodeValue())).setState(Protos.TaskState.TASK_LOST).setSlaveId(Protos.SlaveID.newBuilder().setValue("slave-S0")).build());
- Mockito.verify(facadeService).recordFailoverTask(TaskContext.from(taskNode.getTaskNodeValue()));
- Mockito.verify(facadeService).removeRunning(TaskContext.from(taskNode.getTaskNodeValue()));
- Mockito.verify(taskUnAssigner).call(TaskContext.getIdForUnassignedSlave(taskNode.getTaskNodeValue()), "localhost");
- Mockito.verify(statisticManager).taskRunFailed();
+ verify(facadeService).recordFailoverTask(TaskContext.from(taskNode.getTaskNodeValue()));
+ verify(facadeService).removeRunning(TaskContext.from(taskNode.getTaskNodeValue()));
+ verify(taskUnAssigner).call(TaskContext.getIdForUnassignedSlave(taskNode.getTaskNodeValue()), "localhost");
+ verify(statisticManager).taskRunFailed();
}
@Test
public void assertDroppedStatusUpdate() {
@SuppressWarnings("unchecked")
- Action2<String, String> taskUnAssigner = Mockito.mock(Action2.class);
- Mockito.when(taskScheduler.getTaskUnAssigner()).thenReturn(taskUnAssigner);
+ Action2<String, String> taskUnAssigner = mock(Action2.class);
+ when(taskScheduler.getTaskUnAssigner()).thenReturn(taskUnAssigner);
TaskNode taskNode = TaskNode.builder().build();
- Mockito.when(facadeService.popMapping(taskNode.getTaskNodeValue())).thenReturn("localhost");
+ when(facadeService.popMapping(taskNode.getTaskNodeValue())).thenReturn("localhost");
schedulerEngine.statusUpdate(null, Protos.TaskStatus.newBuilder()
.setTaskId(Protos.TaskID.newBuilder().setValue(taskNode.getTaskNodeValue())).setState(Protos.TaskState.TASK_DROPPED)
.setSlaveId(Protos.SlaveID.newBuilder().setValue("slave-S0")).build());
- Mockito.verify(facadeService).recordFailoverTask(TaskContext.from(taskNode.getTaskNodeValue()));
- Mockito.verify(facadeService).removeRunning(TaskContext.from(taskNode.getTaskNodeValue()));
- Mockito.verify(taskUnAssigner).call(TaskContext.getIdForUnassignedSlave(taskNode.getTaskNodeValue()), "localhost");
- Mockito.verify(statisticManager).taskRunFailed();
+ verify(facadeService).recordFailoverTask(TaskContext.from(taskNode.getTaskNodeValue()));
+ verify(facadeService).removeRunning(TaskContext.from(taskNode.getTaskNodeValue()));
+ verify(taskUnAssigner).call(TaskContext.getIdForUnassignedSlave(taskNode.getTaskNodeValue()), "localhost");
+ verify(statisticManager).taskRunFailed();
}
@Test
public void assertGoneStatusUpdate() {
@SuppressWarnings("unchecked")
- Action2<String, String> taskUnAssigner = Mockito.mock(Action2.class);
- Mockito.when(taskScheduler.getTaskUnAssigner()).thenReturn(taskUnAssigner);
+ Action2<String, String> taskUnAssigner = mock(Action2.class);
+ when(taskScheduler.getTaskUnAssigner()).thenReturn(taskUnAssigner);
TaskNode taskNode = TaskNode.builder().build();
- Mockito.when(facadeService.popMapping(taskNode.getTaskNodeValue())).thenReturn("localhost");
+ when(facadeService.popMapping(taskNode.getTaskNodeValue())).thenReturn("localhost");
schedulerEngine.statusUpdate(null, Protos.TaskStatus.newBuilder()
.setTaskId(Protos.TaskID.newBuilder().setValue(taskNode.getTaskNodeValue())).setState(Protos.TaskState.TASK_GONE).setSlaveId(Protos.SlaveID.newBuilder().setValue("slave-S0")).build());
- Mockito.verify(facadeService).recordFailoverTask(TaskContext.from(taskNode.getTaskNodeValue()));
- Mockito.verify(facadeService).removeRunning(TaskContext.from(taskNode.getTaskNodeValue()));
- Mockito.verify(taskUnAssigner).call(TaskContext.getIdForUnassignedSlave(taskNode.getTaskNodeValue()), "localhost");
- Mockito.verify(statisticManager).taskRunFailed();
+ verify(facadeService).recordFailoverTask(TaskContext.from(taskNode.getTaskNodeValue()));
+ verify(facadeService).removeRunning(TaskContext.from(taskNode.getTaskNodeValue()));
+ verify(taskUnAssigner).call(TaskContext.getIdForUnassignedSlave(taskNode.getTaskNodeValue()), "localhost");
+ verify(statisticManager).taskRunFailed();
}
@Test
public void assertGoneByOperatorStatusUpdate() {
@SuppressWarnings("unchecked")
- Action2<String, String> taskUnAssigner = Mockito.mock(Action2.class);
- Mockito.when(taskScheduler.getTaskUnAssigner()).thenReturn(taskUnAssigner);
+ Action2<String, String> taskUnAssigner = mock(Action2.class);
+ when(taskScheduler.getTaskUnAssigner()).thenReturn(taskUnAssigner);
TaskNode taskNode = TaskNode.builder().build();
- Mockito.when(facadeService.popMapping(taskNode.getTaskNodeValue())).thenReturn("localhost");
+ when(facadeService.popMapping(taskNode.getTaskNodeValue())).thenReturn("localhost");
schedulerEngine.statusUpdate(null, Protos.TaskStatus.newBuilder()
.setTaskId(Protos.TaskID.newBuilder().setValue(taskNode.getTaskNodeValue())).setState(Protos.TaskState.TASK_GONE_BY_OPERATOR)
.setSlaveId(Protos.SlaveID.newBuilder().setValue("slave-S0")).build());
- Mockito.verify(facadeService).recordFailoverTask(TaskContext.from(taskNode.getTaskNodeValue()));
- Mockito.verify(facadeService).removeRunning(TaskContext.from(taskNode.getTaskNodeValue()));
- Mockito.verify(taskUnAssigner).call(TaskContext.getIdForUnassignedSlave(taskNode.getTaskNodeValue()), "localhost");
- Mockito.verify(statisticManager).taskRunFailed();
+ verify(facadeService).recordFailoverTask(TaskContext.from(taskNode.getTaskNodeValue()));
+ verify(facadeService).removeRunning(TaskContext.from(taskNode.getTaskNodeValue()));
+ verify(taskUnAssigner).call(TaskContext.getIdForUnassignedSlave(taskNode.getTaskNodeValue()), "localhost");
+ verify(statisticManager).taskRunFailed();
}
@Test
@@ -256,7 +260,7 @@ public final class SchedulerEngineTest {
schedulerEngine.statusUpdate(null, Protos.TaskStatus.newBuilder()
.setTaskId(Protos.TaskID.newBuilder().setValue(taskNode.getTaskNodeValue())).setState(Protos.TaskState.TASK_UNKNOWN)
.setSlaveId(Protos.SlaveID.newBuilder().setValue("slave-S0")).build());
- Mockito.verify(statisticManager).taskRunFailed();
+ verify(statisticManager).taskRunFailed();
}
@Test
@@ -265,7 +269,7 @@ public final class SchedulerEngineTest {
schedulerEngine.statusUpdate(null, Protos.TaskStatus.newBuilder()
.setTaskId(Protos.TaskID.newBuilder().setValue(taskNode.getTaskNodeValue())).setState(Protos.TaskState.TASK_UNREACHABLE)
.setSlaveId(Protos.SlaveID.newBuilder().setValue("slave-S0")).build());
- Mockito.verify(statisticManager).taskRunFailed();
+ verify(statisticManager).taskRunFailed();
}
@Test
@@ -276,7 +280,7 @@ public final class SchedulerEngineTest {
@Test
public void assertSlaveLost() {
schedulerEngine.slaveLost(null, Protos.SlaveID.newBuilder().setValue("slave-S0").build());
- Mockito.verify(taskScheduler).expireAllLeasesByVMId("slave-S0");
+ verify(taskScheduler).expireAllLeasesByVMId("slave-S0");
}
@Test
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 126ee4f..33b8b8d 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
@@ -17,22 +17,22 @@
package org.apache.shardingsphere.elasticjob.cloud.scheduler.mesos;
-import org.apache.shardingsphere.elasticjob.cloud.scheduler.restful.RestfulService;
-import org.apache.shardingsphere.elasticjob.cloud.scheduler.statistics.StatisticManager;
-import org.apache.shardingsphere.elasticjob.cloud.scheduler.env.BootstrapEnvironment;
+import com.google.common.util.concurrent.Service;
+import org.apache.mesos.SchedulerDriver;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.config.job.CloudJobConfigurationListener;
+import org.apache.shardingsphere.elasticjob.cloud.scheduler.env.BootstrapEnvironment;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.env.FrameworkConfiguration;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.producer.ProducerManager;
-import com.google.common.util.concurrent.Service;
-import org.apache.mesos.SchedulerDriver;
+import org.apache.shardingsphere.elasticjob.cloud.scheduler.restful.RestfulService;
+import org.apache.shardingsphere.elasticjob.cloud.scheduler.statistics.StatisticManager;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InOrder;
import org.mockito.Mock;
-import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
+import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.when;
@@ -70,7 +70,7 @@ public class SchedulerServiceTest {
private SchedulerService schedulerService;
@Before
- public void setUp() throws Exception {
+ public void setUp() {
schedulerService = new SchedulerService(env, facadeService, schedulerDriver,
producerManager, statisticManager, cloudJobConfigurationListener,
taskLaunchScheduledService, restfulService, reconcileService);
@@ -137,9 +137,8 @@ public class SchedulerServiceTest {
}
private InOrder getInOrder() {
- return Mockito.inOrder(facadeService, schedulerDriver,
- producerManager, statisticManager, cloudJobConfigurationListener,
- taskLaunchScheduledService, restfulService, reconcileService);
+ return inOrder(facadeService, schedulerDriver, producerManager,
+ statisticManager, cloudJobConfigurationListener, taskLaunchScheduledService, restfulService, reconcileService);
}
private void setReconcileEnabled(final boolean isEnabled) {
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 e1c5e9e..ed6940b 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
@@ -17,41 +17,43 @@
package org.apache.shardingsphere.elasticjob.cloud.scheduler.mesos;
-import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.CloudJobConfigurationBuilder;
-import org.apache.shardingsphere.elasticjob.cloud.executor.ShardingContexts;
import org.apache.commons.lang3.SerializationUtils;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
+import org.apache.shardingsphere.elasticjob.cloud.executor.ShardingContexts;
+import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.CloudJobConfigurationBuilder;
import org.junit.Test;
import java.util.Collections;
import java.util.Map;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+
public final class TaskInfoDataTest {
- private final ShardingContexts shardingContexts = new ShardingContexts("fake_task_id", "test_job", 3, "test_param", Collections.<Integer, String>emptyMap());
+ private final ShardingContexts shardingContexts = new ShardingContexts("fake_task_id", "test_job", 3, "test_param", Collections.emptyMap());
@Test
public void assertSerializeSimpleJob() {
TaskInfoData actual = new TaskInfoData(shardingContexts, CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job"));
- assertSerialize((Map) SerializationUtils.deserialize(actual.serialize()));
+ assertSerialize(SerializationUtils.deserialize(actual.serialize()));
}
@Test
public void assertSerializeDataflowJob() {
TaskInfoData actual = new TaskInfoData(shardingContexts, CloudJobConfigurationBuilder.createDataflowCloudJobConfiguration("test_job"));
- assertSerialize((Map) SerializationUtils.deserialize(actual.serialize()));
+ assertSerialize(SerializationUtils.deserialize(actual.serialize()));
}
@Test
public void assertSerializeScriptJob() {
TaskInfoData actual = new TaskInfoData(shardingContexts, CloudJobConfigurationBuilder.createScriptCloudJobConfiguration("test_job"));
- assertSerialize((Map) SerializationUtils.deserialize(actual.serialize()));
+ assertSerialize(SerializationUtils.deserialize(actual.serialize()));
}
private void assertSerialize(final Map expected) {
- Assert.assertThat(expected.size(), Is.is(2));
- Assert.assertNotNull(expected.get("shardingContext"));
- Assert.assertNotNull(expected.get("jobConfigContext"));
+ assertThat(expected.size(), is(2));
+ assertNotNull(expected.get("shardingContext"));
+ assertNotNull(expected.get("jobConfigContext"));
}
}
diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/restful/CloudAppRestfulApiTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/restful/CloudAppRestfulApiTest.java
index 7018efd..86ff8b9 100755
--- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/restful/CloudAppRestfulApiTest.java
+++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/restful/CloudAppRestfulApiTest.java
@@ -20,99 +20,101 @@ package org.apache.shardingsphere.elasticjob.cloud.scheduler.restful;
import com.google.common.collect.Lists;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.CloudAppJsonConstants;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.CloudJsonConstants;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
@RunWith(MockitoJUnitRunner.class)
public final class CloudAppRestfulApiTest extends AbstractCloudRestfulApiTest {
@Test
public void assertRegister() throws Exception {
- Mockito.when(getRegCenter().isExisted("/config/app/test_app")).thenReturn(false);
- Assert.assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/app", "POST", CloudAppJsonConstants.getAppJson("test_app")), Is.is(204));
- Mockito.verify(getRegCenter()).persist("/config/app/test_app", CloudAppJsonConstants.getAppJson("test_app"));
+ when(getRegCenter().isExisted("/config/app/test_app")).thenReturn(false);
+ assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/app", "POST", CloudAppJsonConstants.getAppJson("test_app")), is(204));
+ verify(getRegCenter()).persist("/config/app/test_app", CloudAppJsonConstants.getAppJson("test_app"));
}
@Test
public void assertRegisterWithExistedName() throws Exception {
- Mockito.when(getRegCenter().isExisted("/config/app/test_app")).thenReturn(false);
- Assert.assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/app", "POST", CloudAppJsonConstants.getAppJson("test_app")), Is.is(204));
- Mockito.when(getRegCenter().get("/config/app/test_app")).thenReturn(CloudAppJsonConstants.getAppJson("test_app"));
- Assert.assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/app", "POST", CloudAppJsonConstants.getAppJson("test_app")), Is.is(500));
+ when(getRegCenter().isExisted("/config/app/test_app")).thenReturn(false);
+ assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/app", "POST", CloudAppJsonConstants.getAppJson("test_app")), is(204));
+ when(getRegCenter().get("/config/app/test_app")).thenReturn(CloudAppJsonConstants.getAppJson("test_app"));
+ assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/app", "POST", CloudAppJsonConstants.getAppJson("test_app")), is(500));
}
@Test
public void assertRegisterWithBadRequest() throws Exception {
- Assert.assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/app", "POST", "\"{\"appName\":\"wrong_job\"}"), Is.is(500));
+ assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/app", "POST", "\"{\"appName\":\"wrong_job\"}"), is(500));
}
@Test
public void assertUpdate() throws Exception {
- Mockito.when(getRegCenter().isExisted("/config/app/test_app")).thenReturn(true);
- Mockito.when(getRegCenter().get("/config/app/test_app")).thenReturn(CloudAppJsonConstants.getAppJson("test_app"));
- Assert.assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/app", "PUT", CloudAppJsonConstants.getAppJson("test_app")), Is.is(204));
- Mockito.verify(getRegCenter()).update("/config/app/test_app", CloudAppJsonConstants.getAppJson("test_app"));
+ when(getRegCenter().isExisted("/config/app/test_app")).thenReturn(true);
+ when(getRegCenter().get("/config/app/test_app")).thenReturn(CloudAppJsonConstants.getAppJson("test_app"));
+ assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/app", "PUT", CloudAppJsonConstants.getAppJson("test_app")), is(204));
+ verify(getRegCenter()).update("/config/app/test_app", CloudAppJsonConstants.getAppJson("test_app"));
}
@Test
public void assertDetail() throws Exception {
- Mockito.when(getRegCenter().get("/config/app/test_app")).thenReturn(CloudAppJsonConstants.getAppJson("test_app"));
- Assert.assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/app/test_app"), Is.is(CloudAppJsonConstants.getAppJson("test_app")));
- Mockito.verify(getRegCenter()).get("/config/app/test_app");
+ when(getRegCenter().get("/config/app/test_app")).thenReturn(CloudAppJsonConstants.getAppJson("test_app"));
+ assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/app/test_app"), is(CloudAppJsonConstants.getAppJson("test_app")));
+ verify(getRegCenter()).get("/config/app/test_app");
}
@Test
public void assertDetailWithNotExistedJob() throws Exception {
- Assert.assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/app/notExistedJobName", "GET", ""), Is.is(404));
+ assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/app/notExistedJobName", "GET", ""), is(404));
}
@Test
public void assertFindAllJobs() throws Exception {
- Mockito.when(getRegCenter().isExisted("/config/app")).thenReturn(true);
- Mockito.when(getRegCenter().getChildrenKeys("/config/app")).thenReturn(Lists.newArrayList("test_app"));
- Mockito.when(getRegCenter().get("/config/app/test_app")).thenReturn(CloudAppJsonConstants.getAppJson("test_app"));
- Assert.assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/app/list"), Is.is("[" + CloudAppJsonConstants.getAppJson("test_app") + "]"));
- Mockito.verify(getRegCenter()).isExisted("/config/app");
- Mockito.verify(getRegCenter()).getChildrenKeys("/config/app");
- Mockito.verify(getRegCenter()).get("/config/app/test_app");
+ when(getRegCenter().isExisted("/config/app")).thenReturn(true);
+ when(getRegCenter().getChildrenKeys("/config/app")).thenReturn(Lists.newArrayList("test_app"));
+ when(getRegCenter().get("/config/app/test_app")).thenReturn(CloudAppJsonConstants.getAppJson("test_app"));
+ assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/app/list"), is("[" + CloudAppJsonConstants.getAppJson("test_app") + "]"));
+ verify(getRegCenter()).isExisted("/config/app");
+ verify(getRegCenter()).getChildrenKeys("/config/app");
+ verify(getRegCenter()).get("/config/app/test_app");
}
@Test
public void assertDeregister() throws Exception {
- Mockito.when(getRegCenter().get("/config/app/test_app")).thenReturn(CloudAppJsonConstants.getAppJson("test_app"));
- Assert.assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/app/test_app", "DELETE", CloudAppJsonConstants.getAppJson("test_app")), Is.is(204));
- Mockito.verify(getRegCenter()).get("/config/app/test_app");
+ when(getRegCenter().get("/config/app/test_app")).thenReturn(CloudAppJsonConstants.getAppJson("test_app"));
+ assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/app/test_app", "DELETE", CloudAppJsonConstants.getAppJson("test_app")), is(204));
+ verify(getRegCenter()).get("/config/app/test_app");
}
@Test
public void assertIsDisabled() throws Exception {
- Mockito.when(getRegCenter().isExisted("/state/disable/app/test_app")).thenReturn(true);
- Assert.assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/app/test_app/disable"), Is.is("true"));
+ when(getRegCenter().isExisted("/state/disable/app/test_app")).thenReturn(true);
+ assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/app/test_app/disable"), is("true"));
}
@Test
public void assertDisable() throws Exception {
- Mockito.when(getRegCenter().isExisted("/config/job")).thenReturn(true);
- Mockito.when(getRegCenter().getChildrenKeys("/config/job")).thenReturn(Lists.newArrayList("test_job"));
- Mockito.when(getRegCenter().get("/config/app/test_app")).thenReturn(CloudAppJsonConstants.getAppJson("test_app"));
- Mockito.when(getRegCenter().get("/config/job/test_job")).thenReturn(CloudJsonConstants.getJobJson());
- Assert.assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/app/test_app/disable", "POST"), Is.is(204));
- Mockito.verify(getRegCenter()).get("/config/app/test_app");
- Mockito.verify(getRegCenter()).persist("/state/disable/app/test_app", "test_app");
+ when(getRegCenter().isExisted("/config/job")).thenReturn(true);
+ when(getRegCenter().getChildrenKeys("/config/job")).thenReturn(Lists.newArrayList("test_job"));
+ when(getRegCenter().get("/config/app/test_app")).thenReturn(CloudAppJsonConstants.getAppJson("test_app"));
+ when(getRegCenter().get("/config/job/test_job")).thenReturn(CloudJsonConstants.getJobJson());
+ assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/app/test_app/disable", "POST"), is(204));
+ verify(getRegCenter()).get("/config/app/test_app");
+ verify(getRegCenter()).persist("/state/disable/app/test_app", "test_app");
}
@Test
public void assertEnable() throws Exception {
- Mockito.when(getRegCenter().isExisted("/config/job")).thenReturn(true);
- Mockito.when(getRegCenter().getChildrenKeys("/config/job")).thenReturn(Lists.newArrayList("test_job"));
- Mockito.when(getRegCenter().get("/config/app/test_app")).thenReturn(CloudAppJsonConstants.getAppJson("test_app"));
- Mockito.when(getRegCenter().get("/config/job/test_job")).thenReturn(CloudJsonConstants.getJobJson());
- Assert.assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/app/test_app/enable", "POST"), Is.is(204));
- Mockito.verify(getRegCenter()).get("/config/app/test_app");
- Mockito.verify(getRegCenter()).remove("/state/disable/app/test_app");
+ when(getRegCenter().isExisted("/config/job")).thenReturn(true);
+ when(getRegCenter().getChildrenKeys("/config/job")).thenReturn(Lists.newArrayList("test_job"));
+ when(getRegCenter().get("/config/app/test_app")).thenReturn(CloudAppJsonConstants.getAppJson("test_app"));
+ when(getRegCenter().get("/config/job/test_job")).thenReturn(CloudJsonConstants.getJobJson());
+ assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/app/test_app/enable", "POST"), is(204));
+ verify(getRegCenter()).get("/config/app/test_app");
+ verify(getRegCenter()).remove("/state/disable/app/test_app");
}
}
diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/restful/CloudJobRestfulApiTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/restful/CloudJobRestfulApiTest.java
index 8cc29ab..899ec99 100755
--- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/restful/CloudJobRestfulApiTest.java
+++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/restful/CloudJobRestfulApiTest.java
@@ -20,12 +20,12 @@ package org.apache.shardingsphere.elasticjob.cloud.scheduler.restful;
import com.google.common.collect.Lists;
import org.apache.shardingsphere.elasticjob.cloud.context.ExecutionType;
import org.apache.shardingsphere.elasticjob.cloud.context.TaskContext;
-import org.apache.shardingsphere.elasticjob.cloud.scheduler.restful.search.JobEventRdbSearch;
-import org.apache.shardingsphere.elasticjob.cloud.scheduler.restful.search.JobEventRdbSearch.Result;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.config.job.CloudJobExecutionType;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.CloudAppJsonConstants;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.CloudJsonConstants;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.TaskNode;
+import org.apache.shardingsphere.elasticjob.cloud.scheduler.restful.search.JobEventRdbSearch;
+import org.apache.shardingsphere.elasticjob.cloud.scheduler.restful.search.JobEventRdbSearch.Result;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.state.failover.FailoverTaskInfo;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.state.running.RunningService;
import org.apache.shardingsphere.elasticjob.cloud.statistics.type.job.JobExecutionTypeStatistics;
@@ -34,11 +34,8 @@ import org.apache.shardingsphere.elasticjob.cloud.statistics.type.task.TaskResul
import org.apache.shardingsphere.elasticjob.cloud.util.json.GsonFactory;
import org.apache.shardingsphere.elasticjob.tracing.event.JobExecutionEvent;
import org.apache.shardingsphere.elasticjob.tracing.event.JobStatusTraceEvent;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.unitils.util.ReflectionUtils;
@@ -50,136 +47,143 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+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)
public final class CloudJobRestfulApiTest extends AbstractCloudRestfulApiTest {
@Test
public void assertRegister() throws Exception {
- Mockito.when(getRegCenter().get("/config/app/test_app")).thenReturn(CloudAppJsonConstants.getAppJson("test_app"));
- Mockito.when(getRegCenter().isExisted("/config/job/test_job")).thenReturn(false);
- Assert.assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/job/register", "POST", CloudJsonConstants.getJobJson()), Is.is(204));
- Mockito.verify(getRegCenter()).persist("/config/job/test_job", CloudJsonConstants.getJobJson());
+ when(getRegCenter().get("/config/app/test_app")).thenReturn(CloudAppJsonConstants.getAppJson("test_app"));
+ when(getRegCenter().isExisted("/config/job/test_job")).thenReturn(false);
+ assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/job/register", "POST", CloudJsonConstants.getJobJson()), is(204));
+ verify(getRegCenter()).persist("/config/job/test_job", CloudJsonConstants.getJobJson());
RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/job/deregister", "DELETE", "test_job");
}
@Test
public void assertRegisterWithoutApp() throws Exception {
- Mockito.when(getRegCenter().isExisted("/config/job/test_job")).thenReturn(false);
- Assert.assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/job/register", "POST", CloudJsonConstants.getJobJson()), Is.is(500));
+ when(getRegCenter().isExisted("/config/job/test_job")).thenReturn(false);
+ assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/job/register", "POST", CloudJsonConstants.getJobJson()), is(500));
}
@Test
public void assertRegisterWithExistedName() throws Exception {
- Mockito.when(getRegCenter().get("/config/app/test_app")).thenReturn(CloudAppJsonConstants.getAppJson("test_app"));
- Mockito.when(getRegCenter().isExisted("/config/test_job")).thenReturn(false);
- Assert.assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/job/register", "POST", CloudJsonConstants.getJobJson()), Is.is(204));
- Mockito.when(getRegCenter().get("/config/job/test_job")).thenReturn(CloudJsonConstants.getJobJson());
- Assert.assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/job/register", "POST", CloudJsonConstants.getJobJson()), Is.is(500));
+ when(getRegCenter().get("/config/app/test_app")).thenReturn(CloudAppJsonConstants.getAppJson("test_app"));
+ when(getRegCenter().isExisted("/config/test_job")).thenReturn(false);
+ assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/job/register", "POST", CloudJsonConstants.getJobJson()), is(204));
+ when(getRegCenter().get("/config/job/test_job")).thenReturn(CloudJsonConstants.getJobJson());
+ assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/job/register", "POST", CloudJsonConstants.getJobJson()), is(500));
RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/job/deregister", "DELETE", "test_job");
}
@Test
public void assertRegisterWithBadRequest() throws Exception {
- Mockito.when(getRegCenter().get("/config/app/test_app")).thenReturn(CloudAppJsonConstants.getAppJson("test_app"));
- Assert.assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/job/register", "POST", "\"{\"jobName\":\"wrong_job\"}"), Is.is(500));
+ when(getRegCenter().get("/config/app/test_app")).thenReturn(CloudAppJsonConstants.getAppJson("test_app"));
+ assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/job/register", "POST", "\"{\"jobName\":\"wrong_job\"}"), is(500));
}
@Test
public void assertUpdate() throws Exception {
- Mockito.when(getRegCenter().isExisted("/config/job/test_job")).thenReturn(true);
- Mockito.when(getRegCenter().get("/config/job/test_job")).thenReturn(CloudJsonConstants.getJobJson());
- Assert.assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/job/update", "PUT", CloudJsonConstants.getJobJson()), Is.is(204));
- Mockito.verify(getRegCenter()).update("/config/job/test_job", CloudJsonConstants.getJobJson());
+ when(getRegCenter().isExisted("/config/job/test_job")).thenReturn(true);
+ when(getRegCenter().get("/config/job/test_job")).thenReturn(CloudJsonConstants.getJobJson());
+ assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/job/update", "PUT", CloudJsonConstants.getJobJson()), is(204));
+ verify(getRegCenter()).update("/config/job/test_job", CloudJsonConstants.getJobJson());
RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/job/deregister", "DELETE", "test_job");
}
@Test
public void assertDeregister() throws Exception {
- Mockito.when(getRegCenter().isExisted("/config/job/test_job")).thenReturn(false);
- Assert.assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/job/deregister", "DELETE", "test_job"), Is.is(204));
- Mockito.verify(getRegCenter(), Mockito.times(3)).get("/config/job/test_job");
+ when(getRegCenter().isExisted("/config/job/test_job")).thenReturn(false);
+ assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/job/deregister", "DELETE", "test_job"), is(204));
+ verify(getRegCenter(), times(3)).get("/config/job/test_job");
}
@Test
public void assertTriggerWithDaemonJob() throws Exception {
- Mockito.when(getRegCenter().get("/config/job/test_job")).thenReturn(CloudJsonConstants.getJobJson(CloudJobExecutionType.DAEMON));
- Assert.assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/job/trigger", "POST", "test_job"), Is.is(500));
+ when(getRegCenter().get("/config/job/test_job")).thenReturn(CloudJsonConstants.getJobJson(CloudJobExecutionType.DAEMON));
+ assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/job/trigger", "POST", "test_job"), is(500));
}
@Test
public void assertTriggerWithTransientJob() throws Exception {
- Mockito.when(getRegCenter().get("/config/job/test_job")).thenReturn(CloudJsonConstants.getJobJson());
- Assert.assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/job/trigger", "POST", "test_job"), Is.is(204));
+ when(getRegCenter().get("/config/job/test_job")).thenReturn(CloudJsonConstants.getJobJson());
+ assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/job/trigger", "POST", "test_job"), is(204));
}
@Test
public void assertDetail() throws Exception {
- Mockito.when(getRegCenter().get("/config/job/test_job")).thenReturn(CloudJsonConstants.getJobJson());
- Assert.assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/jobs/test_job"), Is.is(CloudJsonConstants.getJobJson()));
- Mockito.verify(getRegCenter()).get("/config/job/test_job");
+ when(getRegCenter().get("/config/job/test_job")).thenReturn(CloudJsonConstants.getJobJson());
+ assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/jobs/test_job"), is(CloudJsonConstants.getJobJson()));
+ verify(getRegCenter()).get("/config/job/test_job");
}
@Test
public void assertDetailWithNotExistedJob() throws Exception {
- Assert.assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/job/jobs/notExistedJobName", "GET", ""), Is.is(404));
+ assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/job/jobs/notExistedJobName", "GET", ""), is(404));
}
@Test
public void assertFindAllJobs() throws Exception {
- Mockito.when(getRegCenter().isExisted("/config/job")).thenReturn(true);
- Mockito.when(getRegCenter().getChildrenKeys("/config/job")).thenReturn(Lists.newArrayList("test_job"));
- Mockito.when(getRegCenter().get("/config/job/test_job")).thenReturn(CloudJsonConstants.getJobJson());
- Assert.assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/jobs"), Is.is("[" + CloudJsonConstants.getJobJson() + "]"));
- Mockito.verify(getRegCenter()).isExisted("/config/job");
- Mockito.verify(getRegCenter()).getChildrenKeys("/config/job");
- Mockito.verify(getRegCenter()).get("/config/job/test_job");
+ when(getRegCenter().isExisted("/config/job")).thenReturn(true);
+ when(getRegCenter().getChildrenKeys("/config/job")).thenReturn(Lists.newArrayList("test_job"));
+ when(getRegCenter().get("/config/job/test_job")).thenReturn(CloudJsonConstants.getJobJson());
+ assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/jobs"), is("[" + CloudJsonConstants.getJobJson() + "]"));
+ verify(getRegCenter()).isExisted("/config/job");
+ verify(getRegCenter()).getChildrenKeys("/config/job");
+ verify(getRegCenter()).get("/config/job/test_job");
}
@Test
public void assertFindAllRunningTasks() throws Exception {
RunningService runningService = new RunningService(getRegCenter());
TaskContext actualTaskContext = TaskContext.from(TaskNode.builder().build().getTaskNodeValue());
- Mockito.when(getRegCenter().get("/config/job/" + actualTaskContext.getMetaInfo().getJobName())).thenReturn(CloudJsonConstants.getJobJson());
+ when(getRegCenter().get("/config/job/" + actualTaskContext.getMetaInfo().getJobName())).thenReturn(CloudJsonConstants.getJobJson());
runningService.add(actualTaskContext);
- Assert.assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/tasks/running"), Is.is(GsonFactory.getGson().toJson(Lists.newArrayList(actualTaskContext))));
+ assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/tasks/running"), is(GsonFactory.getGson().toJson(Lists.newArrayList(actualTaskContext))));
}
@Test
public void assertFindAllReadyTasks() throws Exception {
- Mockito.when(getRegCenter().isExisted("/state/ready")).thenReturn(true);
- Mockito.when(getRegCenter().getChildrenKeys("/state/ready")).thenReturn(Lists.newArrayList("test_job"));
- Mockito.when(getRegCenter().get("/state/ready/test_job")).thenReturn("1");
+ when(getRegCenter().isExisted("/state/ready")).thenReturn(true);
+ when(getRegCenter().getChildrenKeys("/state/ready")).thenReturn(Lists.newArrayList("test_job"));
+ when(getRegCenter().get("/state/ready/test_job")).thenReturn("1");
Map<String, String> expectedMap = new HashMap<>();
expectedMap.put("jobName", "test_job");
expectedMap.put("times", "1");
@SuppressWarnings("unchecked")
Collection<Map<String, String>> expectedResult = Lists.newArrayList(expectedMap);
- Assert.assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/tasks/ready"), Is.is(GsonFactory.getGson().toJson(expectedResult)));
- Mockito.verify(getRegCenter()).isExisted("/state/ready");
- Mockito.verify(getRegCenter()).getChildrenKeys("/state/ready");
- Mockito.verify(getRegCenter()).get("/state/ready/test_job");
+ assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/tasks/ready"), is(GsonFactory.getGson().toJson(expectedResult)));
+ verify(getRegCenter()).isExisted("/state/ready");
+ verify(getRegCenter()).getChildrenKeys("/state/ready");
+ verify(getRegCenter()).get("/state/ready/test_job");
}
@Test
public void assertFindAllFailoverTasks() throws Exception {
- Mockito.when(getRegCenter().isExisted("/state/failover")).thenReturn(true);
- Mockito.when(getRegCenter().getChildrenKeys("/state/failover")).thenReturn(Lists.newArrayList("test_job"));
- Mockito.when(getRegCenter().getChildrenKeys("/state/failover/test_job")).thenReturn(Lists.newArrayList("test_job@-@0"));
+ when(getRegCenter().isExisted("/state/failover")).thenReturn(true);
+ when(getRegCenter().getChildrenKeys("/state/failover")).thenReturn(Lists.newArrayList("test_job"));
+ when(getRegCenter().getChildrenKeys("/state/failover/test_job")).thenReturn(Lists.newArrayList("test_job@-@0"));
String originalTaskId = UUID.randomUUID().toString();
- Mockito.when(getRegCenter().get("/state/failover/test_job/test_job@-@0")).thenReturn(originalTaskId);
+ when(getRegCenter().get("/state/failover/test_job/test_job@-@0")).thenReturn(originalTaskId);
FailoverTaskInfo expectedFailoverTask = new FailoverTaskInfo(TaskContext.MetaInfo.from("test_job@-@0"), originalTaskId);
Collection<FailoverTaskInfo> expectedResult = Lists.newArrayList(expectedFailoverTask);
- Assert.assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/tasks/failover"), Is.is(GsonFactory.getGson().toJson(expectedResult)));
- Mockito.verify(getRegCenter()).isExisted("/state/failover");
- Mockito.verify(getRegCenter()).getChildrenKeys("/state/failover");
- Mockito.verify(getRegCenter()).getChildrenKeys("/state/failover/test_job");
- Mockito.verify(getRegCenter()).get("/state/failover/test_job/test_job@-@0");
+ assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/tasks/failover"), is(GsonFactory.getGson().toJson(expectedResult)));
+ verify(getRegCenter()).isExisted("/state/failover");
+ verify(getRegCenter()).getChildrenKeys("/state/failover");
+ verify(getRegCenter()).getChildrenKeys("/state/failover/test_job");
+ verify(getRegCenter()).get("/state/failover/test_job/test_job@-@0");
}
@Test
public void assertFindJobExecutionEventsWhenNotConfigRDB() throws Exception {
ReflectionUtils.setFieldValue(CloudJobRestfulApi.class, CloudJobRestfulApi.class.getDeclaredField("jobEventRdbSearch"), null);
- Assert.assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/events/executions"), Is.is(GsonFactory.getGson().toJson(new JobEventRdbSearch.Result<>(0,
+ assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/events/executions"), is(GsonFactory.getGson().toJson(new JobEventRdbSearch.Result<>(0,
Collections.<JobExecutionEvent>emptyList()))));
}
@@ -187,17 +191,17 @@ public final class CloudJobRestfulApiTest extends AbstractCloudRestfulApiTest {
public void assertFindJobExecutionEvents() throws Exception {
ReflectionUtils.setFieldValue(CloudJobRestfulApi.class, CloudJobRestfulApi.class.getDeclaredField("jobEventRdbSearch"), getJobEventRdbSearch());
JobExecutionEvent jobExecutionEvent = new JobExecutionEvent("localhost", "127.0.0.1", "fake_task_id", "test_job", JobExecutionEvent.ExecutionSource.NORMAL_TRIGGER, 0);
- Mockito.when(getJobEventRdbSearch().findJobExecutionEvents(Mockito.any(JobEventRdbSearch.Condition.class))).thenReturn(new JobEventRdbSearch.Result<>(0,
+ when(getJobEventRdbSearch().findJobExecutionEvents(any(JobEventRdbSearch.Condition.class))).thenReturn(new JobEventRdbSearch.Result<>(0,
Lists.newArrayList(jobExecutionEvent)));
- Assert.assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/events/executions?" + buildFindJobEventsQueryParameter()),
- Is.is(GsonFactory.getGson().toJson(new JobEventRdbSearch.Result<>(0, Lists.newArrayList(jobExecutionEvent)))));
- Mockito.verify(getJobEventRdbSearch()).findJobExecutionEvents(Mockito.any(JobEventRdbSearch.Condition.class));
+ assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/events/executions?" + buildFindJobEventsQueryParameter()),
+ is(GsonFactory.getGson().toJson(new JobEventRdbSearch.Result<>(0, Lists.newArrayList(jobExecutionEvent)))));
+ verify(getJobEventRdbSearch()).findJobExecutionEvents(any(JobEventRdbSearch.Condition.class));
}
@Test
public void assertFindJobStatusTraceEventEventsWhenNotConfigRDB() throws Exception {
ReflectionUtils.setFieldValue(CloudJobRestfulApi.class, CloudJobRestfulApi.class.getDeclaredField("jobEventRdbSearch"), null);
- Assert.assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/events/statusTraces"), Is.is(GsonFactory.getGson().toJson(new JobEventRdbSearch.Result<>(0,
+ assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/events/statusTraces"), is(GsonFactory.getGson().toJson(new JobEventRdbSearch.Result<>(0,
Collections.<JobExecutionEvent>emptyList()))));
}
@@ -206,11 +210,11 @@ public final class CloudJobRestfulApiTest extends AbstractCloudRestfulApiTest {
ReflectionUtils.setFieldValue(CloudJobRestfulApi.class, CloudJobRestfulApi.class.getDeclaredField("jobEventRdbSearch"), getJobEventRdbSearch());
JobStatusTraceEvent jobStatusTraceEvent = new JobStatusTraceEvent("test-job",
"fake_task_id", "fake_slave_id", JobStatusTraceEvent.Source.LITE_EXECUTOR, ExecutionType.READY.toString(), "0", JobStatusTraceEvent.State.TASK_RUNNING, "message is empty.");
- Mockito.when(getJobEventRdbSearch().findJobStatusTraceEvents(Mockito.any(JobEventRdbSearch.Condition.class))).thenReturn(new Result<>(0,
+ when(getJobEventRdbSearch().findJobStatusTraceEvents(any(JobEventRdbSearch.Condition.class))).thenReturn(new Result<>(0,
Lists.newArrayList(jobStatusTraceEvent)));
- Assert.assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/events/statusTraces?" + buildFindJobEventsQueryParameter()),
- Is.is(GsonFactory.getGson().toJson(new JobEventRdbSearch.Result<>(0, Lists.newArrayList(jobStatusTraceEvent)))));
- Mockito.verify(getJobEventRdbSearch()).findJobStatusTraceEvents(Mockito.any(JobEventRdbSearch.Condition.class));
+ assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/events/statusTraces?" + buildFindJobEventsQueryParameter()),
+ is(GsonFactory.getGson().toJson(new JobEventRdbSearch.Result<>(0, Lists.newArrayList(jobStatusTraceEvent)))));
+ verify(getJobEventRdbSearch()).findJobStatusTraceEvents(any(JobEventRdbSearch.Condition.class));
}
private String buildFindJobEventsQueryParameter() throws UnsupportedEncodingException {
@@ -220,14 +224,14 @@ public final class CloudJobRestfulApiTest extends AbstractCloudRestfulApiTest {
@Test
public void assertGetTaskResultStatistics() throws Exception {
- Assert.assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/statistics/tasks/results"),
- Is.is(GsonFactory.getGson().toJson(Collections.emptyList())));
+ assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/statistics/tasks/results"),
+ is(GsonFactory.getGson().toJson(Collections.emptyList())));
}
@Test
public void assertGetTaskResultStatisticsWithSinceParameter() throws Exception {
- Assert.assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/statistics/tasks/results?since=last24hours"),
- Is.is(GsonFactory.getGson().toJson(Collections.emptyList())));
+ assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/statistics/tasks/results?since=last24hours"),
+ is(GsonFactory.getGson().toJson(Collections.emptyList())));
}
@Test
@@ -236,8 +240,8 @@ public final class CloudJobRestfulApiTest extends AbstractCloudRestfulApiTest {
for (String each : parameters) {
String result = RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/statistics/tasks/results/" + each);
TaskResultStatistics taskResultStatistics = GsonFactory.getGson().fromJson(result, TaskResultStatistics.class);
- Assert.assertThat(taskResultStatistics.getSuccessCount(), Is.is(0));
- Assert.assertThat(taskResultStatistics.getFailedCount(), Is.is(0));
+ assertThat(taskResultStatistics.getSuccessCount(), is(0));
+ assertThat(taskResultStatistics.getFailedCount(), is(0));
}
}
@@ -245,80 +249,80 @@ public final class CloudJobRestfulApiTest extends AbstractCloudRestfulApiTest {
public void assertGetTaskResultStatisticsWithErrorPathParameter() throws Exception {
String result = RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/statistics/tasks/results/errorPath");
TaskResultStatistics taskResultStatistics = GsonFactory.getGson().fromJson(result, TaskResultStatistics.class);
- Assert.assertThat(taskResultStatistics.getSuccessCount(), Is.is(0));
- Assert.assertThat(taskResultStatistics.getFailedCount(), Is.is(0));
+ assertThat(taskResultStatistics.getSuccessCount(), is(0));
+ assertThat(taskResultStatistics.getFailedCount(), is(0));
}
@Test
public void assertGetJobTypeStatistics() throws Exception {
String result = RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/statistics/jobs/type");
JobTypeStatistics jobTypeStatistics = GsonFactory.getGson().fromJson(result, JobTypeStatistics.class);
- Assert.assertThat(jobTypeStatistics.getSimpleJobCount(), Is.is(0));
- Assert.assertThat(jobTypeStatistics.getDataflowJobCount(), Is.is(0));
- Assert.assertThat(jobTypeStatistics.getScriptJobCount(), Is.is(0));
+ assertThat(jobTypeStatistics.getSimpleJobCount(), is(0));
+ assertThat(jobTypeStatistics.getDataflowJobCount(), is(0));
+ assertThat(jobTypeStatistics.getScriptJobCount(), is(0));
}
@Test
public void assertGetJobExecutionTypeStatistics() throws Exception {
String result = RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/statistics/jobs/executionType");
JobExecutionTypeStatistics jobExecutionTypeStatistics = GsonFactory.getGson().fromJson(result, JobExecutionTypeStatistics.class);
- Assert.assertThat(jobExecutionTypeStatistics.getDaemonJobCount(), Is.is(0));
- Assert.assertThat(jobExecutionTypeStatistics.getTransientJobCount(), Is.is(0));
+ assertThat(jobExecutionTypeStatistics.getDaemonJobCount(), is(0));
+ assertThat(jobExecutionTypeStatistics.getTransientJobCount(), is(0));
}
@Test
public void assertFindTaskRunningStatistics() throws Exception {
- Assert.assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/statistics/tasks/running"),
- Is.is(GsonFactory.getGson().toJson(Collections.emptyList())));
+ assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/statistics/tasks/running"),
+ is(GsonFactory.getGson().toJson(Collections.emptyList())));
}
@Test
public void assertFindTaskRunningStatisticsWeekly() throws Exception {
- Assert.assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/statistics/tasks/running?since=lastWeek"),
- Is.is(GsonFactory.getGson().toJson(Collections.emptyList())));
+ assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/statistics/tasks/running?since=lastWeek"),
+ is(GsonFactory.getGson().toJson(Collections.emptyList())));
}
@Test
public void assertFindJobRunningStatistics() throws Exception {
- Assert.assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/statistics/jobs/running"),
- Is.is(GsonFactory.getGson().toJson(Collections.emptyList())));
+ assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/statistics/jobs/running"),
+ is(GsonFactory.getGson().toJson(Collections.emptyList())));
}
@Test
public void assertFindJobRunningStatisticsWeekly() throws Exception {
- Assert.assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/statistics/jobs/running?since=lastWeek"),
- Is.is(GsonFactory.getGson().toJson(Collections.emptyList())));
+ assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/statistics/jobs/running?since=lastWeek"),
+ is(GsonFactory.getGson().toJson(Collections.emptyList())));
}
@Test
public void assertFindJobRegisterStatisticsSinceOnline() throws Exception {
- Assert.assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/statistics/jobs/register"),
- Is.is(GsonFactory.getGson().toJson(Collections.emptyList())));
+ assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/statistics/jobs/register"),
+ is(GsonFactory.getGson().toJson(Collections.emptyList())));
}
@Test
public void assertIsDisabled() throws Exception {
- Mockito.when(getRegCenter().isExisted("/state/disable/job/test_job")).thenReturn(true);
- Assert.assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/test_job/disable"), Is.is("true"));
+ when(getRegCenter().isExisted("/state/disable/job/test_job")).thenReturn(true);
+ assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/job/test_job/disable"), is("true"));
}
@Test
public void assertDisable() throws Exception {
- Mockito.when(getRegCenter().isExisted("/config/job")).thenReturn(true);
- Mockito.when(getRegCenter().getChildrenKeys("/config/job")).thenReturn(Lists.newArrayList("test_job"));
- Mockito.when(getRegCenter().get("/config/app/test_app")).thenReturn(CloudAppJsonConstants.getAppJson("test_app"));
- Mockito.when(getRegCenter().get("/config/job/test_job")).thenReturn(CloudJsonConstants.getJobJson());
- Assert.assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/job/test_job/disable", "POST"), Is.is(204));
- Mockito.verify(getRegCenter()).persist("/state/disable/job/test_job", "test_job");
+ when(getRegCenter().isExisted("/config/job")).thenReturn(true);
+ when(getRegCenter().getChildrenKeys("/config/job")).thenReturn(Lists.newArrayList("test_job"));
+ when(getRegCenter().get("/config/app/test_app")).thenReturn(CloudAppJsonConstants.getAppJson("test_app"));
+ when(getRegCenter().get("/config/job/test_job")).thenReturn(CloudJsonConstants.getJobJson());
+ assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/job/test_job/disable", "POST"), is(204));
+ verify(getRegCenter()).persist("/state/disable/job/test_job", "test_job");
}
@Test
public void assertEnable() throws Exception {
- Mockito.when(getRegCenter().isExisted("/config/job")).thenReturn(true);
- Mockito.when(getRegCenter().getChildrenKeys("/config/job")).thenReturn(Lists.newArrayList("test_job"));
- Mockito.when(getRegCenter().get("/config/app/test_app")).thenReturn(CloudAppJsonConstants.getAppJson("test_app"));
- Mockito.when(getRegCenter().get("/config/job/test_job")).thenReturn(CloudJsonConstants.getJobJson());
- Assert.assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/job/test_job/enable", "POST", "test_job"), Is.is(204));
- Mockito.verify(getRegCenter()).remove("/state/disable/job/test_job");
+ when(getRegCenter().isExisted("/config/job")).thenReturn(true);
+ when(getRegCenter().getChildrenKeys("/config/job")).thenReturn(Lists.newArrayList("test_job"));
+ when(getRegCenter().get("/config/app/test_app")).thenReturn(CloudAppJsonConstants.getAppJson("test_app"));
+ when(getRegCenter().get("/config/job/test_job")).thenReturn(CloudJsonConstants.getJobJson());
+ assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/job/test_job/enable", "POST", "test_job"), is(204));
+ verify(getRegCenter()).remove("/state/disable/job/test_job");
}
}
diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/restful/CloudOperationRestfulApiTest.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/restful/CloudOperationRestfulApiTest.java
index 702bffd..48fccdb 100755
--- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/restful/CloudOperationRestfulApiTest.java
+++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/restful/CloudOperationRestfulApiTest.java
@@ -18,40 +18,41 @@
package org.apache.shardingsphere.elasticjob.cloud.scheduler.restful;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.ha.HANode;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Test;
-import org.mockito.Mockito;
import org.unitils.util.ReflectionUtils;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.when;
+
public class CloudOperationRestfulApiTest extends AbstractCloudRestfulApiTest {
@Test
public void assertExplicitReconcile() throws Exception {
ReflectionUtils.setFieldValue(new CloudOperationRestfulApi(), "lastReconcileTime", 0);
- Assert.assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/operate/reconcile/explicit", "POST", ""), Is.is(204));
- Assert.assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/operate/reconcile/explicit", "POST", ""), Is.is(500));
+ assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/operate/reconcile/explicit", "POST", ""), is(204));
+ assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/operate/reconcile/explicit", "POST", ""), is(500));
}
@Test
public void assertImplicitReconcile() throws Exception {
ReflectionUtils.setFieldValue(new CloudOperationRestfulApi(), "lastReconcileTime", 0);
- Assert.assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/operate/reconcile/implicit", "POST", ""), Is.is(204));
- Assert.assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/operate/reconcile/implicit", "POST", ""), Is.is(500));
+ assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/operate/reconcile/implicit", "POST", ""), is(204));
+ assertThat(RestfulTestsUtil.sentRequest("http://127.0.0.1:19000/api/operate/reconcile/implicit", "POST", ""), is(500));
}
@Test
public void assertSandbox() throws Exception {
- Mockito.when(getRegCenter().getDirectly(HANode.FRAMEWORK_ID_NODE)).thenReturn("d8701508-41b7-471e-9b32-61cf824a660d-0000");
- Assert.assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/operate/sandbox?appName=foo_app"), Is.is("[{\"hostname\":\"127.0.0.1\","
+ when(getRegCenter().getDirectly(HANode.FRAMEWORK_ID_NODE)).thenReturn("d8701508-41b7-471e-9b32-61cf824a660d-0000");
+ assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/operate/sandbox?appName=foo_app"), is("[{\"hostname\":\"127.0.0.1\","
+ "\"path\":\"/slaves/d8701508-41b7-471e-9b32-61cf824a660d-S0/frameworks/d8701508-41b7-471e-9b32-61cf824a660d-0000/executors/foo_app@-@"
+ "d8701508-41b7-471e-9b32-61cf824a660d-S0/runs/53fb4af7-aee2-44f6-9e47-6f418d9f27e1\"}]"));
}
@Test
public void assertNoFrameworkSandbox() throws Exception {
- Assert.assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/operate/sandbox?appName=foo_app"), Is.is("[]"));
- Mockito.when(getRegCenter().getDirectly(HANode.FRAMEWORK_ID_NODE)).thenReturn("not-exists");
- Assert.assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/operate/sandbox?appName=foo_app"), Is.is("[]"));
+ assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/operate/sandbox?appName=foo_app"), is("[]"));
+ when(getRegCenter().getDirectly(HANode.FRAMEWORK_ID_NODE)).thenReturn("not-exists");
+ assertThat(RestfulTestsUtil.sentGetRequest("http://127.0.0.1:19000/api/operate/sandbox?appName=foo_app"), is("[]"));
}
}
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 b52744b..54b84dd 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,14 +17,15 @@
package org.apache.shardingsphere.elasticjob.cloud.scheduler.state.disable.app;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public final class DisableAppNodeTest {
@Test
public void assertGetDisableAppNodePath() {
- Assert.assertThat(DisableAppNode.getDisableAppNodePath("test_app0000000001"), Is.is("/state/disable/app/test_app0000000001"));
+ assertThat(DisableAppNode.getDisableAppNodePath("test_app0000000001"), is("/state/disable/app/test_app0000000001"));
}
}
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 f5b8227..2b14367 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,14 +18,17 @@
package org.apache.shardingsphere.elasticjob.cloud.scheduler.state.disable.app;
import org.apache.shardingsphere.elasticjob.cloud.reg.base.CoordinatorRegistryCenter;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
@RunWith(MockitoJUnitRunner.class)
public final class DisableAppServiceTest {
@@ -35,34 +38,34 @@ public final class DisableAppServiceTest {
private DisableAppService disableAppService;
@Before
- public void setUp() throws NoSuchFieldException {
+ public void setUp() {
disableAppService = new DisableAppService(regCenter);
}
@Test
public void assertAdd() {
disableAppService.add("test_app");
- Mockito.verify(regCenter).isExisted("/state/disable/app/test_app");
- Mockito.verify(regCenter).persist("/state/disable/app/test_app", "test_app");
+ verify(regCenter).isExisted("/state/disable/app/test_app");
+ verify(regCenter).persist("/state/disable/app/test_app", "test_app");
}
@Test
public void assertRemove() {
disableAppService.remove("test_app");
- Mockito.verify(regCenter).remove("/state/disable/app/test_app");
+ verify(regCenter).remove("/state/disable/app/test_app");
}
@Test
public void assertIsDisabled() {
- Mockito.when(regCenter.isExisted("/state/disable/app/test_app")).thenReturn(true);
- Assert.assertTrue(disableAppService.isDisabled("test_app"));
- Mockito.verify(regCenter).isExisted("/state/disable/app/test_app");
+ when(regCenter.isExisted("/state/disable/app/test_app")).thenReturn(true);
+ assertTrue(disableAppService.isDisabled("test_app"));
+ verify(regCenter).isExisted("/state/disable/app/test_app");
}
@Test
public void assertIsEnabled() {
- Mockito.when(regCenter.isExisted("/state/disable/app/test_app")).thenReturn(false);
- Assert.assertFalse(disableAppService.isDisabled("test_app"));
- Mockito.verify(regCenter).isExisted("/state/disable/app/test_app");
+ when(regCenter.isExisted("/state/disable/app/test_app")).thenReturn(false);
+ assertFalse(disableAppService.isDisabled("test_app"));
+ verify(regCenter).isExisted("/state/disable/app/test_app");
}
}
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 a4b9f99..709a905 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,14 +17,15 @@
package org.apache.shardingsphere.elasticjob.cloud.scheduler.state.disable.job;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public final class DisableJobNodeTest {
@Test
public void assertGetDisableAppNodePath() {
- Assert.assertThat(DisableJobNode.getDisableJobNodePath("test_job0000000001"), Is.is("/state/disable/job/test_job0000000001"));
+ assertThat(DisableJobNode.getDisableJobNodePath("test_job0000000001"), is("/state/disable/job/test_job0000000001"));
}
}
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 8fe23b3..205abb0 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,14 +18,17 @@
package org.apache.shardingsphere.elasticjob.cloud.scheduler.state.disable.job;
import org.apache.shardingsphere.elasticjob.cloud.reg.base.CoordinatorRegistryCenter;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
@RunWith(MockitoJUnitRunner.class)
public final class DisableJobServiceTest {
@@ -35,34 +38,34 @@ public final class DisableJobServiceTest {
private DisableJobService disableJobService;
@Before
- public void setUp() throws NoSuchFieldException {
+ public void setUp() {
disableJobService = new DisableJobService(regCenter);
}
@Test
public void assertAdd() {
disableJobService.add("test_job");
- Mockito.verify(regCenter).isExisted("/state/disable/job/test_job");
- Mockito.verify(regCenter).persist("/state/disable/job/test_job", "test_job");
+ verify(regCenter).isExisted("/state/disable/job/test_job");
+ verify(regCenter).persist("/state/disable/job/test_job", "test_job");
}
@Test
public void assertRemove() {
disableJobService.remove("test_job");
- Mockito.verify(regCenter).remove("/state/disable/job/test_job");
+ verify(regCenter).remove("/state/disable/job/test_job");
}
@Test
public void assertIsDisabled() {
- Mockito.when(regCenter.isExisted("/state/disable/job/test_job")).thenReturn(true);
- Assert.assertTrue(disableJobService.isDisabled("test_job"));
- Mockito.verify(regCenter).isExisted("/state/disable/job/test_job");
+ when(regCenter.isExisted("/state/disable/job/test_job")).thenReturn(true);
+ assertTrue(disableJobService.isDisabled("test_job"));
+ verify(regCenter).isExisted("/state/disable/job/test_job");
}
@Test
public void assertIsEnabled() {
- Mockito.when(regCenter.isExisted("/state/disable/job/test_job")).thenReturn(false);
- Assert.assertFalse(disableJobService.isDisabled("test_job"));
- Mockito.verify(regCenter).isExisted("/state/disable/job/test_job");
+ when(regCenter.isExisted("/state/disable/job/test_job")).thenReturn(false);
+ assertFalse(disableJobService.isDisabled("test_job"));
+ verify(regCenter).isExisted("/state/disable/job/test_job");
}
}
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 39855e0..60ba4fa 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,20 +19,21 @@ package org.apache.shardingsphere.elasticjob.cloud.scheduler.state.failover;
import org.apache.shardingsphere.elasticjob.cloud.context.ExecutionType;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.TaskNode;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public final class FailoverNodeTest {
@Test
public void assertGetFailoverJobNodePath() {
- Assert.assertThat(FailoverNode.getFailoverJobNodePath("test_job"), Is.is("/state/failover/test_job"));
+ assertThat(FailoverNode.getFailoverJobNodePath("test_job"), is("/state/failover/test_job"));
}
@Test
public void assertGetFailoverTaskNodePath() {
String jobNodePath = TaskNode.builder().type(ExecutionType.FAILOVER).build().getTaskNodePath();
- Assert.assertThat(FailoverNode.getFailoverTaskNodePath(jobNodePath), Is.is("/state/failover/test_job/" + jobNodePath));
+ assertThat(FailoverNode.getFailoverTaskNodePath(jobNodePath), is("/state/failover/test_job/" + jobNodePath));
}
}
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 ea65b66..2a976b4 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
@@ -27,13 +27,10 @@ import org.apache.shardingsphere.elasticjob.cloud.scheduler.env.BootstrapEnviron
import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.CloudJobConfigurationBuilder;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.TaskNode;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.state.running.RunningService;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.unitils.util.ReflectionUtils;
@@ -44,6 +41,13 @@ import java.util.Map;
import java.util.Optional;
import java.util.UUID;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
@RunWith(MockitoJUnitRunner.class)
public final class FailoverServiceTest {
@@ -67,71 +71,71 @@ public final class FailoverServiceTest {
@Test
public void assertAddWhenJobIsOverQueueSize() {
- Mockito.when(regCenter.getNumChildren(FailoverNode.ROOT)).thenReturn(BootstrapEnvironment.getInstance().getFrameworkConfiguration().getJobStateQueueSize() + 1);
+ when(regCenter.getNumChildren(FailoverNode.ROOT)).thenReturn(BootstrapEnvironment.getInstance().getFrameworkConfiguration().getJobStateQueueSize() + 1);
TaskNode taskNode = TaskNode.builder().type(ExecutionType.FAILOVER).build();
failoverService.add(TaskContext.from(taskNode.getTaskNodeValue()));
- Mockito.verify(regCenter, Mockito.times(0)).persist("/state/failover/test_job/" + taskNode.getTaskNodePath(), taskNode.getTaskNodeValue());
+ verify(regCenter, times(0)).persist("/state/failover/test_job/" + taskNode.getTaskNodePath(), taskNode.getTaskNodeValue());
}
@Test
public void assertAddWhenExisted() {
TaskNode taskNode = TaskNode.builder().type(ExecutionType.FAILOVER).build();
- Mockito.when(regCenter.isExisted("/state/failover/test_job/" + taskNode.getTaskNodePath())).thenReturn(true);
+ when(regCenter.isExisted("/state/failover/test_job/" + taskNode.getTaskNodePath())).thenReturn(true);
failoverService.add(TaskContext.from(taskNode.getTaskNodeValue()));
- Mockito.verify(regCenter).isExisted("/state/failover/test_job/" + taskNode.getTaskNodePath());
- Mockito.verify(regCenter, Mockito.times(0)).persist("/state/failover/test_job/" + taskNode.getTaskNodePath(), taskNode.getTaskNodeValue());
+ verify(regCenter).isExisted("/state/failover/test_job/" + taskNode.getTaskNodePath());
+ verify(regCenter, times(0)).persist("/state/failover/test_job/" + taskNode.getTaskNodePath(), taskNode.getTaskNodeValue());
}
@Test
public void assertAddWhenNotExistedAndTaskIsRunning() {
TaskNode taskNode = TaskNode.builder().type(ExecutionType.FAILOVER).build();
- Mockito.when(regCenter.isExisted("/state/failover/test_job/" + taskNode.getTaskNodePath())).thenReturn(false);
- Mockito.when(runningService.isTaskRunning(TaskContext.MetaInfo.from(taskNode.getTaskNodePath()))).thenReturn(true);
+ when(regCenter.isExisted("/state/failover/test_job/" + taskNode.getTaskNodePath())).thenReturn(false);
+ when(runningService.isTaskRunning(TaskContext.MetaInfo.from(taskNode.getTaskNodePath()))).thenReturn(true);
failoverService.add(TaskContext.from(taskNode.getTaskNodeValue()));
- Mockito.verify(regCenter).isExisted("/state/failover/test_job/" + taskNode.getTaskNodePath());
- Mockito.verify(runningService).isTaskRunning(TaskContext.MetaInfo.from(taskNode.getTaskNodePath()));
- Mockito.verify(regCenter, Mockito.times(0)).persist("/state/failover/test_job/" + taskNode.getTaskNodePath(), taskNode.getTaskNodeValue());
+ verify(regCenter).isExisted("/state/failover/test_job/" + taskNode.getTaskNodePath());
+ verify(runningService).isTaskRunning(TaskContext.MetaInfo.from(taskNode.getTaskNodePath()));
+ verify(regCenter, times(0)).persist("/state/failover/test_job/" + taskNode.getTaskNodePath(), taskNode.getTaskNodeValue());
}
@Test
public void assertAddWhenNotExistedAndTaskIsNotRunning() {
TaskNode taskNode = TaskNode.builder().type(ExecutionType.FAILOVER).build();
- Mockito.when(regCenter.isExisted("/state/failover/test_job/" + taskNode.getTaskNodePath())).thenReturn(false);
- Mockito.when(runningService.isTaskRunning(TaskContext.MetaInfo.from(taskNode.getTaskNodePath()))).thenReturn(false);
+ when(regCenter.isExisted("/state/failover/test_job/" + taskNode.getTaskNodePath())).thenReturn(false);
+ when(runningService.isTaskRunning(TaskContext.MetaInfo.from(taskNode.getTaskNodePath()))).thenReturn(false);
failoverService.add(TaskContext.from(taskNode.getTaskNodeValue()));
- Mockito.verify(regCenter).isExisted("/state/failover/test_job/" + taskNode.getTaskNodePath());
- Mockito.verify(runningService).isTaskRunning(TaskContext.MetaInfo.from(taskNode.getTaskNodePath()));
- Mockito.verify(regCenter).persist("/state/failover/test_job/" + taskNode.getTaskNodePath(), taskNode.getTaskNodeValue());
+ verify(regCenter).isExisted("/state/failover/test_job/" + taskNode.getTaskNodePath());
+ verify(runningService).isTaskRunning(TaskContext.MetaInfo.from(taskNode.getTaskNodePath()));
+ verify(regCenter).persist("/state/failover/test_job/" + taskNode.getTaskNodePath(), taskNode.getTaskNodeValue());
}
@Test
public void assertGetAllEligibleJobContextsWithoutRootNode() {
- Mockito.when(regCenter.isExisted("/state/failover")).thenReturn(false);
- Assert.assertTrue(failoverService.getAllEligibleJobContexts().isEmpty());
- Mockito.verify(regCenter).isExisted("/state/failover");
+ when(regCenter.isExisted("/state/failover")).thenReturn(false);
+ assertTrue(failoverService.getAllEligibleJobContexts().isEmpty());
+ verify(regCenter).isExisted("/state/failover");
}
@Test
public void assertGetAllEligibleJobContextsWithRootNode() {
- Mockito.when(regCenter.isExisted("/state/failover")).thenReturn(true);
- Mockito.when(regCenter.getChildrenKeys("/state/failover")).thenReturn(Arrays.asList("task_empty_job", "not_existed_job", "eligible_job"));
- Mockito.when(regCenter.getChildrenKeys("/state/failover/task_empty_job")).thenReturn(Collections.emptyList());
- Mockito.when(regCenter.getChildrenKeys("/state/failover/not_existed_job")).thenReturn(Arrays.asList(
+ when(regCenter.isExisted("/state/failover")).thenReturn(true);
+ when(regCenter.getChildrenKeys("/state/failover")).thenReturn(Arrays.asList("task_empty_job", "not_existed_job", "eligible_job"));
+ when(regCenter.getChildrenKeys("/state/failover/task_empty_job")).thenReturn(Collections.emptyList());
+ when(regCenter.getChildrenKeys("/state/failover/not_existed_job")).thenReturn(Arrays.asList(
TaskNode.builder().jobName("not_existed_job").build().getTaskNodePath(), TaskNode.builder().jobName("not_existed_job").shardingItem(1).build().getTaskNodePath()));
String eligibleJobNodePath1 = TaskNode.builder().jobName("eligible_job").build().getTaskNodePath();
String eligibleJobNodePath2 = TaskNode.builder().jobName("eligible_job").shardingItem(1).build().getTaskNodePath();
- Mockito.when(regCenter.getChildrenKeys("/state/failover/eligible_job")).thenReturn(Arrays.asList(eligibleJobNodePath1, eligibleJobNodePath2));
- Mockito.when(configService.load("not_existed_job")).thenReturn(Optional.empty());
- Mockito.when(configService.load("eligible_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("eligible_job")));
- Mockito.when(runningService.isTaskRunning(TaskContext.MetaInfo.from(eligibleJobNodePath1))).thenReturn(true);
- Mockito.when(runningService.isTaskRunning(TaskContext.MetaInfo.from(eligibleJobNodePath2))).thenReturn(false);
+ when(regCenter.getChildrenKeys("/state/failover/eligible_job")).thenReturn(Arrays.asList(eligibleJobNodePath1, eligibleJobNodePath2));
+ when(configService.load("not_existed_job")).thenReturn(Optional.empty());
+ when(configService.load("eligible_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("eligible_job")));
+ when(runningService.isTaskRunning(TaskContext.MetaInfo.from(eligibleJobNodePath1))).thenReturn(true);
+ when(runningService.isTaskRunning(TaskContext.MetaInfo.from(eligibleJobNodePath2))).thenReturn(false);
Collection<JobContext> actual = failoverService.getAllEligibleJobContexts();
- Assert.assertThat(actual.size(), Is.is(1));
- Assert.assertThat(actual.iterator().next().getAssignedShardingItems().size(), Is.is(1));
- Assert.assertThat(actual.iterator().next().getAssignedShardingItems().get(0), Is.is(1));
- Mockito.verify(regCenter).isExisted("/state/failover");
- Mockito.verify(regCenter).remove("/state/failover/task_empty_job");
- Mockito.verify(regCenter).remove("/state/failover/not_existed_job");
+ assertThat(actual.size(), is(1));
+ assertThat(actual.iterator().next().getAssignedShardingItems().size(), is(1));
+ assertThat(actual.iterator().next().getAssignedShardingItems().get(0), is(1));
+ verify(regCenter).isExisted("/state/failover");
+ verify(regCenter).remove("/state/failover/task_empty_job");
+ verify(regCenter).remove("/state/failover/not_existed_job");
}
@Test
@@ -139,45 +143,45 @@ public final class FailoverServiceTest {
String jobNodePath1 = TaskNode.builder().type(ExecutionType.FAILOVER).build().getTaskNodePath();
String jobNodePath2 = TaskNode.builder().shardingItem(1).type(ExecutionType.FAILOVER).build().getTaskNodePath();
failoverService.remove(Arrays.asList(TaskContext.MetaInfo.from(jobNodePath1), TaskContext.MetaInfo.from(jobNodePath2)));
- Mockito.verify(regCenter).remove("/state/failover/test_job/" + jobNodePath1);
- Mockito.verify(regCenter).remove("/state/failover/test_job/" + jobNodePath2);
+ verify(regCenter).remove("/state/failover/test_job/" + jobNodePath1);
+ verify(regCenter).remove("/state/failover/test_job/" + jobNodePath2);
}
@Test
public void assertGetTaskId() {
TaskNode taskNode = TaskNode.builder().type(ExecutionType.FAILOVER).build();
failoverService.add(TaskContext.from(taskNode.getTaskNodeValue()));
- Mockito.when(regCenter.isExisted("/state/failover/test_job/" + taskNode.getTaskNodePath())).thenReturn(true);
- Mockito.when(regCenter.get("/state/failover/test_job/" + taskNode.getTaskNodePath())).thenReturn(taskNode.getTaskNodeValue());
- Assert.assertThat(failoverService.getTaskId(taskNode.getMetaInfo()).get(), Is.is(taskNode.getTaskNodeValue()));
- Mockito.verify(regCenter, Mockito.times(2)).isExisted("/state/failover/test_job/" + taskNode.getTaskNodePath());
+ when(regCenter.isExisted("/state/failover/test_job/" + taskNode.getTaskNodePath())).thenReturn(true);
+ when(regCenter.get("/state/failover/test_job/" + taskNode.getTaskNodePath())).thenReturn(taskNode.getTaskNodeValue());
+ assertThat(failoverService.getTaskId(taskNode.getMetaInfo()).get(), is(taskNode.getTaskNodeValue()));
+ verify(regCenter, times(2)).isExisted("/state/failover/test_job/" + taskNode.getTaskNodePath());
}
@Test
public void assertGetAllFailoverTasksWithoutRootNode() {
- Mockito.when(regCenter.isExisted(FailoverNode.ROOT)).thenReturn(false);
- Assert.assertTrue(failoverService.getAllFailoverTasks().isEmpty());
- Mockito.verify(regCenter).isExisted(FailoverNode.ROOT);
+ when(regCenter.isExisted(FailoverNode.ROOT)).thenReturn(false);
+ assertTrue(failoverService.getAllFailoverTasks().isEmpty());
+ verify(regCenter).isExisted(FailoverNode.ROOT);
}
@Test
public void assertGetAllFailoverTasksWhenRootNodeHasNoChild() {
- Mockito.when(regCenter.isExisted(FailoverNode.ROOT)).thenReturn(true);
- Mockito.when(regCenter.getChildrenKeys(FailoverNode.ROOT)).thenReturn(Collections.emptyList());
- Assert.assertTrue(failoverService.getAllFailoverTasks().isEmpty());
- Mockito.verify(regCenter).isExisted(FailoverNode.ROOT);
- Mockito.verify(regCenter).getChildrenKeys(FailoverNode.ROOT);
+ when(regCenter.isExisted(FailoverNode.ROOT)).thenReturn(true);
+ when(regCenter.getChildrenKeys(FailoverNode.ROOT)).thenReturn(Collections.emptyList());
+ assertTrue(failoverService.getAllFailoverTasks().isEmpty());
+ verify(regCenter).isExisted(FailoverNode.ROOT);
+ verify(regCenter).getChildrenKeys(FailoverNode.ROOT);
}
@Test
public void assertGetAllFailoverTasksWhenJobNodeHasNoChild() {
- Mockito.when(regCenter.isExisted(FailoverNode.ROOT)).thenReturn(true);
- Mockito.when(regCenter.getChildrenKeys(FailoverNode.ROOT)).thenReturn(Lists.newArrayList("test_job"));
- Mockito.when(regCenter.getChildrenKeys(FailoverNode.getFailoverJobNodePath("test_job"))).thenReturn(Collections.emptyList());
- Assert.assertTrue(failoverService.getAllFailoverTasks().isEmpty());
- Mockito.verify(regCenter).isExisted(FailoverNode.ROOT);
- Mockito.verify(regCenter).getChildrenKeys(FailoverNode.ROOT);
- Mockito.verify(regCenter).getChildrenKeys(FailoverNode.getFailoverJobNodePath("test_job"));
+ when(regCenter.isExisted(FailoverNode.ROOT)).thenReturn(true);
+ when(regCenter.getChildrenKeys(FailoverNode.ROOT)).thenReturn(Lists.newArrayList("test_job"));
+ when(regCenter.getChildrenKeys(FailoverNode.getFailoverJobNodePath("test_job"))).thenReturn(Collections.emptyList());
+ assertTrue(failoverService.getAllFailoverTasks().isEmpty());
+ verify(regCenter).isExisted(FailoverNode.ROOT);
+ verify(regCenter).getChildrenKeys(FailoverNode.ROOT);
+ verify(regCenter).getChildrenKeys(FailoverNode.getFailoverJobNodePath("test_job"));
}
@Test
@@ -185,29 +189,29 @@ public final class FailoverServiceTest {
String uuid1 = UUID.randomUUID().toString();
String uuid2 = UUID.randomUUID().toString();
String uuid3 = UUID.randomUUID().toString();
- Mockito.when(regCenter.isExisted(FailoverNode.ROOT)).thenReturn(true);
- Mockito.when(regCenter.getChildrenKeys(FailoverNode.ROOT)).thenReturn(Lists.newArrayList("test_job_1", "test_job_2"));
- Mockito.when(regCenter.getChildrenKeys(FailoverNode.getFailoverJobNodePath("test_job_1"))).thenReturn(Lists.newArrayList("test_job_1@-@0", "test_job_1@-@1"));
- Mockito.when(regCenter.getChildrenKeys(FailoverNode.getFailoverJobNodePath("test_job_2"))).thenReturn(Lists.newArrayList("test_job_2@-@0"));
- Mockito.when(regCenter.get(FailoverNode.getFailoverTaskNodePath("test_job_1@-@0"))).thenReturn(uuid1);
- Mockito.when(regCenter.get(FailoverNode.getFailoverTaskNodePath("test_job_1@-@1"))).thenReturn(uuid2);
- Mockito.when(regCenter.get(FailoverNode.getFailoverTaskNodePath("test_job_2@-@0"))).thenReturn(uuid3);
+ when(regCenter.isExisted(FailoverNode.ROOT)).thenReturn(true);
+ when(regCenter.getChildrenKeys(FailoverNode.ROOT)).thenReturn(Lists.newArrayList("test_job_1", "test_job_2"));
+ when(regCenter.getChildrenKeys(FailoverNode.getFailoverJobNodePath("test_job_1"))).thenReturn(Lists.newArrayList("test_job_1@-@0", "test_job_1@-@1"));
+ when(regCenter.getChildrenKeys(FailoverNode.getFailoverJobNodePath("test_job_2"))).thenReturn(Lists.newArrayList("test_job_2@-@0"));
+ when(regCenter.get(FailoverNode.getFailoverTaskNodePath("test_job_1@-@0"))).thenReturn(uuid1);
+ when(regCenter.get(FailoverNode.getFailoverTaskNodePath("test_job_1@-@1"))).thenReturn(uuid2);
+ when(regCenter.get(FailoverNode.getFailoverTaskNodePath("test_job_2@-@0"))).thenReturn(uuid3);
Map<String, Collection<FailoverTaskInfo>> result = failoverService.getAllFailoverTasks();
- Assert.assertThat(result.size(), Is.is(2));
- Assert.assertThat(result.get("test_job_1").size(), Is.is(2));
- Assert.assertThat(result.get("test_job_1").toArray(new FailoverTaskInfo[]{})[0].getTaskInfo().toString(), Is.is("test_job_1@-@0"));
- Assert.assertThat(result.get("test_job_1").toArray(new FailoverTaskInfo[]{})[0].getOriginalTaskId(), Is.is(uuid1));
- Assert.assertThat(result.get("test_job_1").toArray(new FailoverTaskInfo[]{})[1].getTaskInfo().toString(), Is.is("test_job_1@-@1"));
- Assert.assertThat(result.get("test_job_1").toArray(new FailoverTaskInfo[]{})[1].getOriginalTaskId(), Is.is(uuid2));
- Assert.assertThat(result.get("test_job_2").size(), Is.is(1));
- Assert.assertThat(result.get("test_job_2").iterator().next().getTaskInfo().toString(), Is.is("test_job_2@-@0"));
- Assert.assertThat(result.get("test_job_2").iterator().next().getOriginalTaskId(), Is.is(uuid3));
- Mockito.verify(regCenter).isExisted(FailoverNode.ROOT);
- Mockito.verify(regCenter).getChildrenKeys(FailoverNode.ROOT);
- Mockito.verify(regCenter).getChildrenKeys(FailoverNode.getFailoverJobNodePath("test_job_1"));
- Mockito.verify(regCenter).getChildrenKeys(FailoverNode.getFailoverJobNodePath("test_job_2"));
- Mockito.verify(regCenter).get(FailoverNode.getFailoverTaskNodePath("test_job_1@-@0"));
- Mockito.verify(regCenter).get(FailoverNode.getFailoverTaskNodePath("test_job_1@-@1"));
- Mockito.verify(regCenter).get(FailoverNode.getFailoverTaskNodePath("test_job_2@-@0"));
+ assertThat(result.size(), is(2));
+ assertThat(result.get("test_job_1").size(), is(2));
+ assertThat(result.get("test_job_1").toArray(new FailoverTaskInfo[]{})[0].getTaskInfo().toString(), is("test_job_1@-@0"));
+ assertThat(result.get("test_job_1").toArray(new FailoverTaskInfo[]{})[0].getOriginalTaskId(), is(uuid1));
+ assertThat(result.get("test_job_1").toArray(new FailoverTaskInfo[]{})[1].getTaskInfo().toString(), is("test_job_1@-@1"));
+ assertThat(result.get("test_job_1").toArray(new FailoverTaskInfo[]{})[1].getOriginalTaskId(), is(uuid2));
+ assertThat(result.get("test_job_2").size(), is(1));
+ assertThat(result.get("test_job_2").iterator().next().getTaskInfo().toString(), is("test_job_2@-@0"));
+ assertThat(result.get("test_job_2").iterator().next().getOriginalTaskId(), is(uuid3));
+ verify(regCenter).isExisted(FailoverNode.ROOT);
+ verify(regCenter).getChildrenKeys(FailoverNode.ROOT);
+ verify(regCenter).getChildrenKeys(FailoverNode.getFailoverJobNodePath("test_job_1"));
+ verify(regCenter).getChildrenKeys(FailoverNode.getFailoverJobNodePath("test_job_2"));
+ verify(regCenter).get(FailoverNode.getFailoverTaskNodePath("test_job_1@-@0"));
+ verify(regCenter).get(FailoverNode.getFailoverTaskNodePath("test_job_1@-@1"));
+ verify(regCenter).get(FailoverNode.getFailoverTaskNodePath("test_job_2@-@0"));
}
}
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 b415db7..34104f3 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,14 +17,15 @@
package org.apache.shardingsphere.elasticjob.cloud.scheduler.state.ready;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public final class ReadyNodeTest {
@Test
public void assertGetReadyJobNodePath() {
- Assert.assertThat(ReadyNode.getReadyJobNodePath("test_job0000000001"), Is.is("/state/ready/test_job0000000001"));
+ assertThat(ReadyNode.getReadyJobNodePath("test_job0000000001"), is("/state/ready/test_job0000000001"));
}
}
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 ad347b2..a7fffc1 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,14 +26,11 @@ import org.apache.shardingsphere.elasticjob.cloud.scheduler.context.JobContext;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.env.BootstrapEnvironment;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.CloudJobConfigurationBuilder;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.state.running.RunningService;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
-import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.unitils.util.ReflectionUtils;
@@ -42,6 +39,14 @@ import java.util.Collections;
import java.util.Map;
import java.util.Optional;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.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)
public final class ReadyServiceTest {
@@ -65,217 +70,217 @@ public final class ReadyServiceTest {
@Test
public void assertAddTransientWithJobConfigIsNotPresent() {
- Mockito.when(configService.load("test_job")).thenReturn(Optional.empty());
+ when(configService.load("test_job")).thenReturn(Optional.empty());
readyService.addTransient("test_job");
- Mockito.verify(regCenter, Mockito.times(0)).isExisted("/state/ready");
- Mockito.verify(regCenter, Mockito.times(0)).persist(ArgumentMatchers.any(), ArgumentMatchers.eq(""));
+ verify(regCenter, times(0)).isExisted("/state/ready");
+ verify(regCenter, times(0)).persist(ArgumentMatchers.any(), ArgumentMatchers.eq(""));
}
@Test
public void assertAddTransientWithJobConfigIsNotTransient() {
- Mockito.when(configService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job", CloudJobExecutionType.DAEMON)));
+ when(configService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job", CloudJobExecutionType.DAEMON)));
readyService.addTransient("test_job");
- Mockito.verify(regCenter, Mockito.times(0)).isExisted("/state/ready");
- Mockito.verify(regCenter, Mockito.times(0)).persist(ArgumentMatchers.any(), ArgumentMatchers.eq(""));
+ verify(regCenter, times(0)).isExisted("/state/ready");
+ verify(regCenter, times(0)).persist(ArgumentMatchers.any(), ArgumentMatchers.eq(""));
}
@Test
public void assertAddTransientWhenJobExistedAndEnableMisfired() {
- Mockito.when(configService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job")));
- Mockito.when(regCenter.getDirectly("/state/ready/test_job")).thenReturn("1");
+ when(configService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job")));
+ when(regCenter.getDirectly("/state/ready/test_job")).thenReturn("1");
readyService.addTransient("test_job");
- Mockito.verify(regCenter).persist("/state/ready/test_job", "2");
+ verify(regCenter).persist("/state/ready/test_job", "2");
}
@Test
public void assertAddTransientWhenJobExistedAndDisableMisfired() {
- Mockito.when(configService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job", false)));
- Mockito.when(regCenter.getDirectly("/state/ready/test_job")).thenReturn("1");
+ when(configService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job", false)));
+ when(regCenter.getDirectly("/state/ready/test_job")).thenReturn("1");
readyService.addTransient("test_job");
- Mockito.verify(regCenter).persist("/state/ready/test_job", "1");
+ verify(regCenter).persist("/state/ready/test_job", "1");
}
@Test
public void assertAddTransientWhenJobNotExisted() {
- Mockito.when(configService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job")));
+ when(configService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job")));
readyService.addTransient("test_job");
- Mockito.verify(regCenter).persist("/state/ready/test_job", "1");
+ verify(regCenter).persist("/state/ready/test_job", "1");
}
@Test
public void assertAddTransientWithOverJobQueueSize() {
- Mockito.when(regCenter.getNumChildren(ReadyNode.ROOT)).thenReturn(BootstrapEnvironment.getInstance().getFrameworkConfiguration().getJobStateQueueSize() + 1);
+ when(regCenter.getNumChildren(ReadyNode.ROOT)).thenReturn(BootstrapEnvironment.getInstance().getFrameworkConfiguration().getJobStateQueueSize() + 1);
readyService.addTransient("test_job");
- Mockito.verify(regCenter, Mockito.times(0)).persist("/state/ready/test_job", "1");
+ verify(regCenter, times(0)).persist("/state/ready/test_job", "1");
}
@Test
public void assertAddDaemonWithOverJobQueueSize() {
- Mockito.when(regCenter.getNumChildren(ReadyNode.ROOT)).thenReturn(BootstrapEnvironment.getInstance().getFrameworkConfiguration().getJobStateQueueSize() + 1);
+ when(regCenter.getNumChildren(ReadyNode.ROOT)).thenReturn(BootstrapEnvironment.getInstance().getFrameworkConfiguration().getJobStateQueueSize() + 1);
readyService.addDaemon("test_job");
- Mockito.verify(regCenter, Mockito.times(0)).persist("/state/ready/test_job", "1");
+ verify(regCenter, times(0)).persist("/state/ready/test_job", "1");
}
@Test
public void assertAddDaemonWithJobConfigIsNotPresent() {
- Mockito.when(configService.load("test_job")).thenReturn(Optional.empty());
+ when(configService.load("test_job")).thenReturn(Optional.empty());
readyService.addDaemon("test_job");
- Mockito.verify(regCenter, Mockito.times(0)).isExisted("/state/ready");
- Mockito.verify(regCenter, Mockito.times(0)).persist(ArgumentMatchers.any(), ArgumentMatchers.eq("1"));
+ verify(regCenter, times(0)).isExisted("/state/ready");
+ verify(regCenter, times(0)).persist(ArgumentMatchers.any(), ArgumentMatchers.eq("1"));
}
@Test
public void assertAddDaemonWithJobConfigIsNotDaemon() {
- Mockito.when(configService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job")));
+ when(configService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job")));
readyService.addDaemon("test_job");
- Mockito.verify(regCenter, Mockito.times(0)).isExisted("/state/ready");
- Mockito.verify(regCenter, Mockito.times(0)).persist(ArgumentMatchers.any(), ArgumentMatchers.eq("1"));
+ verify(regCenter, times(0)).isExisted("/state/ready");
+ verify(regCenter, times(0)).persist(ArgumentMatchers.any(), ArgumentMatchers.eq("1"));
}
@Test
public void assertAddDaemonWithoutRootNode() {
- Mockito.when(configService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job", CloudJobExecutionType.DAEMON)));
+ when(configService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job", CloudJobExecutionType.DAEMON)));
readyService.addDaemon("test_job");
- Mockito.verify(regCenter).persist("/state/ready/test_job", "1");
+ verify(regCenter).persist("/state/ready/test_job", "1");
}
@Test
public void assertAddDaemonWithSameJobName() {
- Mockito.when(configService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job", CloudJobExecutionType.DAEMON)));
+ when(configService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job", CloudJobExecutionType.DAEMON)));
readyService.addDaemon("test_job");
- Mockito.verify(regCenter).persist(ArgumentMatchers.any(), ArgumentMatchers.eq("1"));
+ verify(regCenter).persist(ArgumentMatchers.any(), ArgumentMatchers.eq("1"));
}
@Test
public void assertAddRunningDaemon() {
- Mockito.when(configService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job", CloudJobExecutionType.DAEMON)));
- Mockito.when(runningService.isJobRunning("test_job")).thenReturn(true);
+ when(configService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job", CloudJobExecutionType.DAEMON)));
+ when(runningService.isJobRunning("test_job")).thenReturn(true);
readyService.addDaemon("test_job");
- Mockito.verify(regCenter, Mockito.never()).persist(ArgumentMatchers.any(), ArgumentMatchers.eq("1"));
+ verify(regCenter, never()).persist(ArgumentMatchers.any(), ArgumentMatchers.eq("1"));
}
@Test
public void assertAddDaemonWithoutSameJobName() {
- Mockito.when(configService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job", CloudJobExecutionType.DAEMON)));
+ when(configService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job", CloudJobExecutionType.DAEMON)));
readyService.addDaemon("test_job");
- Mockito.verify(regCenter).persist("/state/ready/test_job", "1");
+ verify(regCenter).persist("/state/ready/test_job", "1");
}
@Test
public void assertGetAllEligibleJobContextsWithoutRootNode() {
- Mockito.when(regCenter.isExisted("/state/ready")).thenReturn(false);
- Assert.assertTrue(readyService.getAllEligibleJobContexts(Collections.emptyList()).isEmpty());
- Mockito.verify(regCenter).isExisted("/state/ready");
+ when(regCenter.isExisted("/state/ready")).thenReturn(false);
+ assertTrue(readyService.getAllEligibleJobContexts(Collections.emptyList()).isEmpty());
+ verify(regCenter).isExisted("/state/ready");
}
@Test
public void assertSetMisfireDisabledWhenJobIsNotExisted() {
- Mockito.when(configService.load("test_job")).thenReturn(Optional.empty());
+ when(configService.load("test_job")).thenReturn(Optional.empty());
readyService.setMisfireDisabled("test_job");
- Mockito.verify(regCenter, Mockito.times(0)).persist("/state/ready/test_job", "1");
+ verify(regCenter, times(0)).persist("/state/ready/test_job", "1");
}
@Test
public void assertSetMisfireDisabledWhenReadyNodeNotExisted() {
- Mockito.when(configService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job")));
+ when(configService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job")));
readyService.setMisfireDisabled("test_job");
- Mockito.verify(regCenter, Mockito.times(0)).persist("/state/ready/test_job", "1");
+ verify(regCenter, times(0)).persist("/state/ready/test_job", "1");
}
@Test
public void assertSetMisfireDisabledWhenReadyNodeExisted() {
- Mockito.when(configService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job")));
- Mockito.when(regCenter.getDirectly("/state/ready/test_job")).thenReturn("100");
+ when(configService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job")));
+ when(regCenter.getDirectly("/state/ready/test_job")).thenReturn("100");
readyService.setMisfireDisabled("test_job");
- Mockito.verify(regCenter).persist("/state/ready/test_job", "1");
+ verify(regCenter).persist("/state/ready/test_job", "1");
}
@Test
public void assertGetAllEligibleJobContextsWithRootNode() {
- Mockito.when(regCenter.isExisted("/state/ready")).thenReturn(true);
- Mockito.when(regCenter.getChildrenKeys("/state/ready")).thenReturn(Arrays.asList("not_existed_job", "running_job", "ineligible_job", "eligible_job"));
- Mockito.when(configService.load("not_existed_job")).thenReturn(Optional.empty());
- Mockito.when(configService.load("running_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("running_job")));
- Mockito.when(configService.load("eligible_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("eligible_job")));
- Mockito.when(runningService.isJobRunning("running_job")).thenReturn(true);
- Mockito.when(runningService.isJobRunning("eligible_job")).thenReturn(false);
- Assert.assertThat(readyService.getAllEligibleJobContexts(Collections.singletonList(
- JobContext.from(CloudJobConfigurationBuilder.createCloudJobConfiguration("ineligible_job"), ExecutionType.READY))).size(), Is.is(1));
- Mockito.verify(regCenter).isExisted("/state/ready");
- Mockito.verify(regCenter, Mockito.times(1)).getChildrenKeys("/state/ready");
- Mockito.verify(configService).load("not_existed_job");
- Mockito.verify(configService).load("running_job");
- Mockito.verify(configService).load("eligible_job");
- Mockito.verify(regCenter).remove("/state/ready/not_existed_job");
+ when(regCenter.isExisted("/state/ready")).thenReturn(true);
+ when(regCenter.getChildrenKeys("/state/ready")).thenReturn(Arrays.asList("not_existed_job", "running_job", "ineligible_job", "eligible_job"));
+ when(configService.load("not_existed_job")).thenReturn(Optional.empty());
+ when(configService.load("running_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("running_job")));
+ when(configService.load("eligible_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("eligible_job")));
+ when(runningService.isJobRunning("running_job")).thenReturn(true);
+ when(runningService.isJobRunning("eligible_job")).thenReturn(false);
+ assertThat(readyService.getAllEligibleJobContexts(Collections.singletonList(
+ JobContext.from(CloudJobConfigurationBuilder.createCloudJobConfiguration("ineligible_job"), ExecutionType.READY))).size(), is(1));
+ verify(regCenter).isExisted("/state/ready");
+ verify(regCenter, times(1)).getChildrenKeys("/state/ready");
+ verify(configService).load("not_existed_job");
+ verify(configService).load("running_job");
+ verify(configService).load("eligible_job");
+ verify(regCenter).remove("/state/ready/not_existed_job");
}
@Test
public void assertGetAllEligibleJobContextsWithRootNodeAndDaemonJob() {
- Mockito.when(regCenter.isExisted("/state/ready")).thenReturn(true);
- Mockito.when(regCenter.getChildrenKeys("/state/ready")).thenReturn(Arrays.asList("not_existed_job", "running_job"));
- Mockito.when(configService.load("not_existed_job")).thenReturn(Optional.empty());
- Mockito.when(configService.load("running_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("running_job", CloudJobExecutionType.DAEMON)));
- Mockito.when(runningService.isJobRunning("running_job")).thenReturn(true);
- Assert.assertThat(readyService.getAllEligibleJobContexts(Collections.emptyList()).size(), Is.is(0));
- Mockito.verify(regCenter).isExisted("/state/ready");
- Mockito.verify(regCenter, Mockito.times(1)).getChildrenKeys("/state/ready");
- Mockito.verify(configService).load("not_existed_job");
- Mockito.verify(configService).load("running_job");
+ when(regCenter.isExisted("/state/ready")).thenReturn(true);
+ when(regCenter.getChildrenKeys("/state/ready")).thenReturn(Arrays.asList("not_existed_job", "running_job"));
+ when(configService.load("not_existed_job")).thenReturn(Optional.empty());
+ when(configService.load("running_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("running_job", CloudJobExecutionType.DAEMON)));
+ when(runningService.isJobRunning("running_job")).thenReturn(true);
+ assertThat(readyService.getAllEligibleJobContexts(Collections.emptyList()).size(), is(0));
+ verify(regCenter).isExisted("/state/ready");
+ verify(regCenter, times(1)).getChildrenKeys("/state/ready");
+ verify(configService).load("not_existed_job");
+ verify(configService).load("running_job");
}
@Test
public void assertRemove() {
- Mockito.when(regCenter.getDirectly("/state/ready/test_job_1")).thenReturn("1");
- Mockito.when(regCenter.getDirectly("/state/ready/test_job_2")).thenReturn("2");
+ when(regCenter.getDirectly("/state/ready/test_job_1")).thenReturn("1");
+ when(regCenter.getDirectly("/state/ready/test_job_2")).thenReturn("2");
readyService.remove(Arrays.asList("test_job_1", "test_job_2"));
- Mockito.verify(regCenter).persist("/state/ready/test_job_2", "1");
- Mockito.verify(regCenter).remove("/state/ready/test_job_1");
- Mockito.verify(regCenter, Mockito.times(0)).persist("/state/ready/test_job_1", "0");
- Mockito.verify(regCenter, Mockito.times(0)).remove("/state/ready/test_job_2");
+ verify(regCenter).persist("/state/ready/test_job_2", "1");
+ verify(regCenter).remove("/state/ready/test_job_1");
+ verify(regCenter, times(0)).persist("/state/ready/test_job_1", "0");
+ verify(regCenter, times(0)).remove("/state/ready/test_job_2");
}
@Test
public void assertGetAllTasksWithoutRootNode() {
- Mockito.when(regCenter.isExisted(ReadyNode.ROOT)).thenReturn(false);
- Assert.assertTrue(readyService.getAllReadyTasks().isEmpty());
- Mockito.verify(regCenter).isExisted(ReadyNode.ROOT);
- Mockito.verify(regCenter, Mockito.times(0)).getChildrenKeys(ArgumentMatchers.any());
- Mockito.verify(regCenter, Mockito.times(0)).get(ArgumentMatchers.any());
+ when(regCenter.isExisted(ReadyNode.ROOT)).thenReturn(false);
+ assertTrue(readyService.getAllReadyTasks().isEmpty());
+ verify(regCenter).isExisted(ReadyNode.ROOT);
+ verify(regCenter, times(0)).getChildrenKeys(ArgumentMatchers.any());
+ verify(regCenter, times(0)).get(ArgumentMatchers.any());
}
@Test
public void assertGetAllTasksWhenRootNodeHasNoChild() {
- Mockito.when(regCenter.isExisted(ReadyNode.ROOT)).thenReturn(true);
- Mockito.when(regCenter.getChildrenKeys(ReadyNode.ROOT)).thenReturn(Collections.emptyList());
- Assert.assertTrue(readyService.getAllReadyTasks().isEmpty());
- Mockito.verify(regCenter).isExisted(ReadyNode.ROOT);
- Mockito.verify(regCenter).getChildrenKeys(ReadyNode.ROOT);
- Mockito.verify(regCenter, Mockito.times(0)).get(ArgumentMatchers.any());
+ when(regCenter.isExisted(ReadyNode.ROOT)).thenReturn(true);
+ when(regCenter.getChildrenKeys(ReadyNode.ROOT)).thenReturn(Collections.emptyList());
+ assertTrue(readyService.getAllReadyTasks().isEmpty());
+ verify(regCenter).isExisted(ReadyNode.ROOT);
+ verify(regCenter).getChildrenKeys(ReadyNode.ROOT);
+ verify(regCenter, times(0)).get(ArgumentMatchers.any());
}
@Test
public void assertGetAllTasksWhenNodeIsEmpty() {
- Mockito.when(regCenter.isExisted(ReadyNode.ROOT)).thenReturn(true);
- Mockito.when(regCenter.getChildrenKeys(ReadyNode.ROOT)).thenReturn(Lists.newArrayList("test_job"));
- Mockito.when(regCenter.get(ReadyNode.getReadyJobNodePath("test_job"))).thenReturn("");
- Assert.assertTrue(readyService.getAllReadyTasks().isEmpty());
- Mockito.verify(regCenter).isExisted(ReadyNode.ROOT);
- Mockito.verify(regCenter).getChildrenKeys(ReadyNode.ROOT);
- Mockito.verify(regCenter).get(ReadyNode.getReadyJobNodePath("test_job"));
+ when(regCenter.isExisted(ReadyNode.ROOT)).thenReturn(true);
+ when(regCenter.getChildrenKeys(ReadyNode.ROOT)).thenReturn(Lists.newArrayList("test_job"));
+ when(regCenter.get(ReadyNode.getReadyJobNodePath("test_job"))).thenReturn("");
+ assertTrue(readyService.getAllReadyTasks().isEmpty());
+ verify(regCenter).isExisted(ReadyNode.ROOT);
+ verify(regCenter).getChildrenKeys(ReadyNode.ROOT);
+ verify(regCenter).get(ReadyNode.getReadyJobNodePath("test_job"));
}
@Test
public void assertGetAllTasksWithRootNode() {
- Mockito.when(regCenter.isExisted(ReadyNode.ROOT)).thenReturn(true);
- Mockito.when(regCenter.getChildrenKeys(ReadyNode.ROOT)).thenReturn(Lists.newArrayList("test_job_1", "test_job_2"));
- Mockito.when(regCenter.get(ReadyNode.getReadyJobNodePath("test_job_1"))).thenReturn("1");
- Mockito.when(regCenter.get(ReadyNode.getReadyJobNodePath("test_job_2"))).thenReturn("5");
+ when(regCenter.isExisted(ReadyNode.ROOT)).thenReturn(true);
+ when(regCenter.getChildrenKeys(ReadyNode.ROOT)).thenReturn(Lists.newArrayList("test_job_1", "test_job_2"));
+ when(regCenter.get(ReadyNode.getReadyJobNodePath("test_job_1"))).thenReturn("1");
+ when(regCenter.get(ReadyNode.getReadyJobNodePath("test_job_2"))).thenReturn("5");
Map<String, Integer> result = readyService.getAllReadyTasks();
- Assert.assertThat(result.size(), Is.is(2));
- Assert.assertThat(result.get("test_job_1"), Is.is(1));
- Assert.assertThat(result.get("test_job_2"), Is.is(5));
- Mockito.verify(regCenter).isExisted(ReadyNode.ROOT);
- Mockito.verify(regCenter).getChildrenKeys(ReadyNode.ROOT);
- Mockito.verify(regCenter, Mockito.times(2)).get(ArgumentMatchers.any());
+ assertThat(result.size(), is(2));
+ assertThat(result.get("test_job_1"), is(1));
+ assertThat(result.get("test_job_2"), is(5));
+ verify(regCenter).isExisted(ReadyNode.ROOT);
+ verify(regCenter).getChildrenKeys(ReadyNode.ROOT);
+ verify(regCenter, times(2)).get(ArgumentMatchers.any());
}
}
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 136633b..1590c57 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,20 +18,21 @@
package org.apache.shardingsphere.elasticjob.cloud.scheduler.state.running;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.TaskNode;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public final class RunningNodeTest {
@Test
public void assertGetRunningJobNodePath() {
- Assert.assertThat(RunningNode.getRunningJobNodePath("test_job"), Is.is("/state/running/test_job"));
+ assertThat(RunningNode.getRunningJobNodePath("test_job"), is("/state/running/test_job"));
}
@Test
public void assertGetRunningTaskNodePath() {
String nodePath = TaskNode.builder().build().getTaskNodePath();
- Assert.assertThat(RunningNode.getRunningTaskNodePath(nodePath), Is.is("/state/running/test_job/" + nodePath));
+ assertThat(RunningNode.getRunningTaskNodePath(nodePath), is("/state/running/test_job/" + nodePath));
}
}
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 0932081..ab39511 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
@@ -18,25 +18,30 @@
package org.apache.shardingsphere.elasticjob.cloud.scheduler.state.running;
import org.apache.shardingsphere.elasticjob.cloud.context.ExecutionType;
+import org.apache.shardingsphere.elasticjob.cloud.context.TaskContext;
+import org.apache.shardingsphere.elasticjob.cloud.reg.base.CoordinatorRegistryCenter;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.config.job.CloudJobExecutionType;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.CloudJsonConstants;
import org.apache.shardingsphere.elasticjob.cloud.scheduler.fixture.TaskNode;
-import org.apache.shardingsphere.elasticjob.cloud.context.TaskContext;
-import org.apache.shardingsphere.elasticjob.cloud.reg.base.CoordinatorRegistryCenter;
-import org.hamcrest.core.Is;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
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.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
@RunWith(MockitoJUnitRunner.class)
public final class RunningServiceTest {
@@ -51,18 +56,18 @@ public final class RunningServiceTest {
@Before
public void setUp() {
- Mockito.when(regCenter.get("/config/job/test_job")).thenReturn(CloudJsonConstants.getJobJson(CloudJobExecutionType.DAEMON));
- Mockito.when(regCenter.get("/config/job/test_job_t")).thenReturn(CloudJsonConstants.getJobJson("test_job_t"));
+ 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"));
runningService = new RunningService(regCenter);
taskContext = TaskContext.from(TaskNode.builder().build().getTaskNodeValue());
taskContextT = TaskContext.from(TaskNode.builder().jobName("test_job_t").build().getTaskNodeValue());
runningService.add(taskContext);
runningService.add(taskContextT);
- Assert.assertThat(runningService.getAllRunningDaemonTasks().size(), Is.is(1));
- Assert.assertThat(runningService.getAllRunningTasks().size(), Is.is(2));
+ assertThat(runningService.getAllRunningDaemonTasks().size(), is(1));
+ assertThat(runningService.getAllRunningTasks().size(), is(2));
String path = RunningNode.getRunningTaskNodePath(taskContext.getMetaInfo().toString());
- Mockito.verify(regCenter).isExisted(path);
- Mockito.verify(regCenter).persist(path, taskContext.getId());
+ verify(regCenter).isExisted(path);
+ verify(regCenter).persist(path, taskContext.getId());
}
@After
@@ -74,88 +79,88 @@ public final class RunningServiceTest {
public void assertStart() {
TaskNode taskNode1 = TaskNode.builder().jobName("test_job").shardingItem(0).slaveId("111").type(ExecutionType.READY).uuid(UUID.randomUUID().toString()).build();
TaskNode taskNode2 = TaskNode.builder().jobName("test_job").shardingItem(1).slaveId("222").type(ExecutionType.FAILOVER).uuid(UUID.randomUUID().toString()).build();
- Mockito.when(regCenter.getChildrenKeys(RunningNode.ROOT)).thenReturn(Collections.singletonList("test_job"));
- Mockito.when(regCenter.getChildrenKeys(RunningNode.getRunningJobNodePath("test_job"))).thenReturn(Arrays.asList(taskNode1.getTaskNodePath(), taskNode2.getTaskNodePath()));
- Mockito.when(regCenter.get(RunningNode.getRunningTaskNodePath(taskNode1.getTaskNodePath()))).thenReturn(taskNode1.getTaskNodeValue());
- Mockito.when(regCenter.get(RunningNode.getRunningTaskNodePath(taskNode2.getTaskNodePath()))).thenReturn(taskNode2.getTaskNodeValue());
+ when(regCenter.getChildrenKeys(RunningNode.ROOT)).thenReturn(Collections.singletonList("test_job"));
+ when(regCenter.getChildrenKeys(RunningNode.getRunningJobNodePath("test_job"))).thenReturn(Arrays.asList(taskNode1.getTaskNodePath(), taskNode2.getTaskNodePath()));
+ when(regCenter.get(RunningNode.getRunningTaskNodePath(taskNode1.getTaskNodePath()))).thenReturn(taskNode1.getTaskNodeValue());
+ when(regCenter.get(RunningNode.getRunningTaskNodePath(taskNode2.getTaskNodePath()))).thenReturn(taskNode2.getTaskNodeValue());
runningService.start();
- Assert.assertThat(runningService.getAllRunningDaemonTasks().size(), Is.is(2));
+ assertThat(runningService.getAllRunningDaemonTasks().size(), is(2));
}
@Test
public void assertAddWithoutData() {
- Assert.assertThat(runningService.getRunningTasks("test_job").size(), Is.is(1));
- Assert.assertThat(runningService.getRunningTasks("test_job").iterator().next(), Is.is(taskContext));
- Assert.assertThat(runningService.getRunningTasks("test_job_t").size(), Is.is(1));
- Assert.assertThat(runningService.getRunningTasks("test_job_t").iterator().next(), Is.is(taskContextT));
+ assertThat(runningService.getRunningTasks("test_job").size(), is(1));
+ assertThat(runningService.getRunningTasks("test_job").iterator().next(), is(taskContext));
+ assertThat(runningService.getRunningTasks("test_job_t").size(), is(1));
+ assertThat(runningService.getRunningTasks("test_job_t").iterator().next(), is(taskContextT));
}
@Test
public void assertAddWithData() {
- Mockito.when(regCenter.get("/config/job/other_job")).thenReturn(CloudJsonConstants.getJobJson("other_job"));
+ when(regCenter.get("/config/job/other_job")).thenReturn(CloudJsonConstants.getJobJson("other_job"));
TaskNode taskNode = TaskNode.builder().jobName("other_job").build();
runningService.add(TaskContext.from(taskNode.getTaskNodeValue()));
- Assert.assertThat(runningService.getRunningTasks("other_job").size(), Is.is(1));
- Assert.assertThat(runningService.getRunningTasks("other_job").iterator().next(), Is.is(TaskContext.from(taskNode.getTaskNodeValue())));
+ assertThat(runningService.getRunningTasks("other_job").size(), is(1));
+ assertThat(runningService.getRunningTasks("other_job").iterator().next(), is(TaskContext.from(taskNode.getTaskNodeValue())));
}
@Test
public void assertUpdateIdle() {
runningService.updateIdle(taskContext, true);
- Assert.assertThat(runningService.getRunningTasks("test_job").size(), Is.is(1));
- Assert.assertTrue(runningService.getRunningTasks("test_job").iterator().next().isIdle());
+ assertThat(runningService.getRunningTasks("test_job").size(), is(1));
+ assertTrue(runningService.getRunningTasks("test_job").iterator().next().isIdle());
}
@Test
public void assertRemoveByJobName() {
runningService.remove("test_job");
- Assert.assertTrue(runningService.getRunningTasks("test_job").isEmpty());
- Mockito.verify(regCenter).remove(RunningNode.getRunningJobNodePath("test_job"));
+ assertTrue(runningService.getRunningTasks("test_job").isEmpty());
+ verify(regCenter).remove(RunningNode.getRunningJobNodePath("test_job"));
runningService.remove("test_job_t");
- Assert.assertTrue(runningService.getRunningTasks("test_job_t").isEmpty());
+ assertTrue(runningService.getRunningTasks("test_job_t").isEmpty());
}
@Test
public void assertRemoveByTaskContext() {
- Mockito.when(regCenter.isExisted(RunningNode.getRunningJobNodePath("test_job"))).thenReturn(true);
- Mockito.when(regCenter.getChildrenKeys(RunningNode.getRunningJobNodePath("test_job"))).thenReturn(Collections.<String>emptyList());
+ when(regCenter.isExisted(RunningNode.getRunningJobNodePath("test_job"))).thenReturn(true);
+ when(regCenter.getChildrenKeys(RunningNode.getRunningJobNodePath("test_job"))).thenReturn(Collections.emptyList());
runningService.remove(taskContext);
- Assert.assertTrue(runningService.getRunningTasks("test_job").isEmpty());
- Mockito.verify(regCenter).remove(RunningNode.getRunningTaskNodePath(taskContext.getMetaInfo().toString()));
+ assertTrue(runningService.getRunningTasks("test_job").isEmpty());
+ verify(regCenter).remove(RunningNode.getRunningTaskNodePath(taskContext.getMetaInfo().toString()));
runningService.remove(taskContextT);
- Assert.assertTrue(runningService.getRunningTasks("test_job_t").isEmpty());
+ assertTrue(runningService.getRunningTasks("test_job_t").isEmpty());
}
@Test
public void assertIsJobRunning() {
- Assert.assertTrue(runningService.isJobRunning("test_job"));
+ assertTrue(runningService.isJobRunning("test_job"));
}
@Test
public void assertIsTaskRunning() {
- Assert.assertTrue(runningService.isTaskRunning(TaskContext.MetaInfo.from(TaskNode.builder().build().getTaskNodePath())));
+ assertTrue(runningService.isTaskRunning(TaskContext.MetaInfo.from(TaskNode.builder().build().getTaskNodePath())));
}
@Test
public void assertIsTaskNotRunning() {
- Assert.assertFalse(runningService.isTaskRunning(TaskContext.MetaInfo.from(TaskNode.builder().shardingItem(2).build().getTaskNodePath())));
+ assertFalse(runningService.isTaskRunning(TaskContext.MetaInfo.from(TaskNode.builder().shardingItem(2).build().getTaskNodePath())));
}
@Test
public void assertMappingOperate() {
String taskId = TaskNode.builder().build().getTaskNodeValue();
- Assert.assertNull(runningService.popMapping(taskId));
+ assertNull(runningService.popMapping(taskId));
runningService.addMapping(taskId, "localhost");
- Assert.assertThat(runningService.popMapping(taskId), Is.is("localhost"));
- Assert.assertNull(runningService.popMapping(taskId));
+ assertThat(runningService.popMapping(taskId), is("localhost"));
+ assertNull(runningService.popMapping(taskId));
}
@Test
public void assertClear() {
- Assert.assertFalse(runningService.getRunningTasks("test_job").isEmpty());
+ assertFalse(runningService.getRunningTasks("test_job").isEmpty());
runningService.addMapping(TaskNode.builder().build().getTaskNodeValue(), "localhost");
runningService.clear();
- Assert.assertTrue(runningService.getRunningTasks("test_job").isEmpty());
- Assert.assertNull(runningService.popMapping(TaskNode.builder().build().getTaskNodeValue()));
+ assertTrue(runningService.getRunningTasks("test_job").isEmpty());
+ assertNull(runningService.popMapping(TaskNode.builder().build().getTaskNodeValue()));
}
}
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 ff25d81..5686422 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,20 +28,24 @@ import org.apache.shardingsphere.elasticjob.cloud.statistics.type.job.JobRegiste
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.hamcrest.core.Is;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.unitils.util.ReflectionUtils;
import java.util.Date;
import java.util.Optional;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.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)
@@ -70,13 +74,13 @@ public final class StatisticManagerTest {
public void tearDown() throws NoSuchFieldException {
statisticManager.shutdown();
ReflectionUtils.setFieldValue(StatisticManager.class, StatisticManager.class.getDeclaredField("instance"), null);
- Mockito.reset(configurationService);
- Mockito.reset(rdbRepository);
+ reset(configurationService);
+ reset(rdbRepository);
}
@Test
public void assertGetInstance() {
- Assert.assertThat(statisticManager, Is.is(StatisticManager.getInstance(regCenter, null)));
+ assertThat(statisticManager, is(StatisticManager.getInstance(regCenter, null)));
}
@Test
@@ -95,7 +99,7 @@ public final class StatisticManagerTest {
public void assertShutdown() throws NoSuchFieldException {
ReflectionUtils.setFieldValue(statisticManager, "scheduler", scheduler);
statisticManager.shutdown();
- Mockito.verify(scheduler).shutdown();
+ verify(scheduler).shutdown();
}
@Test
@@ -107,22 +111,22 @@ public final class StatisticManagerTest {
@Test
public void assertTaskResultStatisticsWhenRdbIsNotConfigured() throws NoSuchFieldException {
ReflectionUtils.setFieldValue(statisticManager, "rdbRepository", null);
- Assert.assertThat(statisticManager.getTaskResultStatisticsWeekly().getSuccessCount(), Is.is(0));
- Assert.assertThat(statisticManager.getTaskResultStatisticsWeekly().getFailedCount(), Is.is(0));
- Assert.assertThat(statisticManager.getTaskResultStatisticsSinceOnline().getSuccessCount(), Is.is(0));
- Assert.assertThat(statisticManager.getTaskResultStatisticsSinceOnline().getFailedCount(), Is.is(0));
+ assertThat(statisticManager.getTaskResultStatisticsWeekly().getSuccessCount(), is(0));
+ assertThat(statisticManager.getTaskResultStatisticsWeekly().getFailedCount(), is(0));
+ assertThat(statisticManager.getTaskResultStatisticsSinceOnline().getSuccessCount(), is(0));
+ assertThat(statisticManager.getTaskResultStatisticsSinceOnline().getFailedCount(), is(0));
}
@Test
public void assertTaskResultStatisticsWhenRdbIsConfigured() throws NoSuchFieldException {
ReflectionUtils.setFieldValue(statisticManager, "rdbRepository", rdbRepository);
- when(rdbRepository.getSummedTaskResultStatistics(Mockito.any(Date.class), Mockito.any(StatisticInterval.class)))
+ when(rdbRepository.getSummedTaskResultStatistics(any(Date.class), any(StatisticInterval.class)))
.thenReturn(new TaskResultStatistics(10, 10, StatisticInterval.DAY, new Date()));
- Assert.assertThat(statisticManager.getTaskResultStatisticsWeekly().getSuccessCount(), Is.is(10));
- Assert.assertThat(statisticManager.getTaskResultStatisticsWeekly().getFailedCount(), Is.is(10));
- Assert.assertThat(statisticManager.getTaskResultStatisticsSinceOnline().getSuccessCount(), Is.is(10));
- Assert.assertThat(statisticManager.getTaskResultStatisticsSinceOnline().getFailedCount(), Is.is(10));
- Mockito.verify(rdbRepository, Mockito.times(4)).getSummedTaskResultStatistics(Mockito.any(Date.class), Mockito.any(StatisticInterval.class));
+ assertThat(statisticManager.getTaskResultStatisticsWeekly().getSuccessCount(), is(10));
+ assertThat(statisticManager.getTaskResultStatisticsWeekly().getFailedCount(), is(10));
+ assertThat(statisticManager.getTaskResultStatisticsSinceOnline().getSuccessCount(), is(10));
+ assertThat(statisticManager.getTaskResultStatisticsSinceOnline().getFailedCount(), is(10));
+ verify(rdbRepository, times(4)).getSummedTaskResultStatistics(any(Date.class), any(StatisticInterval.class));
}
@Test
@@ -132,10 +136,10 @@ public final class StatisticManagerTest {
CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job_simple"),
CloudJobConfigurationBuilder.createDataflowCloudJobConfiguration("test_job_dataflow"),
CloudJobConfigurationBuilder.createScriptCloudJobConfiguration("test_job_script")));
- Assert.assertThat(statisticManager.getJobTypeStatistics().getSimpleJobCount(), Is.is(1));
- Assert.assertThat(statisticManager.getJobTypeStatistics().getDataflowJobCount(), Is.is(1));
- Assert.assertThat(statisticManager.getJobTypeStatistics().getScriptJobCount(), Is.is(1));
- Mockito.verify(configurationService, Mockito.times(3)).loadAll();
+ assertThat(statisticManager.getJobTypeStatistics().getSimpleJobCount(), is(1));
+ assertThat(statisticManager.getJobTypeStatistics().getDataflowJobCount(), is(1));
+ assertThat(statisticManager.getJobTypeStatistics().getScriptJobCount(), is(1));
+ verify(configurationService, times(3)).loadAll();
}
@Test
@@ -144,54 +148,54 @@ public final class StatisticManagerTest {
when(configurationService.loadAll()).thenReturn(Lists.newArrayList(
CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job_1", CloudJobExecutionType.DAEMON),
CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job_2", CloudJobExecutionType.TRANSIENT)));
- Assert.assertThat(statisticManager.getJobExecutionTypeStatistics().getDaemonJobCount(), Is.is(1));
- Assert.assertThat(statisticManager.getJobExecutionTypeStatistics().getTransientJobCount(), Is.is(1));
- Mockito.verify(configurationService, Mockito.times(2)).loadAll();
+ assertThat(statisticManager.getJobExecutionTypeStatistics().getDaemonJobCount(), is(1));
+ assertThat(statisticManager.getJobExecutionTypeStatistics().getTransientJobCount(), is(1));
+ verify(configurationService, times(2)).loadAll();
}
@Test
public void assertFindTaskRunningStatisticsWhenRdbIsNotConfigured() throws NoSuchFieldException {
ReflectionUtils.setFieldValue(statisticManager, "rdbRepository", null);
- Assert.assertTrue(statisticManager.findTaskRunningStatisticsWeekly().isEmpty());
+ assertTrue(statisticManager.findTaskRunningStatisticsWeekly().isEmpty());
}
@Test
public void assertFindTaskRunningStatisticsWhenRdbIsConfigured() throws NoSuchFieldException {
ReflectionUtils.setFieldValue(statisticManager, "rdbRepository", rdbRepository);
- when(rdbRepository.findTaskRunningStatistics(Mockito.any(Date.class)))
+ when(rdbRepository.findTaskRunningStatistics(any(Date.class)))
.thenReturn(Lists.newArrayList(new TaskRunningStatistics(10, new Date())));
- Assert.assertThat(statisticManager.findTaskRunningStatisticsWeekly().size(), Is.is(1));
- Mockito.verify(rdbRepository).findTaskRunningStatistics(Mockito.any(Date.class));
+ assertThat(statisticManager.findTaskRunningStatisticsWeekly().size(), is(1));
+ verify(rdbRepository).findTaskRunningStatistics(any(Date.class));
}
@Test
public void assertFindJobRunningStatisticsWhenRdbIsNotConfigured() throws NoSuchFieldException {
ReflectionUtils.setFieldValue(statisticManager, "rdbRepository", null);
- Assert.assertTrue(statisticManager.findJobRunningStatisticsWeekly().isEmpty());
+ assertTrue(statisticManager.findJobRunningStatisticsWeekly().isEmpty());
}
@Test
public void assertFindJobRunningStatisticsWhenRdbIsConfigured() throws NoSuchFieldException {
ReflectionUtils.setFieldValue(statisticManager, "rdbRepository", rdbRepository);
- when(rdbRepository.findJobRunningStatistics(Mockito.any(Date.class)))
+ when(rdbRepository.findJobRunningStatistics(any(Date.class)))
.thenReturn(Lists.newArrayList(new JobRunningStatistics(10, new Date())));
- Assert.assertThat(statisticManager.findJobRunningStatisticsWeekly().size(), Is.is(1));
- Mockito.verify(rdbRepository).findJobRunningStatistics(Mockito.any(Date.class));
+ assertThat(statisticManager.findJobRunningStatisticsWeekly().size(), is(1));
+ verify(rdbRepository).findJobRunningStatistics(any(Date.class));
}
@Test
public void assertFindJobRegisterStatisticsWhenRdbIsNotConfigured() throws NoSuchFieldException {
ReflectionUtils.setFieldValue(statisticManager, "rdbRepository", null);
- Assert.assertTrue(statisticManager.findJobRegisterStatisticsSinceOnline().isEmpty());
+ assertTrue(statisticManager.findJobRegisterStatisticsSinceOnline().isEmpty());
}
@Test
public void assertFindJobRegisterStatisticsWhenRdbIsConfigured() throws NoSuchFieldException {
ReflectionUtils.setFieldValue(statisticManager, "rdbRepository", rdbRepository);
- when(rdbRepository.findJobRegisterStatistics(Mockito.any(Date.class)))
+ when(rdbRepository.findJobRegisterStatistics(any(Date.class)))
.thenReturn(Lists.newArrayList(new JobRegisterStatistics(10, new Date())));
- Assert.assertThat(statisticManager.findJobRegisterStatisticsSinceOnline().size(), Is.is(1));
- Mockito.verify(rdbRepository).findJobRegisterStatistics(Mockito.any(Date.class));
+ assertThat(statisticManager.findJobRegisterStatisticsSinceOnline().size(), is(1));
+ verify(rdbRepository).findJobRegisterStatistics(any(Date.class));
}
@Test
@@ -199,8 +203,8 @@ public final class StatisticManagerTest {
ReflectionUtils.setFieldValue(statisticManager, "rdbRepository", null);
for (StatisticInterval each : StatisticInterval.values()) {
TaskResultStatistics actual = statisticManager.findLatestTaskResultStatistics(each);
- Assert.assertThat(actual.getSuccessCount(), Is.is(0));
- Assert.assertThat(actual.getFailedCount(), Is.is(0));
+ assertThat(actual.getSuccessCount(), is(0));
+ assertThat(actual.getFailedCount(), is(0));
}
}
@@ -211,24 +215,24 @@ public final class StatisticManagerTest {
when(rdbRepository.findLatestTaskResultStatistics(each))
.thenReturn(Optional.of(new TaskResultStatistics(10, 5, each, new Date())));
TaskResultStatistics actual = statisticManager.findLatestTaskResultStatistics(each);
- Assert.assertThat(actual.getSuccessCount(), Is.is(10));
- Assert.assertThat(actual.getFailedCount(), Is.is(5));
+ assertThat(actual.getSuccessCount(), is(10));
+ assertThat(actual.getFailedCount(), is(5));
}
- Mockito.verify(rdbRepository, Mockito.times(StatisticInterval.values().length)).findLatestTaskResultStatistics(Mockito.any(StatisticInterval.class));
+ verify(rdbRepository, times(StatisticInterval.values().length)).findLatestTaskResultStatistics(any(StatisticInterval.class));
}
@Test
public void assertFindTaskResultStatisticsDailyWhenRdbIsNotConfigured() throws NoSuchFieldException {
ReflectionUtils.setFieldValue(statisticManager, "rdbRepository", null);
- Assert.assertTrue(statisticManager.findTaskResultStatisticsDaily().isEmpty());
+ assertTrue(statisticManager.findTaskResultStatisticsDaily().isEmpty());
}
@Test
public void assertFindTaskResultStatisticsDailyWhenRdbIsConfigured() throws NoSuchFieldException {
ReflectionUtils.setFieldValue(statisticManager, "rdbRepository", rdbRepository);
- when(rdbRepository.findTaskResultStatistics(Mockito.any(Date.class), Mockito.any(StatisticInterval.class)))
+ when(rdbRepository.findTaskResultStatistics(any(Date.class), any(StatisticInterval.class)))
.thenReturn(Lists.newArrayList(new TaskResultStatistics(10, 5, StatisticInterval.MINUTE, new Date())));
- Assert.assertThat(statisticManager.findTaskResultStatisticsDaily().size(), Is.is(1));
- Mockito.verify(rdbRepository).findTaskResultStatistics(Mockito.any(Date.class), Mockito.any(StatisticInterval.class));
+ assertThat(statisticManager.findTaskResultStatisticsDaily().size(), is(1));
+ verify(rdbRepository).findTaskResultStatistics(any(Date.class), any(StatisticInterval.class));
}
}
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 051d34a..94cc4bb 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
@@ -25,16 +25,12 @@ 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.JobRunningStatistics;
import org.apache.shardingsphere.elasticjob.cloud.statistics.type.task.TaskRunningStatistics;
-import org.hamcrest.core.Is;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
-import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
-import org.quartz.SchedulerException;
import org.quartz.Trigger;
import java.util.Collections;
@@ -44,6 +40,12 @@ import java.util.Map;
import java.util.Optional;
import java.util.Set;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
@RunWith(MockitoJUnitRunner.class)
public class JobRunningStatisticJobTest {
@@ -64,55 +66,55 @@ public class JobRunningStatisticJobTest {
@Test
public void assertBuildJobDetail() {
- Assert.assertThat(jobRunningStatisticJob.buildJobDetail().getKey().getName(), Is.is(JobRunningStatisticJob.class.getSimpleName()));
+ assertThat(jobRunningStatisticJob.buildJobDetail().getKey().getName(), is(JobRunningStatisticJob.class.getSimpleName()));
}
@Test
public void assertBuildTrigger() {
Trigger trigger = jobRunningStatisticJob.buildTrigger();
- Assert.assertThat(trigger.getKey().getName(), Is.is(JobRunningStatisticJob.class.getSimpleName() + "Trigger"));
+ assertThat(trigger.getKey().getName(), is(JobRunningStatisticJob.class.getSimpleName() + "Trigger"));
}
@Test
public void assertGetDataMap() {
- Assert.assertThat(jobRunningStatisticJob.getDataMap().get("runningService"), Is.is(runningService));
- Assert.assertThat(jobRunningStatisticJob.getDataMap().get("repository"), Is.is(repository));
+ assertThat(jobRunningStatisticJob.getDataMap().get("runningService"), is(runningService));
+ assertThat(jobRunningStatisticJob.getDataMap().get("repository"), is(repository));
}
@Test
- public void assertExecuteWhenRepositoryIsEmpty() throws SchedulerException {
+ public void assertExecuteWhenRepositoryIsEmpty() {
Optional<JobRunningStatistics> latestJobRunningStatistics = Optional.empty();
Optional<TaskRunningStatistics> latestTaskRunningStatistics = Optional.empty();
- Mockito.when(repository.findLatestJobRunningStatistics()).thenReturn(latestJobRunningStatistics);
- Mockito.when(repository.findLatestTaskRunningStatistics()).thenReturn(latestTaskRunningStatistics);
- Mockito.when(repository.add(ArgumentMatchers.any(JobRunningStatistics.class))).thenReturn(true);
- Mockito.when(repository.add(ArgumentMatchers.any(TaskRunningStatistics.class))).thenReturn(true);
- Mockito.when(runningService.getAllRunningTasks()).thenReturn(Collections.emptyMap());
+ when(repository.findLatestJobRunningStatistics()).thenReturn(latestJobRunningStatistics);
+ when(repository.findLatestTaskRunningStatistics()).thenReturn(latestTaskRunningStatistics);
+ when(repository.add(ArgumentMatchers.any(JobRunningStatistics.class))).thenReturn(true);
+ when(repository.add(ArgumentMatchers.any(TaskRunningStatistics.class))).thenReturn(true);
+ when(runningService.getAllRunningTasks()).thenReturn(Collections.emptyMap());
jobRunningStatisticJob.execute(null);
- Mockito.verify(repository).findLatestJobRunningStatistics();
- Mockito.verify(repository).add(ArgumentMatchers.any(JobRunningStatistics.class));
- Mockito.verify(repository).add(ArgumentMatchers.any(TaskRunningStatistics.class));
- Mockito.verify(runningService).getAllRunningTasks();
+ verify(repository).findLatestJobRunningStatistics();
+ verify(repository).add(ArgumentMatchers.any(JobRunningStatistics.class));
+ verify(repository).add(ArgumentMatchers.any(TaskRunningStatistics.class));
+ verify(runningService).getAllRunningTasks();
}
@Test
- public void assertExecute() throws SchedulerException {
+ public void assertExecute() {
Optional<JobRunningStatistics> latestJobRunningStatistics = Optional.of(new JobRunningStatistics(0, StatisticTimeUtils.getStatisticTime(StatisticInterval.MINUTE, -3)));
Optional<TaskRunningStatistics> latestTaskRunningStatistics = Optional.of(new TaskRunningStatistics(0, StatisticTimeUtils.getStatisticTime(StatisticInterval.MINUTE, -3)));
- Mockito.when(repository.findLatestJobRunningStatistics()).thenReturn(latestJobRunningStatistics);
- Mockito.when(repository.findLatestTaskRunningStatistics()).thenReturn(latestTaskRunningStatistics);
- Mockito.when(repository.add(ArgumentMatchers.any(JobRunningStatistics.class))).thenReturn(true);
- Mockito.when(repository.add(ArgumentMatchers.any(TaskRunningStatistics.class))).thenReturn(true);
+ when(repository.findLatestJobRunningStatistics()).thenReturn(latestJobRunningStatistics);
+ when(repository.findLatestTaskRunningStatistics()).thenReturn(latestTaskRunningStatistics);
+ when(repository.add(ArgumentMatchers.any(JobRunningStatistics.class))).thenReturn(true);
+ when(repository.add(ArgumentMatchers.any(TaskRunningStatistics.class))).thenReturn(true);
Map<String, Set<TaskContext>> jobMap = new HashMap<>(1);
Set<TaskContext> jobSet = new HashSet<>(1);
jobSet.add(TaskContext.from(TaskNode.builder().jobName("test_job").build().getTaskNodeValue()));
jobMap.put("test_job", jobSet);
- Mockito.when(runningService.getAllRunningTasks()).thenReturn(jobMap);
+ when(runningService.getAllRunningTasks()).thenReturn(jobMap);
jobRunningStatisticJob.execute(null);
- Mockito.verify(repository).findLatestJobRunningStatistics();
- Mockito.verify(repository).findLatestTaskRunningStatistics();
- Mockito.verify(repository, Mockito.times(3)).add(ArgumentMatchers.any(JobRunningStatistics.class));
- Mockito.verify(repository, Mockito.times(3)).add(ArgumentMatchers.any(TaskRunningStatistics.class));
- Mockito.verify(runningService).getAllRunningTasks();
+ verify(repository).findLatestJobRunningStatistics();
+ verify(repository).findLatestTaskRunningStatistics();
+ verify(repository, times(3)).add(ArgumentMatchers.any(JobRunningStatistics.class));
+ verify(repository, times(3)).add(ArgumentMatchers.any(TaskRunningStatistics.class));
+ verify(runningService).getAllRunningTasks();
}
}
diff --git a/elasticjob-common/elasticjob-tracing/elasticjob-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/JobEventBusTest.java b/elasticjob-common/elasticjob-tracing/elasticjob-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/JobEventBusTest.java
index 71b715f..a416ace 100644
--- a/elasticjob-common/elasticjob-tracing/elasticjob-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/JobEventBusTest.java
+++ b/elasticjob-common/elasticjob-tracing/elasticjob-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/tracing/JobEventBusTest.java
@@ -28,13 +28,13 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
-import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import java.lang.reflect.Field;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@RunWith(MockitoJUnitRunner.class)
@@ -73,7 +73,7 @@ public final class JobEventBusTest {
field.setAccessible(true);
field.set(jobEventBus, eventBus);
jobEventBus.post(new JobExecutionEvent("localhost", "127.0.0.1", "fake_task_id", "test_event_bus_job", JobExecutionEvent.ExecutionSource.NORMAL_TRIGGER, 0));
- verify(eventBus, Mockito.times(0)).post(ArgumentMatchers.<JobEvent>any());
+ verify(eventBus, times(0)).post(ArgumentMatchers.<JobEvent>any());
}
@SneakyThrows
diff --git a/elasticjob-common/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerTest.java b/elasticjob-common/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerTest.java
index 4df2d62..049677c 100644
--- a/elasticjob-common/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerTest.java
+++ b/elasticjob-common/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerTest.java
@@ -45,9 +45,6 @@ public final class RDBTracingListenerTest {
private static final String JOB_NAME = "test_rdb_event_listener";
@Mock
- private RDBTracingListenerConfiguration rdbTracingListenerConfig;
-
- @Mock
private RDBJobEventStorage repository;
private JobEventBus jobEventBus;