X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=rapp-manager-dme%2Fsrc%2Ftest%2Fjava%2Fcom%2Foransc%2Frappmanager%2Fdme%2Fservice%2FDmeDeployerTest.java;h=e85fbe3e254cbc888d76f57debb9020736e7e69c;hb=4a9eca242a06d57fb9dca16b1a59cab2d6250c7b;hp=5b97b2ddd800a2d62f8eef5cd87b0468548c3811;hpb=40a82302ff06348e446a2de3c4a552b1ee9bc61b;p=nonrtric%2Fplt%2Frappmanager.git

diff --git a/rapp-manager-dme/src/test/java/com/oransc/rappmanager/dme/service/DmeDeployerTest.java b/rapp-manager-dme/src/test/java/com/oransc/rappmanager/dme/service/DmeDeployerTest.java
index 5b97b2d..e85fbe3 100755
--- a/rapp-manager-dme/src/test/java/com/oransc/rappmanager/dme/service/DmeDeployerTest.java
+++ b/rapp-manager-dme/src/test/java/com/oransc/rappmanager/dme/service/DmeDeployerTest.java
@@ -18,8 +18,8 @@
 
 package com.oransc.rappmanager.dme.service;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.springframework.test.web.client.match.MockRestRequestMatchers.method;
@@ -51,6 +51,7 @@ import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -103,7 +104,8 @@ class DmeDeployerTest {
 
     @ParameterizedTest
     @MethodSource("getSuccessParamsWithUnavailableInfoTypes")
-    void testPrimeRappSuccessWithUnavailableInfoType(String rappFile, boolean result) throws JsonProcessingException {
+    void testPrimeRappSuccessWithUnavailableInfoType(String rappFile, boolean isSuccess)
+            throws JsonProcessingException {
         RappResources rappResources = rappDmeResourceBuilder.getResources();
         Rapp rapp = getRapp(Optional.empty());
         rapp.setPackageName(rappFile);
@@ -116,7 +118,11 @@ class DmeDeployerTest {
         if (rappFile.equals(validRappFileNewInfoType)) {
             mockServer.verify();
         }
-        assertEquals(rapp.getIsDmeValid(), result);
+        if (isSuccess) {
+            assertNull(rapp.getReason());
+        } else {
+            assertNotNull(rapp.getReason());
+        }
     }
 
     private static Stream<Arguments> getSuccessParamsWithUnavailableInfoTypes() {
@@ -124,8 +130,8 @@ class DmeDeployerTest {
     }
 
     @ParameterizedTest
-    @MethodSource("getSuccessParamsWithAvailableInfoTypes")
-    void testPrimeRappSuccessWithValidInfoType(String rappFile, boolean result) throws JsonProcessingException {
+    @ValueSource(strings = {validRappFile, validRappFileNewInfoType})
+    void testPrimeRappSuccessWithValidInfoType(String rappFile) throws JsonProcessingException {
         RappResources rappResources = rappDmeResourceBuilder.getResources();
         Rapp rapp = getRapp(Optional.empty());
         rapp.setPackageName(rappFile);
@@ -138,11 +144,7 @@ class DmeDeployerTest {
         if (rappFile.equals(validRappFileNewInfoType)) {
             mockServer.verify();
         }
-        assertEquals(rapp.getIsDmeValid(), result);
-    }
-
-    private static Stream<Arguments> getSuccessParamsWithAvailableInfoTypes() {
-        return Stream.of(Arguments.of(validRappFile, true), Arguments.of(validRappFileNewInfoType, true));
+        assertNull(rapp.getReason());
     }
 
     @Test
@@ -156,15 +158,14 @@ class DmeDeployerTest {
         Rapp rapp = getRapp(Optional.empty());
         rapp.setRappResources(rappResources);
         assertFalse(dmeDeployer.primeRapp(rapp));
-        assertFalse(rapp.getIsDmeValid());
+        assertFalse(rapp.getReason().isEmpty());
     }
 
     @Test
     void testDeprimeRapp() {
         Rapp rapp = getRapp(Optional.empty());
-        rapp.setIsDmeValid(true);
         assertTrue(dmeDeployer.deprimeRapp(rapp));
-        assertNull(rapp.getIsDmeValid());
+        assertNull(rapp.getReason());
     }
 
     @Test
@@ -172,6 +173,7 @@ class DmeDeployerTest {
         Rapp rapp = getRapp(Optional.empty());
         RappInstance rappInstance = rappDmeResourceBuilder.getRappInstance();
         getMockServerClientCreateInfoType(rappInstance.getDme().getInfoTypesProducer().toArray()[0].toString(), true);
+        getMockServerClientCreateInfoType(rappInstance.getDme().getInfoTypeConsumer(), true);
         getMockServerClientCreateInfoProducer(rappInstance.getDme().getInfoProducer(), true);
         getMockServerClientCreateInfoConsumer(rappInstance.getDme().getInfoConsumer(), true);
         rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
@@ -220,6 +222,7 @@ class DmeDeployerTest {
         Rapp rapp = getRapp(Optional.empty());
         RappInstance rappInstance = rappDmeResourceBuilder.getRappInstance();
         getMockServerClientCreateInfoType(rappInstance.getDme().getInfoTypesProducer().toArray()[0].toString(), true);
+        getMockServerClientCreateInfoType(rappInstance.getDme().getInfoTypeConsumer(), true);
         getMockServerClientCreateInfoProducer(rappInstance.getDme().getInfoProducer(), false);
         rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
         assertFalse(dmeDeployer.deployRappInstance(rapp, rappInstance));
@@ -231,6 +234,7 @@ class DmeDeployerTest {
         Rapp rapp = getRapp(Optional.empty());
         RappInstance rappInstance = rappDmeResourceBuilder.getRappInstance();
         getMockServerClientCreateInfoType(rappInstance.getDme().getInfoTypesProducer().toArray()[0].toString(), true);
+        getMockServerClientCreateInfoType(rappInstance.getDme().getInfoTypeConsumer(), true);
         getMockServerClientCreateInfoProducer(rappInstance.getDme().getInfoProducer(), true);
         getMockServerClientCreateInfoConsumer(rappInstance.getDme().getInfoConsumer(), false);
         rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
@@ -277,7 +281,8 @@ class DmeDeployerTest {
     @Test
     void testCreateInfoTypeFailureInvalidInfoType() {
         Rapp rapp = getRapp(Optional.empty());
-        assertFalse(dmeDeployer.createInfoTypes(rapp, null));
+        assertFalse(dmeDeployer.createProducerInfoTypes(rapp, null));
+        assertFalse(dmeDeployer.createConsumerInfoTypes(rapp, null));
     }
 
     @Test