X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=integration-test%2Fsrc%2Ftest%2Fgroovy%2Forg%2Fonap%2Fcps%2Fintegration%2Fbase%2FFunctionalSpecBase.groovy;fp=integration-test%2Fsrc%2Ftest%2Fgroovy%2Forg%2Fonap%2Fcps%2Fintegration%2Fbase%2FBookstoreSpecBase.groovy;h=5e5269114e456b9fdc9ebf38f1ca9f25a0bdb536;hb=0133eb03c09c6142b4a98047d00b0145a934dd45;hp=7eb47b35aec9af9116cdcb556507884ff151454e;hpb=29b493f8859f1ce0eeadaba75462006499f6f26d;p=cps.git

diff --git a/integration-test/src/test/groovy/org/onap/cps/integration/base/BookstoreSpecBase.groovy b/integration-test/src/test/groovy/org/onap/cps/integration/base/FunctionalSpecBase.groovy
similarity index 66%
rename from integration-test/src/test/groovy/org/onap/cps/integration/base/BookstoreSpecBase.groovy
rename to integration-test/src/test/groovy/org/onap/cps/integration/base/FunctionalSpecBase.groovy
index 7eb47b35a..5e5269114 100644
--- a/integration-test/src/test/groovy/org/onap/cps/integration/base/BookstoreSpecBase.groovy
+++ b/integration-test/src/test/groovy/org/onap/cps/integration/base/FunctionalSpecBase.groovy
@@ -22,7 +22,7 @@ package org.onap.cps.integration.base
 
 import java.time.OffsetDateTime
 
-class BookstoreSpecBase extends CpsIntegrationSpecBase {
+class FunctionalSpecBase extends CpsIntegrationSpecBase {
 
     def static initialized = false
 
@@ -35,15 +35,15 @@ class BookstoreSpecBase extends CpsIntegrationSpecBase {
     }
 
     def setupBookstoreInfraStructure() {
-        cpsAdminService.createDataspace(BOOKSTORE_DATASPACE)
-        def bookstoreYangModelAsString = readResourceFile('bookstore.yang')
-        cpsModuleService.createSchemaSet(BOOKSTORE_DATASPACE, BOOKSTORE_SCHEMA_SET, [bookstore : bookstoreYangModelAsString])
-        cpsAdminService.createAnchor(BOOKSTORE_DATASPACE, BOOKSTORE_SCHEMA_SET, BOOKSTORE_ANCHOR)
+        cpsAdminService.createDataspace(FUNCTIONAL_TEST_DATASPACE)
+        def bookstoreYangModelAsString = readResourceDataFile('bookstore/bookstore.yang')
+        cpsModuleService.createSchemaSet(FUNCTIONAL_TEST_DATASPACE, BOOKSTORE_SCHEMA_SET, [bookstore: bookstoreYangModelAsString])
+        cpsAdminService.createAnchor(FUNCTIONAL_TEST_DATASPACE, BOOKSTORE_SCHEMA_SET, BOOKSTORE_ANCHOR)
     }
 
     def addBookstoreData() {
-        def bookstoreJsonData = readResourceFile('BookstoreDataNodes.json')
-        cpsDataService.saveData(BOOKSTORE_DATASPACE, BOOKSTORE_ANCHOR, bookstoreJsonData, OffsetDateTime.now())
+        def bookstoreJsonData = readResourceDataFile('bookstore/bookstoreData.json')
+        cpsDataService.saveData(FUNCTIONAL_TEST_DATASPACE, BOOKSTORE_ANCHOR, bookstoreJsonData, OffsetDateTime.now())
     }
 
 }