X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cps-service%2Fsrc%2Ftest%2Fgroovy%2Forg%2Fonap%2Fcps%2Fapi%2Fimpl%2FE2ENetworkSliceSpec.groovy;h=1b873ec12baeb519f51152a4d771403f8e1353f7;hb=c08b6d25f232907c51d84f0eb31ca8b977469e02;hp=52389522f87b7dc9ea567cf71b4265052820faa1;hpb=c9af4eac4dc7f86bd3f33d923f9efe4a8523ed57;p=cps.git

diff --git a/cps-service/src/test/groovy/org/onap/cps/api/impl/E2ENetworkSliceSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/api/impl/E2ENetworkSliceSpec.groovy
index 52389522f..1b873ec12 100755
--- a/cps-service/src/test/groovy/org/onap/cps/api/impl/E2ENetworkSliceSpec.groovy
+++ b/cps-service/src/test/groovy/org/onap/cps/api/impl/E2ENetworkSliceSpec.groovy
@@ -1,14 +1,15 @@
 /*
  * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
+ * Copyright (C) 2021-2023 Nordix Foundation.
  * Modifications Copyright (C) 2021-2022 Bell Canada.
  * Modifications Copyright (C) 2021 Pantheon.tech
+ * Modifications Copyright (C) 2022-2023 TechMahindra Ltd.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *       http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -24,11 +25,15 @@ package org.onap.cps.api.impl
 
 import org.onap.cps.TestUtils
 import org.onap.cps.api.CpsAdminService
+import org.onap.cps.api.CpsDeltaService
 import org.onap.cps.notification.NotificationService
 import org.onap.cps.spi.CpsDataPersistenceService
 import org.onap.cps.spi.CpsModulePersistenceService
 import org.onap.cps.spi.model.Anchor
+import org.onap.cps.spi.utils.CpsValidator
+import org.onap.cps.utils.TimedYangParser
 import org.onap.cps.utils.YangUtils
+import org.onap.cps.yang.TimedYangTextSchemaSourceSetBuilder
 import org.onap.cps.yang.YangTextSchemaSourceSetBuilder
 import spock.lang.Specification
 
@@ -38,10 +43,16 @@ class E2ENetworkSliceSpec extends Specification {
     def mockCpsAdminService = Mock(CpsAdminService)
     def mockNotificationService = Mock(NotificationService)
     def mockYangTextSchemaSourceSetCache = Mock(YangTextSchemaSourceSetCache)
+    def mockCpsValidator = Mock(CpsValidator)
+    def timedYangTextSchemaSourceSetBuilder = new TimedYangTextSchemaSourceSetBuilder()
+    def timedYangParser = new TimedYangParser()
+    def mockCpsDeltaService = Mock(CpsDeltaService)
+
     def cpsModuleServiceImpl = new CpsModuleServiceImpl(mockModuleStoreService,
-            mockYangTextSchemaSourceSetCache,mockCpsAdminService )
+            mockYangTextSchemaSourceSetCache, mockCpsAdminService, mockCpsValidator,timedYangTextSchemaSourceSetBuilder)
+
     def cpsDataServiceImpl = new CpsDataServiceImpl(mockDataStoreService, mockCpsAdminService,
-            mockYangTextSchemaSourceSetCache, mockNotificationService)
+            mockYangTextSchemaSourceSetCache, mockNotificationService, mockCpsValidator, timedYangParser, mockCpsDeltaService)
 
     def dataspaceName = 'someDataspace'
     def anchorName = 'someAnchor'
@@ -81,16 +92,16 @@ class E2ENetworkSliceSpec extends Specification {
             def jsonData = TestUtils.getResourceFileContent('e2e/basic/cps-Cavsta-Data.txt')
         and : 'all the further dependencies are mocked '
             mockCpsAdminService.getAnchor(dataspaceName, anchorName) >>
-                    new Anchor().builder().name(anchorName).schemaSetName(schemaSetName).build()
+                    new Anchor().builder().name(anchorName).schemaSetName(schemaSetName).dataspaceName(dataspaceName).build()
             mockYangTextSchemaSourceSetCache.get(dataspaceName, schemaSetName) >>
                     YangTextSchemaSourceSetBuilder.of(yangResourcesNameToContentMap)
             mockModuleStoreService.getYangSchemaResources(dataspaceName, schemaSetName) >> schemaContext
         when: 'saveData method is invoked'
             cpsDataServiceImpl.saveData(dataspaceName, anchorName, jsonData, noTimestamp)
         then: 'Parameters are validated and processing is delegated to persistence service'
-            1 * mockDataStoreService.storeDataNode('someDataspace', 'someAnchor', _) >>
+            1 * mockDataStoreService.storeDataNodes('someDataspace', 'someAnchor', _) >>
                     { args -> dataNodeStored = args[2]}
-            def child = dataNodeStored.childDataNodes[0]
+            def child = dataNodeStored[0].childDataNodes[0]
             assert child.childDataNodes.size() == 1
         and: 'list of Tracking Area for a Coverage Area are stored with correct xpath and child nodes '
             def listOfTAForCoverageArea = child.childDataNodes[0]
@@ -114,16 +125,16 @@ class E2ENetworkSliceSpec extends Specification {
             def jsonData = TestUtils.getResourceFileContent('e2e/basic/cps-ran-inventory-data.json')
         and : 'all the further dependencies are mocked '
             mockCpsAdminService.getAnchor('someDataspace', 'someAnchor') >>
-                    new Anchor().builder().name('someAnchor').schemaSetName('someSchemaSet').build()
+                    new Anchor().builder().name('someAnchor').schemaSetName('someSchemaSet').dataspaceName(dataspaceName).build()
             mockYangTextSchemaSourceSetCache.get('someDataspace', 'someSchemaSet') >> YangTextSchemaSourceSetBuilder.of(yangResourcesNameToContentMap)
             mockModuleStoreService.getYangSchemaResources('someDataspace', 'someSchemaSet') >> schemaContext
         when: 'saveData method is invoked'
             cpsDataServiceImpl.saveData('someDataspace', 'someAnchor', jsonData, noTimestamp)
         then: 'parameters are validated and processing is delegated to persistence service'
-            1 * mockDataStoreService.storeDataNode('someDataspace', 'someAnchor', _) >>
+            1 * mockDataStoreService.storeDataNodes('someDataspace', 'someAnchor', _) >>
                     { args -> dataNodeStored = args[2]}
         and: 'the size of the tree is correct'
-            def cpsRanInventory = TestUtils.getFlattenMapByXpath(dataNodeStored)
+            def cpsRanInventory = TestUtils.getFlattenMapByXpath(dataNodeStored[0])
             assert  cpsRanInventory.size() == 4
         and: 'ran-inventory contains the correct child node'
             def ranInventory = cpsRanInventory.get('/ran-inventory')