You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ro...@apache.org on 2019/10/18 06:40:38 UTC
[james-project] 05/17: JAMES-2813 rename fields and methods in
RabbitMQWorkQueueTest
This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 604c27dfbc1969e96869f11061b942548f2dc322
Author: Matthieu Baechler <ma...@apache.org>
AuthorDate: Tue Oct 8 15:39:58 2019 +0200
JAMES-2813 rename fields and methods in RabbitMQWorkQueueTest
---
.../distributed/RabbitMQWorkQueueTest.java | 44 +++++++++++-----------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/RabbitMQWorkQueueTest.java b/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/RabbitMQWorkQueueTest.java
index 2a109cd..91af0e2 100644
--- a/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/RabbitMQWorkQueueTest.java
+++ b/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/RabbitMQWorkQueueTest.java
@@ -66,8 +66,8 @@ class RabbitMQWorkQueueTest {
private RabbitMQWorkQueue testee;
- private ImmediateWorker taskManagerWorker;
- private JsonTaskSerializer taskSerializer;
+ private ImmediateWorker worker;
+ private JsonTaskSerializer serializer;
private static class ImmediateWorker implements TaskManagerWorker {
@@ -99,9 +99,9 @@ class RabbitMQWorkQueueTest {
@BeforeEach
void setUp() {
- taskManagerWorker = spy(new ImmediateWorker());
- taskSerializer = new JsonTaskSerializer(TestTaskDTOModules.COMPLETED_TASK_MODULE);
- testee = new RabbitMQWorkQueue(taskManagerWorker, rabbitMQExtension.getRabbitConnectionPool(), taskSerializer);
+ worker = spy(new ImmediateWorker());
+ serializer = new JsonTaskSerializer(TestTaskDTOModules.COMPLETED_TASK_MODULE);
+ testee = new RabbitMQWorkQueue(worker, rabbitMQExtension.getRabbitConnectionPool(), serializer);
testee.start();
}
@@ -111,20 +111,20 @@ class RabbitMQWorkQueueTest {
}
@Test
- void workerShouldConsumeSubmittedTask() {
+ void workQueueShouldConsumeSubmittedTask() {
testee.submit(TASK_WITH_ID);
- await().atMost(FIVE_HUNDRED_MILLISECONDS).until(() -> !taskManagerWorker.results.isEmpty());
- assertThat(taskManagerWorker.tasks).containsExactly(TASK_WITH_ID);
- assertThat(taskManagerWorker.results).containsExactly(Task.Result.COMPLETED);
+ await().atMost(FIVE_HUNDRED_MILLISECONDS).until(() -> !worker.results.isEmpty());
+ assertThat(worker.tasks).containsExactly(TASK_WITH_ID);
+ assertThat(worker.results).containsExactly(Task.Result.COMPLETED);
}
@Test
- void workerShouldConsumeTwoSubmittedTask() {
+ void workQueueShouldConsumeTwoSubmittedTasks() {
testee.submit(TASK_WITH_ID);
testee.submit(TASK_WITH_ID_2);
- await().atMost(FIVE_HUNDRED_MILLISECONDS).until(() -> taskManagerWorker.results.size() == 2);
- assertThat(taskManagerWorker.tasks).containsExactly(TASK_WITH_ID, TASK_WITH_ID_2);
- assertThat(taskManagerWorker.results).allSatisfy(result -> assertThat(result).isEqualTo(Task.Result.COMPLETED));
+ await().atMost(FIVE_HUNDRED_MILLISECONDS).until(() -> worker.results.size() == 2);
+ assertThat(worker.tasks).containsExactly(TASK_WITH_ID, TASK_WITH_ID_2);
+ assertThat(worker.results).allSatisfy(result -> assertThat(result).isEqualTo(Task.Result.COMPLETED));
}
@Test
@@ -132,13 +132,13 @@ class RabbitMQWorkQueueTest {
testee.submit(TASK_WITH_ID);
ImmediateWorker otherTaskManagerWorker = new ImmediateWorker();
- try (RabbitMQWorkQueue otherWorkQueue = new RabbitMQWorkQueue(otherTaskManagerWorker, rabbitMQExtension.getRabbitConnectionPool(), taskSerializer)) {
+ try (RabbitMQWorkQueue otherWorkQueue = new RabbitMQWorkQueue(otherTaskManagerWorker, rabbitMQExtension.getRabbitConnectionPool(), serializer)) {
otherWorkQueue.start();
IntStream.range(0, 9)
.forEach(ignoredIndex -> testee.submit(TASK_WITH_ID_2));
- await().atMost(FIVE_HUNDRED_MILLISECONDS).until(() -> taskManagerWorker.results.size() == 10);
+ await().atMost(FIVE_HUNDRED_MILLISECONDS).until(() -> worker.results.size() == 10);
assertThat(otherTaskManagerWorker.tasks).isEmpty();
}
}
@@ -158,12 +158,12 @@ class RabbitMQWorkQueueTest {
otherWorkQueue.submit(taskWithId);
- await().atMost(FIVE_HUNDRED_MILLISECONDS).until(() -> taskManagerWorker.failedTasks.size() == 1);
- assertThat(taskManagerWorker.failedTasks).containsExactly(taskWithId.getId());
+ await().atMost(FIVE_HUNDRED_MILLISECONDS).until(() -> worker.failedTasks.size() == 1);
+ assertThat(worker.failedTasks).containsExactly(taskWithId.getId());
testee.submit(TASK_WITH_ID);
- await().atMost(FIVE_HUNDRED_MILLISECONDS).until(() -> taskManagerWorker.results.size() == 1);
- assertThat(taskManagerWorker.tasks).containsExactly(TASK_WITH_ID);
+ await().atMost(FIVE_HUNDRED_MILLISECONDS).until(() -> worker.results.size() == 1);
+ assertThat(worker.tasks).containsExactly(TASK_WITH_ID);
}
}
@@ -177,7 +177,7 @@ class RabbitMQWorkQueueTest {
TaskId taskId2 = TaskId.fromString("2222d082-aa30-22e9-bf6c-2d3b9e84aafd");
TaskWithId taskWithId2 = new TaskWithId(taskId2, task2);
- when(taskManagerWorker.executeTask(taskWithId1)).then(answer -> {
+ when(worker.executeTask(taskWithId1)).then(answer -> {
TimeUnit.MINUTES.sleep(2);
return Mono.just(Task.Result.COMPLETED);
});
@@ -185,7 +185,7 @@ class RabbitMQWorkQueueTest {
testee.submit(taskWithId1);
testee.submit(taskWithId2);
- verify(taskManagerWorker, timeout(100)).executeTask(taskWithId1);
- verifyNoMoreInteractions(taskManagerWorker);
+ verify(worker, timeout(100)).executeTask(taskWithId1);
+ verifyNoMoreInteractions(worker);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org