From 61f5e14c5cdebe659dfae0c7143a07d6f81cb06c Mon Sep 17 00:00:00 2001 From: Arpit Singh Date: Thu, 27 Jul 2023 14:48:30 +0530 Subject: 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 Change-Id: I5c7e83e1ee0ad9ac1d94d1906c2361c7a00d49af --- .../test/resources/data/bookstore/bookstore.yang | 29 ++++++++-------------- .../resources/data/bookstore/bookstoreData.json | 9 +++---- 2 files changed, 14 insertions(+), 24 deletions(-) (limited to 'integration-test/src/test/resources/data') diff --git a/integration-test/src/test/resources/data/bookstore/bookstore.yang b/integration-test/src/test/resources/data/bookstore/bookstore.yang index ab384de1c4..6f60f1981c 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 5f66a1d002..418acf8ef8 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": { -- cgit 1.2.3-korg