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 rc...@apache.org on 2019/12/20 07:30:57 UTC
[james-project] 13/15: JAMES-2813 Use JsonSerializationVerifier in
TaskSerializationTest
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 9ac467cc343f2028fad55b39e64245caae1824c7
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Dec 19 09:38:09 2019 +0700
JAMES-2813 Use JsonSerializationVerifier in TaskSerializationTest
---
server/task/task-json/pom.xml | 6 ++++
.../server/task/json/TaskSerializationTest.java | 37 +++++++---------------
2 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/server/task/task-json/pom.xml b/server/task/task-json/pom.xml
index 2b18599..f53524e 100644
--- a/server/task/task-json/pom.xml
+++ b/server/task/task-json/pom.xml
@@ -39,6 +39,12 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
+ <artifactId>james-json</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-task-api</artifactId>
</dependency>
<dependency>
diff --git a/server/task/task-json/src/test/java/org/apache/james/server/task/json/TaskSerializationTest.java b/server/task/task-json/src/test/java/org/apache/james/server/task/json/TaskSerializationTest.java
index 09e11ce..b97a41f 100644
--- a/server/task/task-json/src/test/java/org/apache/james/server/task/json/TaskSerializationTest.java
+++ b/server/task/task-json/src/test/java/org/apache/james/server/task/json/TaskSerializationTest.java
@@ -27,6 +27,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.io.IOException;
import java.util.stream.Stream;
+import org.apache.james.JsonSerializationVerifier;
import org.apache.james.server.task.json.dto.MemoryReferenceTaskStore;
import org.apache.james.server.task.json.dto.TaskDTOModule;
import org.apache.james.task.CompletedTask;
@@ -34,13 +35,13 @@ import org.apache.james.task.FailedTask;
import org.apache.james.task.MemoryReferenceTask;
import org.apache.james.task.Task;
import org.apache.james.task.ThrowingTask;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
+import com.fasterxml.jackson.core.JsonProcessingException;
+
class TaskSerializationTest {
private static final String SERIALIZED_COMPLETED_TASK = "{\"type\": \"completed-task\"}";
@@ -50,32 +51,18 @@ class TaskSerializationTest {
@ParameterizedTest
@MethodSource
- void taskShouldBeSerializable(Task task, TaskDTOModule<?, ?> module, String expectedJson) throws Exception {
- String actual = JsonTaskSerializer.of(module).serialize(task);
- assertThatJson(actual).isEqualTo(expectedJson);
- }
-
- private static Stream<Arguments> taskShouldBeSerializable() throws Exception {
- return validTasks();
- }
-
- @ParameterizedTest
- @MethodSource
- void taskShouldBeDeserializable(Task task, TaskDTOModule<?, ?> module, String serializedJson) throws Exception {
- assertThat(JsonTaskSerializer.of(module).deserialize(serializedJson))
- .isInstanceOf(task.getClass());
- }
-
- private static Stream<Arguments> taskShouldBeDeserializable() throws Exception {
- return validTasks();
+ void taskShouldBeSerializable(Task task, TaskDTOModule<Task, ? extends TaskDTOModule> module, String expectedJson) throws Exception {
+ JsonSerializationVerifier.dtoModule(module)
+ .bean(task)
+ .json(expectedJson)
+ .verify();
}
- private static Stream<Arguments> validTasks() throws Exception {
+ private static Stream<Arguments> taskShouldBeSerializable() {
return Stream.of(
- Arguments.of(new CompletedTask(), COMPLETED_TASK_MODULE, SERIALIZED_COMPLETED_TASK),
- Arguments.of(new FailedTask(), FAILED_TASK_MODULE, SERIALIZED_FAILED_TASK),
- Arguments.of(new ThrowingTask(), THROWING_TASK_MODULE, SERIALIZED_THROWING_TASK)
- );
+ Arguments.of(new CompletedTask(), COMPLETED_TASK_MODULE, SERIALIZED_COMPLETED_TASK),
+ Arguments.of(new FailedTask(), FAILED_TASK_MODULE, SERIALIZED_FAILED_TASK),
+ Arguments.of(new ThrowingTask(), THROWING_TASK_MODULE, SERIALIZED_THROWING_TASK));
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org