Remove the dependency-cycle between beans

[cps.git] / integration-test / src / test / groovy / org / onap / cps / integration / functional / CpsAnchorServiceIntegrationSpec.groovy

diff --git a/integration-test/src/test/groovy/org/onap/cps/integration/functional/CpsAdminServiceIntegrationSpec.groovy b/integration-test/src/test/groovy/org/onap/cps/integration/functional/CpsAnchorServiceIntegrationSpec.groovy
similarity index 66%
rename from integration-test/src/test/groovy/org/onap/cps/integration/functional/CpsAdminServiceIntegrationSpec.groovy
rename to integration-test/src/test/groovy/org/onap/cps/integration/functional/CpsAnchorServiceIntegrationSpec.groovy
index f8eca61..99dab84 100644 (file)
--- a/integration-test/src/test/groovy/org/onap/cps/integration/functional/CpsAdminServiceIntegrationSpec.groovy
+++ b/integration-test/src/test/groovy/org/onap/cps/integration/functional/CpsAnchorServiceIntegrationSpec.groovy
@@ -20,76 +20,19 @@
 
 package org.onap.cps.integration.functional
 
-import org.onap.cps.api.CpsAdminService
+import org.onap.cps.api.CpsAnchorService
 import org.onap.cps.integration.base.CpsIntegrationSpecBase
 import org.onap.cps.spi.FetchDescendantsOption
 import org.onap.cps.spi.exceptions.AlreadyDefinedException
 import org.onap.cps.spi.exceptions.AnchorNotFoundException
-import org.onap.cps.spi.exceptions.DataspaceInUseException
-import org.onap.cps.spi.exceptions.DataspaceNotFoundException
-import java.time.OffsetDateTime
-
-class CpsAdminServiceIntegrationSpec extends CpsIntegrationSpecBase {
-
-    CpsAdminService objectUnderTest
 
-    def setup() { objectUnderTest = cpsAdminService }
-
-    def 'Dataspace CRUD operations.'() {
-        when: 'a dataspace is created'
-            objectUnderTest.createDataspace('newDataspace')
-        then: 'the dataspace can be read'
-            assert objectUnderTest.getDataspace('newDataspace').name == 'newDataspace'
-        and: 'it can be deleted'
-            objectUnderTest.deleteDataspace('newDataspace')
-        then: 'the dataspace no longer exists i.e. an exception is thrown if an attempt is made to retrieve it'
-            def thrown = null
-            try {
-                objectUnderTest.getDataspace('newDataspace')
-            } catch(Exception exception) {
-                thrown = exception
-            }
-           assert thrown instanceof DataspaceNotFoundException
-    }
+import java.time.OffsetDateTime
 
-    def 'Delete dataspace with error; #scenario.'() {
-        setup: 'add some anchors if needed'
-            numberOfAnchors.times {
-                objectUnderTest.createAnchor(GENERAL_TEST_DATASPACE, BOOKSTORE_SCHEMA_SET, 'anchor' + it)
-            }
-        when: 'attempt to delete dataspace'
-            objectUnderTest.deleteDataspace(dataspaceName)
-        then: 'the correct exception is thrown with the relevant details'
-            def thrownException = thrown(expectedException)
-            thrownException.details.contains(expectedMessageDetails)
-        cleanup:
-            numberOfAnchors.times {
-                objectUnderTest.deleteAnchor(GENERAL_TEST_DATASPACE, 'anchor' + it)
-            }
-        where: 'the following data is used'
-            scenario                        | dataspaceName          | numberOfAnchors || expectedException          | expectedMessageDetails
-            'dataspace name does not exist' | 'unknown'              | 0               || DataspaceNotFoundException | 'unknown does not exist'
-            'dataspace contains schemasets' | GENERAL_TEST_DATASPACE | 0               || DataspaceInUseException    | 'contains 1 schemaset(s)'
-            'dataspace contains anchors'    | GENERAL_TEST_DATASPACE | 2               || DataspaceInUseException    | 'contains 2 anchor(s)'
-    }
+class CpsAnchorServiceIntegrationSpec extends CpsIntegrationSpecBase {
 
-    def 'Retrieve all dataspaces (depends on total test suite).'() {
-        given: 'two addtional dataspaces are created'
-            objectUnderTest.createDataspace('dataspace1')
-            objectUnderTest.createDataspace('dataspace2')
-        when: 'all datespaces are retreived'
-            def result = objectUnderTest.getAllDataspaces()
-        then: 'there are at least 3 dataspaces (2 new ones plus the general test dataspace)'
-            result.size() >= 3
-            assert result.name.containsAll([GENERAL_TEST_DATASPACE, 'dataspace1', 'dataspace2'])
-    }
+    CpsAnchorService objectUnderTest
 
-    def 'Duplicate dataspaces.'() {
-        when: 'attempting to create a dataspace with the same name as an existing one'
-            objectUnderTest.createDataspace(GENERAL_TEST_DATASPACE)
-        then: 'an exception is thrown indicating the dataspace already exists'
-            thrown(AlreadyDefinedException)
-    }
+    def setup() { objectUnderTest = cpsAnchorService }
 
     def 'Anchor CRUD operations.'() {
         when: 'an anchor is created'
@@ -148,9 +91,9 @@ class CpsAdminServiceIntegrationSpec extends CpsIntegrationSpecBase {
         then: 'an empty result is returned (no error)'
             assert result == []
         where:
-           scenario                 | dataspaceName
-           'non existing database'  | 'nonExistingDataspace'
-           'just unknown module(s)' | GENERAL_TEST_DATASPACE
+            scenario                 | dataspaceName
+            'non existing database'  | 'nonExistingDataspace'
+            'just unknown module(s)' | GENERAL_TEST_DATASPACE
     }
 
     def 'Update anchor schema set.'() {