Code Review / transportpce.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Migrate servicehandler module to JUnit5
[transportpce.git] / servicehandler / src / test / java / org / opendaylight / transportpce / servicehandler / service / ServiceDataStoreOperationsImplTest.java
diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImplTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImplTest.java
index 5fa8aba6fef70627c42a151139ff8fe295927be5..d36752860ccdfc15fd3e8814c9a0e20cc2fbf976 100644 (file)
--- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImplTest.java
+++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImplTest.java
@@ -7,12 +7,15 @@
  */
 package org.opendaylight.transportpce.servicehandler.service;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperationsImpl.LogMessages;
 
 import java.util.Optional;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.transportpce.common.OperationResult;
 import org.opendaylight.transportpce.common.ResponseCodes;
@@ -41,52 +44,48 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest {
 
     private ServiceDataStoreOperationsImpl serviceDataStoreOperations;
 
-    @Before
-    public void init() {
+    @BeforeEach
+    void init() {
         DataBroker dataBroker = this.getNewDataBroker();
         this.serviceDataStoreOperations = new ServiceDataStoreOperationsImpl(dataBroker);
     }
 
     @Test
-    public void modifyIfServiceNotPresent() {
-        OperationResult result =
-                this.serviceDataStoreOperations.modifyService("service 1", State.InService, AdminStates.InService);
-        Assert.assertFalse(result.isSuccess());
-        Assert.assertEquals(LogMessages.SERVICE_NOT_FOUND, result.getResultMessage());
+    void modifyIfServiceNotPresent() {
+        OperationResult result = this.serviceDataStoreOperations
+            .modifyService("service 1", State.InService, AdminStates.InService);
+        assertFalse(result.isSuccess());
+        assertEquals(LogMessages.SERVICE_NOT_FOUND, result.getResultMessage());
     }
 
     @Test
-    public void writeOrModifyOrDeleteServiceListNotPresentWithNoWriteChoice() {
-
+    void writeOrModifyOrDeleteServiceListNotPresentWithNoWriteChoice() {
         ServiceCreateInput createInput = ServiceDataUtils.buildServiceCreateInput();
         ConfigurationResponseCommon configurationResponseCommon = new ConfigurationResponseCommonBuilder()
                 .setRequestId("request 1").setAckFinalIndicator(ResponseCodes.FINAL_ACK_NO)
                 .setResponseCode(ResponseCodes.RESPONSE_OK).setResponseMessage("PCE calculation in progress").build();
         PathComputationRequestOutput pathComputationRequestOutput = new PathComputationRequestOutputBuilder()
                 .setConfigurationResponseCommon(configurationResponseCommon).build();
-        String result = serviceDataStoreOperations.writeOrModifyOrDeleteServiceList("serviceCreateInput",
-            createInput, pathComputationRequestOutput, 3);
-
-        Assert.assertEquals(LogMessages.SERVICE_NOT_FOUND, result);
+        String result = serviceDataStoreOperations
+            .writeOrModifyOrDeleteServiceList("serviceCreateInput", createInput, pathComputationRequestOutput, 3);
+        assertEquals(LogMessages.SERVICE_NOT_FOUND, result);
     }
 
     @Test
-    public void writeOrModifyOrDeleteServiceListNotPresentWithWriteChoice() {
-
+    void writeOrModifyOrDeleteServiceListNotPresentWithWriteChoice() {
         ServiceCreateInput createInput = ServiceDataUtils.buildServiceCreateInput();
         ConfigurationResponseCommon configurationResponseCommon = new ConfigurationResponseCommonBuilder()
                 .setRequestId("request 1").setAckFinalIndicator(ResponseCodes.FINAL_ACK_NO)
                 .setResponseCode(ResponseCodes.RESPONSE_OK).setResponseMessage("PCE calculation in progress").build();
         PathComputationRequestOutput pathComputationRequestOutput = new PathComputationRequestOutputBuilder()
                 .setConfigurationResponseCommon(configurationResponseCommon).build();
-        String result = serviceDataStoreOperations.writeOrModifyOrDeleteServiceList("service 1",
-            createInput, pathComputationRequestOutput, 2);
-
-        Assert.assertNull(result);
+        String result = serviceDataStoreOperations
+            .writeOrModifyOrDeleteServiceList("service 1", createInput, pathComputationRequestOutput, 2);
+        assertNull(result);
     }
 
     @Test
-    public void writeOrModifyOrDeleteServiceListPresentWithModifyChoice() {
+    void writeOrModifyOrDeleteServiceListPresentWithModifyChoice() {
         ServiceCreateInput createInput = ServiceDataUtils.buildServiceCreateInput();
         ConfigurationResponseCommon configurationResponseCommon = new ConfigurationResponseCommonBuilder()
                 .setRequestId("request 1").setAckFinalIndicator(ResponseCodes.FINAL_ACK_NO)
@@ -94,28 +93,27 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest {
         PathComputationRequestOutput pathComputationRequestOutput = new PathComputationRequestOutputBuilder()
                 .setConfigurationResponseCommon(configurationResponseCommon).build();
         this.serviceDataStoreOperations.createService(createInput);
-        String result = serviceDataStoreOperations.writeOrModifyOrDeleteServiceList("service 1",
-            createInput, pathComputationRequestOutput, 0);
-        Assert.assertNull(result);
+        String result = serviceDataStoreOperations
+            .writeOrModifyOrDeleteServiceList("service 1", createInput, pathComputationRequestOutput, 0);
+        assertNull(result);
     }
 
     @Test
-    public void writeOrModifyOrDeleteServiceListPresentWithDeleteChoice() {
+    void writeOrModifyOrDeleteServiceListPresentWithDeleteChoice() {
         ServiceCreateInput createInput = ServiceDataUtils.buildServiceCreateInput();
-
         ConfigurationResponseCommon configurationResponseCommon = new ConfigurationResponseCommonBuilder()
                 .setRequestId("request 1").setAckFinalIndicator(ResponseCodes.FINAL_ACK_NO)
                 .setResponseCode(ResponseCodes.RESPONSE_OK).setResponseMessage("PCE calculation in progress").build();
         PathComputationRequestOutput pathComputationRequestOutput = new PathComputationRequestOutputBuilder()
                 .setConfigurationResponseCommon(configurationResponseCommon).build();
         this.serviceDataStoreOperations.createService(createInput);
-        String result = serviceDataStoreOperations.writeOrModifyOrDeleteServiceList("service 1",
-            createInput, pathComputationRequestOutput, 1);
-        Assert.assertNull(result);
+        String result = serviceDataStoreOperations
+            .writeOrModifyOrDeleteServiceList("service 1", createInput, pathComputationRequestOutput, 1);
+        assertNull(result);
     }
 
     @Test
-    public void writeOrModifyOrDeleteServiceListPresentWithNoValidChoice() {
+    void writeOrModifyOrDeleteServiceListPresentWithNoValidChoice() {
         ServiceCreateInput createInput = ServiceDataUtils.buildServiceCreateInput();
         ConfigurationResponseCommon configurationResponseCommon = new ConfigurationResponseCommonBuilder()
                 .setRequestId("request 1").setAckFinalIndicator(ResponseCodes.FINAL_ACK_NO)
@@ -123,102 +121,101 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest {
         PathComputationRequestOutput pathComputationRequestOutput = new PathComputationRequestOutputBuilder()
                 .setConfigurationResponseCommon(configurationResponseCommon).build();
         this.serviceDataStoreOperations.createService(createInput);
-        String result = serviceDataStoreOperations.writeOrModifyOrDeleteServiceList("service 1",
-            createInput, pathComputationRequestOutput, 2);
-        Assert.assertNull(result);
-
+        String result = serviceDataStoreOperations
+            .writeOrModifyOrDeleteServiceList("service 1",createInput, pathComputationRequestOutput, 2);
+        assertNull(result);
     }
 
     @Test
-    public void getServiceFromEmptyDataStoreShouldBeEmpty() {
+    void getServiceFromEmptyDataStoreShouldBeEmpty() {
         Optional<Services> optService = this.serviceDataStoreOperations.getService("service 1");
-        Assert.assertFalse(optService.isPresent());
+        assertFalse(optService.isPresent());
     }
 
     @Test
-    public void createServiceShouldBeSuccessForValidInput() {
+    void createServiceShouldBeSuccessForValidInput() {
         ServiceCreateInput createInput = ServiceDataUtils.buildServiceCreateInput();
         OperationResult result = this.serviceDataStoreOperations.createService(createInput);
-        Assert.assertTrue(result.isSuccess());
+        assertTrue(result.isSuccess());
     }
 
     @Test
-    public void getServiceShouldReturnTheCorrectServiceForTheCreatedService() {
+    void getServiceShouldReturnTheCorrectServiceForTheCreatedService() {
         ServiceCreateInput createInput = ServiceDataUtils.buildServiceCreateInput();
         this.serviceDataStoreOperations.createService(createInput);
 
         Optional<Services> optService = this.serviceDataStoreOperations.getService(createInput.getServiceName());
-        Assert.assertTrue(optService.isPresent());
-        Assert.assertEquals(createInput.getServiceName(), optService.get().getServiceName());
+        assertTrue(optService.isPresent());
+        assertEquals(createInput.getServiceName(), optService.get().getServiceName());
     }
 
     @Test
-    public void deleteServiceShouldBeSuccessfulForDeletingService() {
+    void deleteServiceShouldBeSuccessfulForDeletingService() {
         ServiceCreateInput createInput = ServiceDataUtils.buildServiceCreateInput();
         this.serviceDataStoreOperations.createService(createInput);
         OperationResult result = this.serviceDataStoreOperations.deleteService(createInput.getServiceName());
-        Assert.assertTrue(result.isSuccess());
+        assertTrue(result.isSuccess());
     }
 
-//    @Test
-//    public void deleteServiceShouldBeFailedIfServiceDoNotExists() {
-//        OperationResult result = this.serviceDataStoreOperations.deleteService("Any service");
-//        Assert.assertFalse(result.isSuccess());
-//    }
+    @Test
+    void deleteServiceShouldBeSuccessEvenIfServiceDoNotExists() {
+        OperationResult result = this.serviceDataStoreOperations.deleteService("Any service");
+        assertTrue(result.isSuccess());
+    }
 
     @Test
-    public void modifyServiceIsSuccessfulForPresentService() {
+    void modifyServiceIsSuccessfulForPresentService() {
         ServiceCreateInput createInput = ServiceDataUtils.buildServiceCreateInput();
         this.serviceDataStoreOperations.createService(createInput);
         OperationResult result = this.serviceDataStoreOperations.modifyService(createInput.getServiceName(),
             State.InService, AdminStates.InService);
-        Assert.assertTrue(result.isSuccess());
+        assertTrue(result.isSuccess());
     }
 
     @Test
-    public void getTempServiceFromEmptyDataStoreShouldBeEmpty() {
+    void getTempServiceFromEmptyDataStoreShouldBeEmpty() {
         Optional<org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.temp.service.list
                 .Services> optService = this.serviceDataStoreOperations.getTempService("service 1");
-        Assert.assertFalse(optService.isPresent());
+        assertFalse(optService.isPresent());
     }
 
     @Test
-    public void createTempServiceShouldBeSuccessForValidInput() {
+    void createTempServiceShouldBeSuccessForValidInput() {
         TempServiceCreateInput createInput = ServiceDataUtils.buildTempServiceCreateInput();
         OperationResult result = this.serviceDataStoreOperations.createTempService(createInput);
-        Assert.assertTrue(result.isSuccess());
+        assertTrue(result.isSuccess());
     }
 
     @Test
-    public void getTempServiceShouldReturnTheCorrectTempServiceForTheCreatedService() {
+    void getTempServiceShouldReturnTheCorrectTempServiceForTheCreatedService() {
         TempServiceCreateInput createInput = ServiceDataUtils.buildTempServiceCreateInput();
         this.serviceDataStoreOperations.createTempService(createInput);
 
         Optional<org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.temp.service.list
                 .Services> optService = this.serviceDataStoreOperations.getTempService(createInput.getCommonId());
-        Assert.assertTrue(optService.isPresent());
-        Assert.assertEquals(createInput.getCommonId(), optService.get().getCommonId());
+        assertTrue(optService.isPresent());
+        assertEquals(createInput.getCommonId(), optService.get().getCommonId());
     }
 
     @Test
-    public void deleteTempServiceShouldBeSuccessfulForDeletingTempService() {
+    void deleteTempServiceShouldBeSuccessfulForDeletingTempService() {
         TempServiceCreateInput createInput = ServiceDataUtils.buildTempServiceCreateInput();
         this.serviceDataStoreOperations.createTempService(createInput);
         OperationResult result = this.serviceDataStoreOperations.deleteTempService(createInput.getCommonId());
-        Assert.assertTrue(result.isSuccess());
+        assertTrue(result.isSuccess());
     }
 
     @Test
-    public void modifyTempServiceIsSuccessfulForPresentTempService() {
+    void modifyTempServiceIsSuccessfulForPresentTempService() {
         TempServiceCreateInput createInput = ServiceDataUtils.buildTempServiceCreateInput();
         this.serviceDataStoreOperations.createTempService(createInput);
         OperationResult result = this.serviceDataStoreOperations.modifyTempService(
             createInput.getCommonId(), State.InService, AdminStates.InService);
-        Assert.assertTrue(result.isSuccess());
+        assertTrue(result.isSuccess());
     }
 
     @Test
-    public void createServicePathShouldBeSuccessfulForValidInput() {
+    void createServicePathShouldBeSuccessfulForValidInput() {
         ServiceCreateInput createInput = ServiceDataUtils.buildServiceCreateInput();
         this.serviceDataStoreOperations.createService(createInput);
         ServiceInput serviceInput = new ServiceInput(createInput);
@@ -235,13 +232,13 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest {
         PathComputationRequestOutput pathComputationRequestOutput = new PathComputationRequestOutputBuilder()
             .setConfigurationResponseCommon(configurationResponseCommon).setResponseParameters(responseParameters)
             .build();
-        OperationResult result =
-            this.serviceDataStoreOperations.createServicePath(serviceInput, pathComputationRequestOutput);
-        Assert.assertTrue(result.isSuccess());
+        OperationResult result = this.serviceDataStoreOperations
+            .createServicePath(serviceInput, pathComputationRequestOutput);
+        assertTrue(result.isSuccess());
     }
 
     @Test
-    public void createServicePathShouldFailForInvalidInput() {
+    void createServicePathShouldFailForInvalidInput() {
         ServiceCreateInput createInput = ServiceDataUtils.buildServiceCreateInput();
         this.serviceDataStoreOperations.createService(createInput);
         ServiceInput serviceInput = new ServiceInput(createInput);
@@ -252,13 +249,13 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest {
         PathComputationRequestOutput pathComputationRequestOutput = new PathComputationRequestOutputBuilder()
             .setConfigurationResponseCommon(configurationResponseCommon).setResponseParameters(responseParameters)
             .build();
-        OperationResult result =
-            this.serviceDataStoreOperations.createServicePath(serviceInput, pathComputationRequestOutput);
-        Assert.assertFalse(result.isSuccess());
+        OperationResult result = this.serviceDataStoreOperations
+            .createServicePath(serviceInput, pathComputationRequestOutput);
+        assertFalse(result.isSuccess());
     }
 
     @Test
-    public void deleteServicePathShouldBeSuccessForDeletingServicePath() {
+    void deleteServicePathShouldBeSuccessForDeletingServicePath() {
         ServiceCreateInput createInput = ServiceDataUtils.buildServiceCreateInput();
         this.serviceDataStoreOperations.createService(createInput);
         ServiceInput serviceInput = new ServiceInput(createInput);
@@ -278,6 +275,6 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest {
         this.serviceDataStoreOperations.createServicePath(serviceInput, pathComputationRequestOutput);
 
         OperationResult result = this.serviceDataStoreOperations.deleteServicePath(serviceInput.getServiceName());
-        Assert.assertTrue(result.isSuccess());
+        assertTrue(result.isSuccess());
     }
-}
+}
\ No newline at end of file
Repository for Transport PCE project.