Refactor Delete Anchor functionality

[cps.git] / cps-service / src / test / groovy / org / onap / cps / api / impl / E2ENetworkSliceSpec.groovy

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 eefa86e..5238952 100755 (executable)
--- 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,7 +1,7 @@
 /*\r
  * ============LICENSE_START=======================================================\r
  * Copyright (C) 2021 Nordix Foundation.\r
- * Modifications Copyright (C) 2021 Bell Canada.\r
+ * Modifications Copyright (C) 2021-2022 Bell Canada.\r
  * Modifications Copyright (C) 2021 Pantheon.tech\r
  * ================================================================================\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
@@ -22,7 +22,6 @@
 \r
 package org.onap.cps.api.impl\r
 \r
-import java.time.OffsetDateTime\r
 import org.onap.cps.TestUtils\r
 import org.onap.cps.api.CpsAdminService\r
 import org.onap.cps.notification.NotificationService\r
@@ -38,24 +37,17 @@ class E2ENetworkSliceSpec extends Specification {
     def mockDataStoreService = Mock(CpsDataPersistenceService)\r
     def mockCpsAdminService = Mock(CpsAdminService)\r
     def mockNotificationService = Mock(NotificationService)\r
-    def cpsModuleServiceImpl = new CpsModuleServiceImpl()\r
-    def cpsDataServiceImpl = new CpsDataServiceImpl()\r
     def mockYangTextSchemaSourceSetCache = Mock(YangTextSchemaSourceSetCache)\r
+    def cpsModuleServiceImpl = new CpsModuleServiceImpl(mockModuleStoreService,\r
+            mockYangTextSchemaSourceSetCache,mockCpsAdminService )\r
+    def cpsDataServiceImpl = new CpsDataServiceImpl(mockDataStoreService, mockCpsAdminService,\r
+            mockYangTextSchemaSourceSetCache, mockNotificationService)\r
 \r
     def dataspaceName = 'someDataspace'\r
     def anchorName = 'someAnchor'\r
     def schemaSetName = 'someSchemaSet'\r
     def noTimestamp = null\r
 \r
-    def setup() {\r
-        cpsDataServiceImpl.cpsDataPersistenceService = mockDataStoreService\r
-        cpsDataServiceImpl.cpsAdminService = mockCpsAdminService\r
-        cpsDataServiceImpl.yangTextSchemaSourceSetCache = mockYangTextSchemaSourceSetCache\r
-        cpsDataServiceImpl.notificationService = mockNotificationService\r
-        cpsModuleServiceImpl.yangTextSchemaSourceSetCache = mockYangTextSchemaSourceSetCache\r
-        cpsModuleServiceImpl.cpsModulePersistenceService = mockModuleStoreService\r
-    }\r
-\r
     def 'E2E model can be parsed by CPS.'() {\r
         given: 'Valid yang resource as name-to-content map'\r
             def yangResourcesNameToContentMap = TestUtils.getYangResourcesAsMap(\r