summaryrefslogtreecommitdiffstats
path: root/bpmn/MSOCoreBPMN
diff options
context:
space:
mode:
authorRob Daugherty <rd472p@att.com>2018-10-23 14:08:57 -0400
committerRob Daugherty <rd472p@att.com>2018-10-23 16:18:55 -0400
commit6cf9ff1f1f2360a406f68f3147d86fd864d31910 (patch)
tree0df346a4222f84511ba47ac090e81d37a2c675d4 /bpmn/MSOCoreBPMN
parent60f8f5342f1fba49373699c1466e6ca06d1adc34 (diff)
parent0116cbfe7836b05381fe5632e0e536a625789b31 (diff)
8/23: merge casablanca to master
Change-Id: I0a73fbedf8c6f22e0a37cd8f0505ddcf83250341 Issue-ID: SO-1160 Signed-off-by: Rob Daugherty <rd472p@att.com>
Diffstat (limited to 'bpmn/MSOCoreBPMN')
-rw-r--r--bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/json/JsonUtilsTest.java4
-rw-r--r--bpmn/MSOCoreBPMN/src/test/resources/json-examples/SNIROExample.json12
2 files changed, 8 insertions, 8 deletions
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/json/JsonUtilsTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/json/JsonUtilsTest.java
index 07523ca931..6748128f05 100644
--- a/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/json/JsonUtilsTest.java
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/json/JsonUtilsTest.java
@@ -69,7 +69,7 @@ public class JsonUtilsTest {
JSONObject homingDataJson = arr.getJSONObject(0);
JSONArray assignmentInfo = homingDataJson.getJSONArray("assignmentInfo");
Map<String, String> map = utils.entryArrayToMap(execution, assignmentInfo.toString(), "variableName", "variableValue");
- assertEquals(map.get("cloudOwner"), "att-aic");
+ assertEquals(map.get("cloudOwner"), "CloudOwner");
}
@Test
public void entryArrayToMapStringTest() throws IOException {
@@ -80,7 +80,7 @@ public class JsonUtilsTest {
JSONObject homingDataJson = arr.getJSONObject(0);
JSONArray assignmentInfo = homingDataJson.getJSONArray("assignmentInfo");
Map<String, String> map = utils.entryArrayToMap(assignmentInfo.toString(), "variableName", "variableValue");
- assertEquals(map.get("cloudOwner"), "att-aic");
+ assertEquals(map.get("cloudOwner"), "CloudOwner");
}
@Test
public void getJsonRootPropertyTest() throws IOException {
diff --git a/bpmn/MSOCoreBPMN/src/test/resources/json-examples/SNIROExample.json b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/SNIROExample.json
index 838bcd85a7..f952302cdb 100644
--- a/bpmn/MSOCoreBPMN/src/test/resources/json-examples/SNIROExample.json
+++ b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/SNIROExample.json
@@ -23,7 +23,7 @@
"variableName": "aicVersion"
},
{
- "variableValue": "att-aic",
+ "variableValue": "CloudOwner",
"variableName": "cloudOwner"
}
],
@@ -48,7 +48,7 @@
"variableName": "aicVersion"
},
{
- "variableValue": "att-aic",
+ "variableValue": "CloudOwner",
"variableName": "cloudOwner"
},
{
@@ -73,7 +73,7 @@
"variableName": "aicVersion"
},
{
- "variableValue": "att-aic",
+ "variableValue": "CloudOwner",
"variableName": "cloudOwner"
}
],
@@ -94,7 +94,7 @@
"variableName": "aicVersion"
},
{
- "variableValue": "att-aic",
+ "variableValue": "CloudOwner",
"variableName": "cloudOwner"
}
],
@@ -119,7 +119,7 @@
"variableName": "aicVersion"
},
{
- "variableValue": "att-aic",
+ "variableValue": "CloudOwner",
"variableName": "cloudOwner"
},
{
@@ -144,7 +144,7 @@
"variableName": "aicVersion"
},
{
- "variableValue": "att-aic",
+ "variableValue": "CloudOwner",
"variableName": "cloudOwner"
}
],