From b003e76b2113c20cd4d15e545af9a8c0118571ea Mon Sep 17 00:00:00 2001 From: "aravind.est" Date: Mon, 25 Sep 2023 16:53:00 +0100 Subject: [PATCH] Improve code coverage Additional tests added to improve code coverage. Issue-ID: NONRTRIC-913 Signed-off-by: aravind.est Change-Id: I996e0c3169706963bfe9c6d25c82a90559f8dcf1 --- .../rappmanager/acm/service/AcmDeployerTest.java | 14 +++- .../rappmanager/sme/service/SmeDeployerTest.java | 4 +- .../sme/service/SmeLifecycleManagerTest.java | 77 ++++++++++++++++++++++ 3 files changed, 89 insertions(+), 6 deletions(-) create mode 100755 rapp-manager-sme/src/test/java/com/oransc/rappmanager/sme/service/SmeLifecycleManagerTest.java diff --git a/rapp-manager-acm/src/test/java/com/oransc/rappmanager/acm/service/AcmDeployerTest.java b/rapp-manager-acm/src/test/java/com/oransc/rappmanager/acm/service/AcmDeployerTest.java index f3016b0..b4dd295 100755 --- a/rapp-manager-acm/src/test/java/com/oransc/rappmanager/acm/service/AcmDeployerTest.java +++ b/rapp-manager-acm/src/test/java/com/oransc/rappmanager/acm/service/AcmDeployerTest.java @@ -33,14 +33,14 @@ import static org.springframework.test.web.client.response.MockRestResponseCreat import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.oransc.rappmanager.acm.configuration.ACMConfiguration; -import com.oransc.rappmanager.models.rapp.Rapp; +import com.oransc.rappmanager.models.cache.RappCacheService; import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; +import com.oransc.rappmanager.models.rapp.Rapp; import com.oransc.rappmanager.models.rapp.RappEvent; -import com.oransc.rappmanager.models.rappinstance.RappInstance; import com.oransc.rappmanager.models.rapp.RappResourceBuilder; import com.oransc.rappmanager.models.rapp.RappResources; import com.oransc.rappmanager.models.rapp.RappState; -import com.oransc.rappmanager.models.cache.RappCacheService; +import com.oransc.rappmanager.models.rappinstance.RappInstance; import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachine; import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachineConfig; import java.io.IOException; @@ -350,6 +350,14 @@ class AcmDeployerTest { assertFalse(deprimeRapp); } + @Test + void testDeprimeExceptionRapp() { + Rapp rapp = Rapp.builder().rappId(UUID.randomUUID()).name("").packageName(validRappFile) + .packageLocation(validCsarFileLocation).state(RappState.COMMISSIONED).build(); + boolean deprimeRapp = acmDeployer.deprimeRapp(rapp); + assertFalse(deprimeRapp); + } + @Test void testDeleteComposition() throws JsonProcessingException { UUID compositionId = UUID.randomUUID(); diff --git a/rapp-manager-sme/src/test/java/com/oransc/rappmanager/sme/service/SmeDeployerTest.java b/rapp-manager-sme/src/test/java/com/oransc/rappmanager/sme/service/SmeDeployerTest.java index e00b259..28814da 100755 --- a/rapp-manager-sme/src/test/java/com/oransc/rappmanager/sme/service/SmeDeployerTest.java +++ b/rapp-manager-sme/src/test/java/com/oransc/rappmanager/sme/service/SmeDeployerTest.java @@ -80,8 +80,6 @@ class SmeDeployerTest { @Autowired RappInstanceStateMachine rappInstanceStateMachine; @Autowired - RappCacheService rappCacheService; - @Autowired ObjectMapper objectMapper; private final String validRappFile = "valid-rapp-package.csar"; String URI_PROVIDER_REGISTRATIONS, URI_PROVIDER_REGISTRATION, URI_PUBLISH_APIS, URI_PUBLISH_API, URI_INVOKERS, @@ -365,7 +363,7 @@ class SmeDeployerTest { } @Test - void testUndeployRappInstanceFailure() throws Exception { + void testUndeployRappInstanceFailure() { UUID rappId = UUID.randomUUID(); UUID apfId = UUID.randomUUID(); List invokers = List.of(String.valueOf(UUID.randomUUID()), String.valueOf(UUID.randomUUID())); diff --git a/rapp-manager-sme/src/test/java/com/oransc/rappmanager/sme/service/SmeLifecycleManagerTest.java b/rapp-manager-sme/src/test/java/com/oransc/rappmanager/sme/service/SmeLifecycleManagerTest.java new file mode 100755 index 0000000..c7bdb7c --- /dev/null +++ b/rapp-manager-sme/src/test/java/com/oransc/rappmanager/sme/service/SmeLifecycleManagerTest.java @@ -0,0 +1,77 @@ +/*- + * ============LICENSE_START====================================================================== + * Copyright (C) 2023 Nordix Foundation. All rights reserved. + * =============================================================================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END======================================================================== + */ + +package com.oransc.rappmanager.sme.service; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import com.oransc.rappmanager.sme.provider.data.APIProviderEnrolmentDetails; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.boot.test.mock.mockito.SpyBean; + +@SpringBootTest(classes = SmeLifecycleManager.class) +class SmeLifecycleManagerTest { + + @Autowired + @MockBean + SmeDeployer smeDeployer; + + @Autowired + @SpyBean + SmeLifecycleManager smeLifecycleManager; + + @Test + void testStartWithSuccess() { + when(smeDeployer.createAMF()).thenReturn(new APIProviderEnrolmentDetails()); + smeLifecycleManager.start(); + assertTrue(smeLifecycleManager.isRunning()); + } + + @Test + void testStartWithFailure() { + when(smeDeployer.createAMF()).thenReturn(null); + smeLifecycleManager.start(); + assertFalse(smeLifecycleManager.isRunning()); + } + + @Test + void testStopWithSuccess() { + doNothing().when(smeDeployer).deleteAMF(); + when(smeDeployer.createAMF()).thenReturn(new APIProviderEnrolmentDetails()); + smeLifecycleManager.start(); + assertTrue(smeLifecycleManager.isRunning()); + smeLifecycleManager.stop(); + verify(smeDeployer, times(1)).deleteAMF(); + assertFalse(smeLifecycleManager.isRunning()); + } + + @Test + void testStopWithoutStart() { + smeLifecycleManager.stop(); + verify(smeDeployer, times(0)).deleteAMF(); + assertFalse(smeLifecycleManager.isRunning()); + } +} -- 2.16.6