[james-project] 12/15: JAMES-2813 cassandra rrt tasks should use JsonSerializationVerifier

[rcordier]

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 194d1753c2114ae8132ad509d92682b06b418d2c
Author: Benoit Tellier <btell...@linagora.com>
AuthorDate: Wed Dec 18 15:23:58 2019 +0700

    JAMES-2813 cassandra rrt tasks should use JsonSerializationVerifier
---
 server/data/data-cassandra/pom.xml                 |  6 ++++
 ...pingsSourcesMigrationTaskSerializationTest.java | 38 +++++++---------------
 2 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/server/data/data-cassandra/pom.xml 
b/server/data/data-cassandra/pom.xml
index c7d560e..a6e6356 100644
--- a/server/data/data-cassandra/pom.xml
+++ b/server/data/data-cassandra/pom.xml
@@ -59,6 +59,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-data-api</artifactId>
         </dependency>
         <dependency>
diff --git 
a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTaskSerializationTest.java
 
b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTaskSerializationTest.java
index edae144..b3c53a1 100644
--- 
a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTaskSerializationTest.java
+++ 
b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTaskSerializationTest.java
@@ -20,19 +20,13 @@
 
 package org.apache.james.rrt.cassandra.migration;
 
-import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson;
-import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
-import java.io.IOException;
 import java.time.Instant;
 
-import 
org.apache.james.server.task.json.JsonTaskAdditionalInformationSerializer;
-import org.apache.james.server.task.json.JsonTaskSerializer;
+import org.apache.james.JsonSerializationVerifier;
 import org.junit.jupiter.api.Test;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-
 class MappingsSourcesMigrationTaskSerializationTest {
     private static final Instant TIMESTAMP = 
Instant.parse("2018-11-13T12:00:55Z");
     private static final MappingsSourcesMigration MIGRATION = 
mock(MappingsSourcesMigration.class);
@@ -41,29 +35,19 @@ class MappingsSourcesMigrationTaskSerializationTest {
     private static final MappingsSourcesMigration.AdditionalInformation 
DETAILS = new MappingsSourcesMigration.AdditionalInformation(42L, 10, 
TIMESTAMP);
     private static final String SERIALIZED_ADDITIONAL_INFORMATION = 
"{\"type\": \"mappings-sources-migration\", 
\"successfulMappingsCount\":42,\"errorMappingsCount\":10,\"timestamp\":\"2018-11-13T12:00:55Z\"}";
 
-    private static final JsonTaskSerializer TASK_SERIALIZER = 
JsonTaskSerializer.of(MappingsSourcesMigrationTaskDTO.MODULE.apply(MIGRATION));
-    private static final JsonTaskAdditionalInformationSerializer 
JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER = 
JsonTaskAdditionalInformationSerializer.of(MappingsSourcesMigrationTaskAdditionalInformationDTO.serializationModule(MappingsSourcesMigration.TYPE));
-
-    @Test
-    void taskShouldBeSerializable() throws JsonProcessingException {
-        assertThatJson(TASK_SERIALIZER.serialize(TASK))
-            .isEqualTo(SERIALIZED_TASK);
-    }
-
-    @Test
-    void taskShouldBeDeserializable() throws IOException {
-        assertThat(TASK_SERIALIZER.deserialize(SERIALIZED_TASK))
-            .isEqualToComparingFieldByField(TASK);
-    }
-
     @Test
-    void additionalInformationShouldBeSerializable() throws 
JsonProcessingException {
-        
assertThatJson(JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER.serialize(DETAILS)).isEqualTo(SERIALIZED_ADDITIONAL_INFORMATION);
+    void taskShouldBeSerializable() throws Exception {
+        
JsonSerializationVerifier.dtoModule(MappingsSourcesMigrationTaskDTO.MODULE.apply(MIGRATION))
+            .bean(TASK)
+            .json(SERIALIZED_TASK)
+            .verify();
     }
 
     @Test
-    void additonalInformationShouldBeDeserializable() throws IOException {
-        
assertThat(JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER.deserialize(SERIALIZED_ADDITIONAL_INFORMATION))
-            .isEqualToComparingFieldByField(DETAILS);
+    void additionalInformationShouldBeSerializable() throws Exception {
+        
JsonSerializationVerifier.dtoModule(MappingsSourcesMigrationTaskAdditionalInformationDTO.serializationModule(MappingsSourcesMigration.TYPE))
+            .bean(DETAILS)
+            .json(SERIALIZED_ADDITIONAL_INFORMATION)
+            .verify();
     }
 }
\ No newline at end of file


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org