From: Dan Timoney <dtimoney@att.com>
Date: Tue, 2 Apr 2019 18:10:23 +0000 (+0000)
Subject: Merge "Complementary Junit test coverage"
X-Git-Tag: 0.4.2~116
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=add0df2429c787de6de8238f8f87eb71a26a9be7;p=ccsdk%2Fcds.git

Merge "Complementary Junit test coverage"
---

add0df2429c787de6de8238f8f87eb71a26a9be7
diff --cc ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionServiceTest.kt
index 5ad9b3ace,d7a78999e..4a82dbd21
--- 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
@@@ -73,22 -75,66 +76,68 @@@ class ResourceResolutionServiceTest 
      @Test
      @Throws(Exception::class)
      fun testResolveResource() {
 +        runBlocking {
  
 -        Assert.assertNotNull("failed to create ResourceResolutionService", resourceResolutionService)
 +            Assert.assertNotNull("failed to create ResourceResolutionService", resourceResolutionService)
  
 -        val bluePrintRuntimeService = BluePrintMetadataUtils.getBluePrintRuntime("1234",
 -                "./../../../../components/model-catalog/blueprint-model/test-blueprint/baseconfiguration")
 +            val bluePrintRuntimeService = BluePrintMetadataUtils.getBluePrintRuntime("1234",
 +                    "./../../../../components/model-catalog/blueprint-model/test-blueprint/baseconfiguration")
  
 -        val executionServiceInput = JacksonUtils.readValueFromClassPathFile("payload/requests/sample-resourceresolution-request.json",
 -                ExecutionServiceInput::class.java)!!
 +            val executionServiceInput = JacksonUtils.readValueFromClassPathFile("payload/requests/sample-resourceresolution-request.json",
 +                    ExecutionServiceInput::class.java)!!
  
 -        // Prepare Inputs
 -        PayloadUtils.prepareInputsFromWorkflowPayload(bluePrintRuntimeService, executionServiceInput.payload, "resource-assignment")
 +            // Prepare Inputs
 +            PayloadUtils.prepareInputsFromWorkflowPayload(bluePrintRuntimeService, executionServiceInput.payload, "resource-assignment")
  
 -        resourceResolutionService.resolveResources(bluePrintRuntimeService, "resource-assignment", "baseconfig", mapOf())
 +            resourceResolutionService.resolveResources(bluePrintRuntimeService, "resource-assignment", "baseconfig", mapOf())
  
 +        }
      }
  
+     @Test
+     @Throws(Exception::class)
+     fun testResolveResources() {
+ 
+         Assert.assertNotNull("failed to create ResourceResolutionService", resourceResolutionService)
+ 
+         val bluePrintRuntimeService = BluePrintMetadataUtils.getBluePrintRuntime("1234",
+                 "./../../../../components/model-catalog/blueprint-model/test-blueprint/baseconfiguration")
+ 
+         val executionServiceInput = JacksonUtils.readValueFromClassPathFile("payload/requests/sample-resourceresolution-request.json",
+                 ExecutionServiceInput::class.java)!!
+ 
+         val artefactNames = listOf("baseconfig", "another")
+ 
+         // Prepare Inputs
+         PayloadUtils.prepareInputsFromWorkflowPayload(bluePrintRuntimeService, executionServiceInput.payload, "resource-assignment")
+ 
+         resourceResolutionService.resolveResources(bluePrintRuntimeService, "resource-assignment", artefactNames, mapOf())
+ 
+     }
+ 
+     @Test
+     @Throws(Exception::class)
+     fun testResolveResourcesWithMappingAndTemplate() {
+ 
+         Assert.assertNotNull("failed to create ResourceResolutionService", resourceResolutionService)
+ 
+         val bluePrintRuntimeService = BluePrintMetadataUtils.getBluePrintRuntime("1234",
+                 "./../../../../components/model-catalog/blueprint-model/test-blueprint/baseconfiguration")
+ 
+         val executionServiceInput = JacksonUtils.readValueFromClassPathFile("payload/requests/sample-resourceresolution-request.json",
+                 ExecutionServiceInput::class.java)!!
+ 
+         val artifactPrefix = "another"
+ 
+         // Velocity Artifact Definition Name
+         val artifactTemplate = "$artifactPrefix-template"
+         // Resource Assignment Artifact Definition Name
+         val artifactMapping = "$artifactPrefix-mapping"
+ 
+         // Prepare Inputs
+         PayloadUtils.prepareInputsFromWorkflowPayload(bluePrintRuntimeService, executionServiceInput.payload, "resource-assignment")
+ 
+         resourceResolutionService.resolveResources(bluePrintRuntimeService, "resource-assignment", artifactMapping, artifactTemplate)
+ 
+     }
  }