Refactor NBINotifications and serviceHandlerImpl

[transportpce.git] / nbinotifications / src / test / java / org / opendaylight / transportpce / nbinotifications / serialization / NotificationServiceSerializerTest.java

diff --git a/nbinotifications/src/test/java/org/opendaylight/transportpce/nbinotifications/serialization/NotificationServiceSerializerTest.java b/nbinotifications/src/test/java/org/opendaylight/transportpce/nbinotifications/serialization/NotificationServiceSerializerTest.java
index 3fe658b6bdafd1a46c69bf82e1d7a447817310e1..4a4868bbd29d36a66f69bcd44da38b910de70372 100644 (file)
--- a/nbinotifications/src/test/java/org/opendaylight/transportpce/nbinotifications/serialization/NotificationServiceSerializerTest.java
+++ b/nbinotifications/src/test/java/org/opendaylight/transportpce/nbinotifications/serialization/NotificationServiceSerializerTest.java
@@ -10,6 +10,8 @@ package org.opendaylight.transportpce.nbinotifications.serialization;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -18,7 +20,7 @@ import java.util.Map;
 import org.junit.Test;
 import org.opendaylight.transportpce.common.converter.JsonStringConverter;
 import org.opendaylight.transportpce.test.AbstractTest;
-import org.opendaylight.yang.gen.v1.nbi.notifications.rev201130.NotificationService;
+import org.opendaylight.yang.gen.v1.nbi.notifications.rev210813.NotificationProcessService;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.codec.gson.JSONCodecFactorySupplier;
 
@@ -26,11 +28,11 @@ public class NotificationServiceSerializerTest extends AbstractTest {
 
     @Test
     public void serializeTest() throws IOException {
-        JsonStringConverter<NotificationService> converter =
+        JsonStringConverter<NotificationProcessService> converter =
                 new JsonStringConverter<>(getDataStoreContextUtil().getBindingDOMCodecServices());
         String json = Files.readString(Paths.get("src/test/resources/event.json"));
-        NotificationService notificationService = converter
-                .createDataObjectFromJsonString(YangInstanceIdentifier.of(NotificationService.QNAME),
+        NotificationProcessService notificationService = converter
+                .createDataObjectFromJsonString(YangInstanceIdentifier.of(NotificationProcessService.QNAME),
                         json, JSONCodecFactorySupplier.RFC7951);
         NotificationServiceSerializer serializer = new NotificationServiceSerializer();
         Map<String, Object> configs = Map.of(ConfigConstants.CONVERTER, converter);
@@ -39,6 +41,8 @@ public class NotificationServiceSerializerTest extends AbstractTest {
         serializer.close();
         assertNotNull("Serialized data should not be null", data);
         String expectedJson = Files.readString(Paths.get("src/test/resources/expected_event.json"));
+        // Minify the json string
+        expectedJson = new ObjectMapper().readValue(expectedJson, JsonNode.class).toString();
         assertEquals("The event should be equals", expectedJson, new String(data, StandardCharsets.UTF_8));
     }
 }