Fix: Make bookstore data consistent

 - Removed list named invoice from all bookstore files
 - Added a new parent list as bookstore-address
 - Refactored tests

Issue-ID: CPS-1813
Signed-off-by: Arpit Singh <as00745003@techmahindra.com>
Change-Id: I5c7e83e1ee0ad9ac1d94d1906c2361c7a00d49af

3 files changed, 17 insertions, 27 deletions

diff --git a/integration-test/src/test/groovy/org/onap/cps/integration/functional/CpsDataServiceIntegrationSpec.groovy b/integration-test/src/test/groovy/org/onap/cps/integration/functional/CpsDataServiceIntegrationSpec.groovy
index a3f14397c..7c257adda 100644
--- a/integration-test/src/test/groovy/org/onap/cps/integration/functional/CpsDataServiceIntegrationSpec.groovy
+++ b/integration-test/src/test/groovy/org/onap/cps/integration/functional/CpsDataServiceIntegrationSpec.groovy
@@ -183,15 +183,15 @@ class CpsDataServiceIntegrationSpec extends FunctionalSpecBase {
 
     def 'Add and Delete top-level list (element) data nodes with root node.'() {
         given: 'a new (multiple-data-tree:invoice) datanodes'
-            def json = '{"multiple-data-tree:invoice": [{"ProductID": "2","ProductName": "Mango","price": "150","stock": true}]}'
+            def json = '{"bookstore-address":[{"bookstore-name":"Scholastic","address":"Bangalore,India","postal-code":"560043"}]}'
         when: 'the new list elements are saved'
             objectUnderTest.saveListElements(FUNCTIONAL_TEST_DATASPACE_1, BOOKSTORE_ANCHOR_1 , '/', json, now)
         then: 'they can be retrieved by their xpaths'
-            objectUnderTest.getDataNodes(FUNCTIONAL_TEST_DATASPACE_1, BOOKSTORE_ANCHOR_1 , '/invoice[@ProductID ="2"]', INCLUDE_ALL_DESCENDANTS)
+            objectUnderTest.getDataNodes(FUNCTIONAL_TEST_DATASPACE_1, BOOKSTORE_ANCHOR_1 , '/bookstore-address[@bookstore-name="Easons"]', INCLUDE_ALL_DESCENDANTS)
         and: 'there is one extra datanode'
             assert originalCountBookstoreTopLevelListNodes + 1 == countTopLevelListDataNodesInBookstore()
         when: 'the new elements are deleted'
-            objectUnderTest.deleteDataNode(FUNCTIONAL_TEST_DATASPACE_1, BOOKSTORE_ANCHOR_1 , '/invoice[@ProductID ="2"]', now)
+            objectUnderTest.deleteDataNode(FUNCTIONAL_TEST_DATASPACE_1, BOOKSTORE_ANCHOR_1 , '/bookstore-address[@bookstore-name="Easons"]', now)
         then: 'the original number of datanodes is restored'
             assert originalCountBookstoreTopLevelListNodes == countTopLevelListDataNodesInBookstore()
     }
diff --git a/integration-test/src/test/resources/data/bookstore/bookstore.yang b/integration-test/src/test/resources/data/bookstore/bookstore.yang
index ab384de1c..6f60f1981 100644
--- a/integration-test/src/test/resources/data/bookstore/bookstore.yang
+++ b/integration-test/src/test/resources/data/bookstore/bookstore.yang
@@ -15,31 +15,22 @@ module stores {
         }
     }
 
-    list invoice {
-        key "ProductID";
-        leaf ProductID {
-            type uint64;
-            mandatory "true";
-            description
-            "Unique product ID. Example: 001";
-        }
-        leaf ProductName {
+    list bookstore-address {
+        key "bookstore-name";
+        leaf bookstore-name {
             type string;
-            mandatory "true";
             description
-            "Name of the Product";
+            "Name of bookstore. Example: My Bookstore";
         }
-        leaf price {
-            type uint64;
-            mandatory "true";
+        leaf address {
+            type string;
             description
-            "Price of book";
+            "Address of store";
         }
-        leaf stock {
-            type boolean;
-            default "false";
+        leaf postal-code {
+            type string;
             description
-            "Book in stock or not. Example value: true";
+            "Postal code of store";
         }
     }
 
diff --git a/integration-test/src/test/resources/data/bookstore/bookstoreData.json b/integration-test/src/test/resources/data/bookstore/bookstoreData.json
index 5f66a1d00..418acf8ef 100644
--- a/integration-test/src/test/resources/data/bookstore/bookstoreData.json
+++ b/integration-test/src/test/resources/data/bookstore/bookstoreData.json
@@ -1,10 +1,9 @@
 {
-  "multiple-data-tree:invoice": [
+  "bookstore-address": [
     {
-      "ProductID": "1",
-      "ProductName": "Apple",
-      "price": "100",
-      "stock": false
+      "bookstore-name": "Easons",
+      "address": "Dublin,Ireland",
+      "postal-code": "D02HA21"
     }
   ],
   "bookstore": {