From: Singal, Kapil (ks220y) <ks220y@att.com>
Date: Wed, 23 Jan 2019 05:52:14 +0000 (-0500)
Subject: Blueprint Processor: Jython Component
X-Git-Tag: 0.4.2~162^2~58^2~1
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d60560cd60ca7d389c02c2ca2e82c7a89ade1399;p=ccsdk%2Fcds.git

Blueprint Processor: Jython Component

Component Jython Executor Test Junit Test Case enhancement

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

diff --git a/ms/blueprintsprocessor/functions/python-executor/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/python/executor/ComponentJythonExecutorTest.kt b/ms/blueprintsprocessor/functions/python-executor/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/python/executor/ComponentJythonExecutorTest.kt
index 7684b2b03..83cf59c29 100644
--- a/ms/blueprintsprocessor/functions/python-executor/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/python/executor/ComponentJythonExecutorTest.kt
+++ b/ms/blueprintsprocessor/functions/python-executor/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/python/executor/ComponentJythonExecutorTest.kt
@@ -27,6 +27,7 @@ import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants
 import org.onap.ccsdk.apps.controllerblueprints.core.asJsonNode
 import org.onap.ccsdk.apps.controllerblueprints.core.putJsonElement
 import org.onap.ccsdk.apps.controllerblueprints.core.utils.BluePrintMetadataUtils
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.test.context.ContextConfiguration
 import org.springframework.test.context.TestPropertySource
@@ -44,6 +45,7 @@ class ComponentJythonExecutorTest {
 
     @Test
     fun testPythonComponentInjection() {
+        /*
         val executionServiceInput = ExecutionServiceInput()
         executionServiceInput.payload = JsonNodeFactory.instance.objectNode()
 
@@ -57,8 +59,12 @@ class ComponentJythonExecutorTest {
         actionIdentifiers.actionName = "activate"
         executionServiceInput.actionIdentifiers = actionIdentifiers
 
+        */
 
-        val bluePrintRuntimeService = BluePrintMetadataUtils.getBluePrintRuntime(commonHeader.requestId,
+        val executionServiceInput = JacksonUtils.readValueFromClassPathFile("payload/requests/sample-activate-request.json",
+                ExecutionServiceInput::class.java)!!
+
+        val bluePrintRuntimeService = BluePrintMetadataUtils.getBluePrintRuntime("1234",
                 "./../../../../components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration")
 
         val stepMetaData: MutableMap<String, JsonNode> = hashMapOf()
diff --git a/ms/blueprintsprocessor/functions/python-executor/src/test/resources/requests/sample-activate-request.json b/ms/blueprintsprocessor/functions/python-executor/src/test/resources/payload/requests/sample-activate-request.json
similarity index 100%
rename from ms/blueprintsprocessor/functions/python-executor/src/test/resources/requests/sample-activate-request.json
rename to ms/blueprintsprocessor/functions/python-executor/src/test/resources/payload/requests/sample-activate-request.json