X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=nbinotifications%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fnbinotifications%2Fserialization%2FNotificationServiceSerializerTest.java;h=0a15d9ebc5e14a11599f641a30c136216cd788e3;hb=refs%2Fchanges%2F43%2F104643%2F3;hp=4a4868bbd29d36a66f69bcd44da38b910de70372;hpb=980555a7d2dc492570012d813e5fa14253597233;p=transportpce.git 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 4a4868bbd..0a15d9ebc 100644 --- a/nbinotifications/src/test/java/org/opendaylight/transportpce/nbinotifications/serialization/NotificationServiceSerializerTest.java +++ b/nbinotifications/src/test/java/org/opendaylight/transportpce/nbinotifications/serialization/NotificationServiceSerializerTest.java @@ -7,8 +7,8 @@ */ package org.opendaylight.transportpce.nbinotifications.serialization; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -17,17 +17,17 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Paths; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.opendaylight.transportpce.common.converter.JsonStringConverter; import org.opendaylight.transportpce.test.AbstractTest; -import org.opendaylight.yang.gen.v1.nbi.notifications.rev210813.NotificationProcessService; +import org.opendaylight.yang.gen.v1.nbi.notifications.rev211013.NotificationProcessService; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.codec.gson.JSONCodecFactorySupplier; public class NotificationServiceSerializerTest extends AbstractTest { @Test - public void serializeTest() throws IOException { + void serializeTest() throws IOException { JsonStringConverter converter = new JsonStringConverter<>(getDataStoreContextUtil().getBindingDOMCodecServices()); String json = Files.readString(Paths.get("src/test/resources/event.json")); @@ -39,10 +39,10 @@ public class NotificationServiceSerializerTest extends AbstractTest { serializer.configure(configs, false); byte[] data = serializer.serialize("test", notificationService); serializer.close(); - assertNotNull("Serialized data should not be null", data); + assertNotNull(data, "Serialized data should not be null"); 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)); + assertEquals(expectedJson, new String(data, StandardCharsets.UTF_8), "The event should be equals"); } }