2 files changed, 34 insertions, 16 deletions
diff --git a/ms/blueprintsprocessor/modules/services/resolution-service/src/test/java/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/ResourceResolutionServiceTest.java b/ms/blueprintsprocessor/modules/services/resolution-service/src/test/java/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/ResourceResolutionServiceTest.java
index 633599082..0768c6099 100644
--- a/ms/blueprintsprocessor/modules/services/resolution-service/src/test/java/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/ResourceResolutionServiceTest.java
+++ b/ms/blueprintsprocessor/modules/services/resolution-service/src/test/java/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/ResourceResolutionServiceTest.java
@@ -1,5 +1,6 @@
 /*
  *  Copyright © 2017-2018 AT&T Intellectual Property.
+ *  Modifications Copyright © 2018 IBM.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -24,6 +25,11 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.onap.ccsdk.apps.blueprintsprocessor.core.api.data.ResourceResolutionInput;
 import org.onap.ccsdk.apps.blueprintsprocessor.core.api.data.ResourceResolutionOutput;
+import org.onap.ccsdk.apps.blueprintsprocessor.core.factory.ResourceAssignmentProcessorFactory;
+import org.onap.ccsdk.apps.blueprintsprocessor.services.resolution.processor.DefaultResourceAssignmentProcessor;
+import org.onap.ccsdk.apps.blueprintsprocessor.services.resolution.processor.InputResourceAssignmentProcessor;
+import org.onap.ccsdk.apps.blueprintsprocessor.services.resolution.processor.MDSALResourceAssignmentProcessor;
+import org.onap.ccsdk.apps.blueprintsprocessor.services.resolution.processor.SdncResourceAssignmentProcessor;
 import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils;
 import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment;
 import org.slf4j.Logger;
@@ -42,7 +48,9 @@ import java.util.List;
  * @author Brinda Santh DATE : 8/15/2018
  */
 @RunWith(SpringRunner.class)
-@ContextConfiguration(classes = ResourceResolutionService.class)
+@ContextConfiguration(classes = {ResourceResolutionService.class, ResourceAssignmentProcessorFactory.class,
+        InputResourceAssignmentProcessor.class, DefaultResourceAssignmentProcessor.class,
+        SdncResourceAssignmentProcessor.class, MDSALResourceAssignmentProcessor.class})
 public class ResourceResolutionServiceTest {
     private static Logger log = LoggerFactory.getLogger(ResourceResolutionServiceTest.class);
 
@@ -57,8 +65,8 @@ public class ResourceResolutionServiceTest {
         String resourceResolutionInputContent = FileUtils.readFileToString(
                 new File("src/test/resources/payload/requests/sample-resourceresolution-request.json"), Charset.defaultCharset());
 
-        ResourceResolutionInput resourceResolutionInput = JacksonUtils.readValue(resourceResolutionInputContent, ResourceResolutionInput.class );
-        Assert.assertNotNull("failed to populate resourceResolutionInput request ",resourceResolutionInput);
+        ResourceResolutionInput resourceResolutionInput = JacksonUtils.readValue(resourceResolutionInputContent, ResourceResolutionInput.class);
+        Assert.assertNotNull("failed to populate resourceResolutionInput request ", resourceResolutionInput);
 
         String resourceAssignmentContent = FileUtils.readFileToString(
                 new File("src/test/resources/mapping/db/resource-assignments-simple.json"), Charset.defaultCharset());
@@ -68,13 +76,13 @@ public class ResourceResolutionServiceTest {
         Assert.assertTrue("failed to create ResourceAssignment from file", CollectionUtils.isNotEmpty(batchResourceAssignment));
         resourceResolutionInput.setResourceAssignments(batchResourceAssignment);
 
-        ObjectNode inputContent = (ObjectNode)JacksonUtils.jsonNodeFromFile("src/test/resources/payload/inputs/input.json");
-        Assert.assertNotNull("failed to populate input payload ",inputContent);
+        ObjectNode inputContent = (ObjectNode) JacksonUtils.jsonNodeFromFile("src/test/resources/payload/inputs/input.json");
+        Assert.assertNotNull("failed to populate input payload ", inputContent);
         resourceResolutionInput.setPayload(inputContent);
         log.info("ResourceResolutionInput : {}", JacksonUtils.getJson(resourceResolutionInput, true));
 
         ResourceResolutionOutput resourceResolutionOutput = resourceResolutionService.resolveResource(resourceResolutionInput);
-        Assert.assertNotNull("failed to populate output",resourceResolutionOutput);
+        Assert.assertNotNull("failed to populate output", resourceResolutionOutput);
 
     }
 }
diff --git a/ms/blueprintsprocessor/modules/services/resolution-service/src/test/resources/mapping/db/resource-assignments-simple.json b/ms/blueprintsprocessor/modules/services/resolution-service/src/test/resources/mapping/db/resource-assignments-simple.json
index 02ce68be4..ddcf32eed 100644
--- a/ms/blueprintsprocessor/modules/services/resolution-service/src/test/resources/mapping/db/resource-assignments-simple.json
+++ b/ms/blueprintsprocessor/modules/services/resolution-service/src/test/resources/mapping/db/resource-assignments-simple.json
@@ -1,12 +1,22 @@
 [
-	{
-		"name": "country",
-		"input-param": true,
-		"property": {
-			"type": "string"
-		},
-		"dictionary-name": "country",
-		"dictionary-source": "db",
-		"dependencies": []
-	}
+  {
+    "name": "country",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "country",
+    "dictionary-source": "db",
+    "dependencies": ["state"]
+  },
+  {
+    "name": "state",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "state",
+    "dictionary-source": "input",
+    "dependencies": []
+  }
 ]