Refactoring Resource Resolution Service

Removing Node Template dependency

Issue-ID: CCSDK-2078
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I24f3e003c64f3ee40eee4699366cfadfc1d7147e

1 files changed, 14 insertions, 12 deletions

diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionServiceTest.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionServiceTest.kt
index 264b45789..2f338a3a1 100644
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionServiceTest.kt
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionServiceTest.kt
@@ -202,20 +202,20 @@ class ResourceResolutionServiceTest {
                 "resource-assignment"
             )
 
-            resourceResolutionService.resolveResources(
-                resourceAssignmentRuntimeService,
-                "resource-assignment",
-                artifactPrefix,
-                props
+            assertNotNull(
+                resourceResolutionService.resolveResources(
+                    resourceAssignmentRuntimeService,
+                    "resource-assignment",
+                    artifactPrefix,
+                    props
+                ), "Couldn't Resolve Resources for artifact $artifactPrefix"
             )
         }
     }
 
     @Test
     fun testResolveResourcesWithResourceIdAndResourceType() {
-
         props[ResourceResolutionConstants.RESOURCE_RESOLUTION_INPUT_RESOLUTION_KEY] = ""
-
         runBlocking {
             Assert.assertNotNull("failed to create ResourceResolutionService", resourceResolutionService)
 
@@ -245,11 +245,13 @@ class ResourceResolutionServiceTest {
                 "resource-assignment"
             )
 
-            resourceResolutionService.resolveResources(
-                resourceAssignmentRuntimeService,
-                "resource-assignment",
-                artifactPrefix,
-                props
+            assertNotNull(
+                resourceResolutionService.resolveResources(
+                    resourceAssignmentRuntimeService,
+                    "resource-assignment",
+                    artifactPrefix,
+                    props
+                ), "Couldn't Resolve Resources for artifact $artifactPrefix"
             )
         }
     }