Migrate servicehandler module to JUnit5

[transportpce.git] / servicehandler / src / test / java / org / opendaylight / transportpce / servicehandler / validation / checks / ServicehandlerComplianceCheckTest.java

diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/validation/checks/ServicehandlerComplianceCheckTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/validation/checks/ServicehandlerComplianceCheckTest.java
index cab20097be47138154a76f2b40042a29bd6dfecf..d779f886a87bd5533cb9055033920f94bb921ddc 100644 (file)
--- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/validation/checks/ServicehandlerComplianceCheckTest.java
+++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/validation/checks/ServicehandlerComplianceCheckTest.java
@@ -7,87 +7,84 @@
  */
 package org.opendaylight.transportpce.servicehandler.validation.checks;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.opendaylight.transportpce.servicehandler.validation.checks.ServicehandlerComplianceCheck.LogMessages;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.ConnectionType;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.RpcActions;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.sdnc.request.header.SdncRequestHeaderBuilder;
 
 public class ServicehandlerComplianceCheckTest {
 
-    public ServicehandlerComplianceCheckTest() {
-    }
-
     @Test
-    public void checkFalseSdncRequest() {
+    void checkFalseSdncRequest() {
         ComplianceCheckResult result = ServicehandlerComplianceCheck.check("service 1",
-            new SdncRequestHeaderBuilder().setRequestId("1").setRequestSystemId("1").setNotificationUrl("1")
-            .setRpcAction(RpcActions.ServiceCreate).build(),
-            ConnectionType.Service,RpcActions.ServiceCreate, false, false);
+                new SdncRequestHeaderBuilder().setRequestId("1").setRequestSystemId("1").setNotificationUrl("1")
+                    .setRpcAction(RpcActions.ServiceCreate).build(),
+                ConnectionType.Service,RpcActions.ServiceCreate, false, false);
 
-        Assert.assertEquals("", result.getMessage());
-        Assert.assertTrue(result.hasPassed());
+        assertEquals("", result.getMessage());
+        assertTrue(result.hasPassed());
     }
 
     @Test
-    public void checkServiceNameNull() {
-        ComplianceCheckResult result = ServicehandlerComplianceCheck.check(null, null,
-                ConnectionType.Service, null, false, false);
+    void checkServiceNameNull() {
+        ComplianceCheckResult result = ServicehandlerComplianceCheck
+            .check(null, null, ConnectionType.Service, null, false, false);
 
-        Assert.assertEquals(LogMessages.SERVICENAME_NOT_SET, result.getMessage());
-        Assert.assertFalse(result.hasPassed());
+        assertEquals(LogMessages.SERVICENAME_NOT_SET, result.getMessage());
+        assertFalse(result.hasPassed());
     }
 
     @Test
-    public void checkConTypeFalseAndNull() {
-        ComplianceCheckResult result = ServicehandlerComplianceCheck.check("service 1", null,
-                null, null, true, false);
-        Assert.assertEquals(LogMessages.CONNECTIONTYPE_NOT_SET, result.getMessage());
-        Assert.assertFalse(result.hasPassed());
+    void checkConTypeFalseAndNull() {
+        ComplianceCheckResult result = ServicehandlerComplianceCheck
+            .check("service 1", null, null, null, true, false);
+        assertEquals(LogMessages.CONNECTIONTYPE_NOT_SET, result.getMessage());
+        assertFalse(result.hasPassed());
     }
 
     @Test
-    public void checkSdncRequestHeaderNull() {
-        ComplianceCheckResult result = ServicehandlerComplianceCheck.check("service 1", null,
-                ConnectionType.Service, null, true, true);
+    void checkSdncRequestHeaderNull() {
+        ComplianceCheckResult result = ServicehandlerComplianceCheck
+            .check("service 1", null, ConnectionType.Service, null, true, true);
 
-        Assert.assertEquals(LogMessages.HEADER_NOT_SET, result.getMessage());
-        Assert.assertFalse(result.hasPassed());
+        assertEquals(LogMessages.HEADER_NOT_SET, result.getMessage());
+        assertFalse(result.hasPassed());
     }
 
     @Test
-    public void checkRequestIdEmptyString() {
+    void checkRequestIdEmptyString() {
         ComplianceCheckResult result = ServicehandlerComplianceCheck.check("service 1",
-                new SdncRequestHeaderBuilder().setRequestId("")
-                        .setRpcAction(RpcActions.ServiceCreate).build(),
+                new SdncRequestHeaderBuilder().setRequestId("").setRpcAction(RpcActions.ServiceCreate).build(),
                 ConnectionType.Service, RpcActions.ServiceCreate, true, true);
 
-        Assert.assertEquals(LogMessages.REQUESTID_NOT_SET, result.getMessage());
-        Assert.assertFalse(result.hasPassed());
+        assertEquals(LogMessages.REQUESTID_NOT_SET, result.getMessage());
+        assertFalse(result.hasPassed());
     }
 
     @Test
-    public void checkDifferentAction() {
+    void checkDifferentAction() {
         ComplianceCheckResult result = ServicehandlerComplianceCheck.check("service 1",
-                new SdncRequestHeaderBuilder().setRequestId("1")
-                        .setRpcAction(RpcActions.ServiceCreate).build(),
+                new SdncRequestHeaderBuilder().setRequestId("1").setRpcAction(RpcActions.ServiceCreate).build(),
                 ConnectionType.Service, RpcActions.NetworkReOptimization, true, true);
 
-        Assert.assertEquals(
-                LogMessages.rpcactionsDiffers(RpcActions.ServiceCreate, RpcActions.NetworkReOptimization),
-                result.getMessage());
-        Assert.assertFalse(result.hasPassed());
+        assertEquals(
+            LogMessages.rpcactionsDiffers(RpcActions.ServiceCreate, RpcActions.NetworkReOptimization),
+            result.getMessage());
+        assertFalse(result.hasPassed());
     }
 
     @Test
-    public void checkServiceActionNull() {
+    void checkServiceActionNull() {
         ComplianceCheckResult result = ServicehandlerComplianceCheck.check("service 1",
                 new SdncRequestHeaderBuilder().setRequestId("1").build(),
                 ConnectionType.Service, RpcActions.NetworkReOptimization, true, true);
 
-        Assert.assertEquals(LogMessages.RPCACTION_NOT_SET, result.getMessage());
-        Assert.assertFalse(result.hasPassed());
+        assertEquals(LogMessages.RPCACTION_NOT_SET, result.getMessage());
+        assertFalse(result.hasPassed());
     }
 }