Add blueprint artifact definition enrichment.

Change-Id: I3b03a1f76472ce6b44929457a42805d281950ff7
Issue-ID: CCSDK-839
Signed-off-by: Muthuramalingam, Brinda Santh(bs2796) <bs2796@att.com>

2 files changed, 5 insertions, 4 deletions

diff --git a/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRepoFileServiceTest.kt b/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRepoFileServiceTest.kt
index f7ffc394..9348a237 100644
--- a/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRepoFileServiceTest.kt
+++ b/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRepoFileServiceTest.kt
@@ -18,7 +18,7 @@
 package org.onap.ccsdk.apps.controllerblueprints.core.service

 

 import org.junit.Test

-import java.io.FileNotFoundException

+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException

 import kotlin.test.assertNotNull

 

 /**

@@ -49,7 +49,7 @@ class BluePrintRepoFileServiceTest {
         assertNotNull(nodeType, "Failed to get ArtifactType from repo")

     }

 

-    @Test(expected = FileNotFoundException::class)

+    @Test(expected = BluePrintException::class)

     fun testModelNotFound() {

         val dataType = bluePrintRepoFileService.getDataType("dt-not-found")

         assertNotNull(dataType, "Failed to get DataType from repo")

diff --git a/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/JacksonReactorUtilsTest.kt b/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/JacksonReactorUtilsTest.kt
index be76593d..ad55c776 100644
--- a/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/JacksonReactorUtilsTest.kt
+++ b/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/JacksonReactorUtilsTest.kt
@@ -19,11 +19,12 @@ package org.onap.ccsdk.apps.controllerblueprints.core.utils
 import com.att.eelf.configuration.EELFLogger

 import com.att.eelf.configuration.EELFManager

 import org.junit.Test

+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException

 import org.onap.ccsdk.apps.controllerblueprints.core.data.ServiceTemplate

-import java.io.FileNotFoundException

 import kotlin.test.assertEquals

 import kotlin.test.assertNotNull

 

+@Deprecated("Reactor will be replacecd by coroutines by default.")

 class JacksonReactorUtilsTest {

     private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())

     @Test

@@ -43,7 +44,7 @@ class JacksonReactorUtilsTest {
         assertNotNull(jsonContent, "Failed to get json Node")

     }

 

-    @Test(expected = FileNotFoundException::class)

+    @Test(expected = BluePrintException::class)

     fun testReadValuesFailure() {

         JacksonReactorUtils.jsonNodeFromFile("load/blueprints/not-found.json")

                 .block()