summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2019-04-11 11:29:16 -0400
committerJim Hahn <jrh3@att.com>2019-04-11 11:29:16 -0400
commit04a527e543e0ecc35441e67f4c991713c5519326 (patch)
tree2c2db89ccb14d3bbdcdc222dc8b87253d7fdd669 /main
parentc1df0a9b44dacc6defe1df5f1a2f72ac5c6ec433 (diff)
Fix junits broken with policy-id change
Several junit tests were broken when the json-encoded names were changed for the fields within ToscaPolicyIdentifierOptVersion. This review fixes those junit tests. Change-Id: I963190b7792a2ebc3165ef04c74f4671c41c37da Issue-ID: POLICY-1542 Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'main')
-rw-r--r--main/src/test/resources/simpleDeploy/getPolicyReqNullVersion.json2
-rw-r--r--main/src/test/resources/simpleDeploy/request.json4
-rw-r--r--main/src/test/resources/simpleDeploy/requestBase.json4
-rw-r--r--main/src/test/resources/simpleDeploy/updateGroupReqMultiple.json16
4 files changed, 13 insertions, 13 deletions
diff --git a/main/src/test/resources/simpleDeploy/getPolicyReqNullVersion.json b/main/src/test/resources/simpleDeploy/getPolicyReqNullVersion.json
index bf2d132b..5f9f8c9e 100644
--- a/main/src/test/resources/simpleDeploy/getPolicyReqNullVersion.json
+++ b/main/src/test/resources/simpleDeploy/getPolicyReqNullVersion.json
@@ -1,7 +1,7 @@
{
"policies": [
{
- "name": "policyA"
+ "policy-id": "policyA"
}
]
}
diff --git a/main/src/test/resources/simpleDeploy/request.json b/main/src/test/resources/simpleDeploy/request.json
index 060637cc..0336f3fd 100644
--- a/main/src/test/resources/simpleDeploy/request.json
+++ b/main/src/test/resources/simpleDeploy/request.json
@@ -1,8 +1,8 @@
{
"policies": [
{
- "name": "policyA",
- "version": "1.2.3"
+ "policy-id": "policyA",
+ "policy-version": "1.2.3"
}
]
}
diff --git a/main/src/test/resources/simpleDeploy/requestBase.json b/main/src/test/resources/simpleDeploy/requestBase.json
index 67fcdcb6..c65a3ae3 100644
--- a/main/src/test/resources/simpleDeploy/requestBase.json
+++ b/main/src/test/resources/simpleDeploy/requestBase.json
@@ -1,4 +1,4 @@
{
- "name": "policyA",
- "version": "1.2.3"
+ "policy-id": "policyA",
+ "policy-version": "1.2.3"
}
diff --git a/main/src/test/resources/simpleDeploy/updateGroupReqMultiple.json b/main/src/test/resources/simpleDeploy/updateGroupReqMultiple.json
index 3d4684cc..fa367835 100644
--- a/main/src/test/resources/simpleDeploy/updateGroupReqMultiple.json
+++ b/main/src/test/resources/simpleDeploy/updateGroupReqMultiple.json
@@ -1,20 +1,20 @@
{
"policies": [
{
- "name": "policyA",
- "version": "1.2.3"
+ "policy-id": "policyA",
+ "policy-version": "1.2.3"
},
{
- "name": "policyB",
- "version": "1.2.3"
+ "policy-id": "policyB",
+ "policy-version": "1.2.3"
},
{
- "name": "policyC",
- "version": "1.2.3"
+ "policy-id": "policyC",
+ "policy-version": "1.2.3"
},
{
- "name": "policyD",
- "version": "1.2.3"
+ "policy-id": "policyD",
+ "policy-version": "1.2.3"
}
]
}