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>

diff --git a/main/src/test/resources/simpleDeploy/getPolicyReqNullVersion.json b/main/src/test/resources/simpleDeploy/getPolicyReqNullVersion.json
index bf2d132..5f9f8c9 100644 (file)
--- 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 060637c..0336f3f 100644 (file)
--- 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 67fcdcb..c65a3ae 100644 (file)
--- 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 3d4684c..fa36783 100644 (file)
--- 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"
         }
     ]
 }