From 2aa7fbc1d14e767045d64de1cba62c8814ea9be3 Mon Sep 17 00:00:00 2001 From: "aravind.est" Date: Tue, 1 Aug 2023 17:25:46 +0100 Subject: [PATCH] Disable smartlifecycle in tests Disable SME smartlifecycle configuration in tests. Issue-ID: NONRTRIC-901 Signed-off-by: aravind.est Change-Id: I89525a421f46acb16bf63d1de33702914d6868d8 --- .../test/java/com/oransc/rappmanager/rest/RappControllerTest.java | 4 ++++ .../com/oransc/rappmanager/rest/RappInstanceControllerTest.java | 4 ++++ .../test/java/com/oransc/rappmanager/service/RappServiceTest.java | 6 +++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/rapp-manager-application/src/test/java/com/oransc/rappmanager/rest/RappControllerTest.java b/rapp-manager-application/src/test/java/com/oransc/rappmanager/rest/RappControllerTest.java index c350d98..9ff7c8f 100755 --- a/rapp-manager-application/src/test/java/com/oransc/rappmanager/rest/RappControllerTest.java +++ b/rapp-manager-application/src/test/java/com/oransc/rappmanager/rest/RappControllerTest.java @@ -13,6 +13,7 @@ import com.oransc.rappmanager.models.rapp.Rapp; import com.oransc.rappmanager.models.rapp.RappPrimeOrder; import com.oransc.rappmanager.models.rapp.RappState; import com.oransc.rappmanager.models.cache.RappCacheService; +import com.oransc.rappmanager.sme.service.SmeLifecycleManager; import java.io.File; import java.io.FileInputStream; import java.util.UUID; @@ -42,6 +43,9 @@ public class RappControllerTest { @MockBean AcmDeployer acmDeployer; + @MockBean + SmeLifecycleManager smeLifecycleManager; + private final String validRappFile = "valid-rapp-package.csar"; private final String invalidRappFile = "invalid-rapp-package.csar"; diff --git a/rapp-manager-application/src/test/java/com/oransc/rappmanager/rest/RappInstanceControllerTest.java b/rapp-manager-application/src/test/java/com/oransc/rappmanager/rest/RappInstanceControllerTest.java index 3ad2059..aa6f40e 100755 --- a/rapp-manager-application/src/test/java/com/oransc/rappmanager/rest/RappInstanceControllerTest.java +++ b/rapp-manager-application/src/test/java/com/oransc/rappmanager/rest/RappInstanceControllerTest.java @@ -17,6 +17,7 @@ import com.oransc.rappmanager.models.rapp.RappState; import com.oransc.rappmanager.models.cache.RappCacheService; import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachine; import com.oransc.rappmanager.sme.service.SmeDeployer; +import com.oransc.rappmanager.sme.service.SmeLifecycleManager; import java.util.HashMap; import java.util.Map; import java.util.UUID; @@ -48,6 +49,9 @@ public class RappInstanceControllerTest { @MockBean SmeDeployer smeDeployer; + @MockBean + SmeLifecycleManager smeLifecycleManager; + private final String validRappFile = "valid-rapp-package.csar"; private final String invalidRappFile = "invalid-rapp-package.csar"; diff --git a/rapp-manager-application/src/test/java/com/oransc/rappmanager/service/RappServiceTest.java b/rapp-manager-application/src/test/java/com/oransc/rappmanager/service/RappServiceTest.java index 803504b..0eba9e7 100755 --- a/rapp-manager-application/src/test/java/com/oransc/rappmanager/service/RappServiceTest.java +++ b/rapp-manager-application/src/test/java/com/oransc/rappmanager/service/RappServiceTest.java @@ -6,11 +6,12 @@ import static org.mockito.Mockito.when; import com.oransc.rappmanager.acm.service.AcmDeployer; import com.oransc.rappmanager.models.rapp.Rapp; +import com.oransc.rappmanager.models.rapp.RappState; import com.oransc.rappmanager.models.rappinstance.RappInstance; import com.oransc.rappmanager.models.rappinstance.RappInstanceState; -import com.oransc.rappmanager.models.rapp.RappState; import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachine; import com.oransc.rappmanager.sme.service.SmeDeployer; +import com.oransc.rappmanager.sme.service.SmeLifecycleManager; import java.util.Map; import java.util.UUID; import org.junit.jupiter.api.Test; @@ -33,6 +34,9 @@ public class RappServiceTest { @MockBean SmeDeployer smeDeployer; + @MockBean + SmeLifecycleManager smeLifecycleManager; + @Autowired RappInstanceStateMachine rappInstanceStateMachine; -- 2.16.6