Move integration test (clean-up, last phase)

- Moved session manager test
- Improved schemaset concurrency test (retry testing)
- Cleaned up all ri (container based) integration test (setup)
- Applied some groovy best practice where needed
- internal ri module cover now down to 29%, covred by integration instead with
  - Line coverage up by 41 lines to 99% (was 97%)
  - Branch coverage up by 3 branches to 96% (was 93%)

Issue-ID: CPS-1687
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
Change-Id: Ifb77a053e5a5db62a3f6a32ae60a3a8b10918efd

17 files changed, 115 insertions, 640 deletions

diff --git a/cps-ri/pom.xml b/cps-ri/pom.xml
index 81d552324..89e60dbfb 100644
--- a/cps-ri/pom.xml
+++ b/cps-ri/pom.xml
@@ -33,8 +33,8 @@
     <artifactId>cps-ri</artifactId>

 

     <properties>

-        <minimum-coverage>0.32</minimum-coverage>

-        <!-- Additional coverage is provided by the integration-test module -->

+        <minimum-coverage>0.29</minimum-coverage>

+        <!-- Additional coverage is provided by integration-test module -->

     </properties>

 

     <dependencies>

@@ -125,16 +125,6 @@
                 </exclusion>

             </exclusions>

         </dependency>

-        <dependency>

-            <groupId>org.testcontainers</groupId>

-            <artifactId>postgresql</artifactId>

-            <scope>test</scope>

-        </dependency>

-        <dependency>

-            <groupId>org.testcontainers</groupId>

-            <artifactId>spock</artifactId>

-            <scope>test</scope>

-        </dependency>

     </dependencies>

 

     <profiles>

diff --git a/cps-ri/src/test/groovy/org/onap/cps/spi/impl/CpsModulePersistenceServiceConcurrencySpec.groovy b/cps-ri/src/test/groovy/org/onap/cps/spi/impl/CpsModulePersistenceServiceConcurrencySpec.groovy
index 65d63dfe3..2e4dba2e9 100644
--- a/cps-ri/src/test/groovy/org/onap/cps/spi/impl/CpsModulePersistenceServiceConcurrencySpec.groovy
+++ b/cps-ri/src/test/groovy/org/onap/cps/spi/impl/CpsModulePersistenceServiceConcurrencySpec.groovy
@@ -20,81 +20,126 @@
  */
 package org.onap.cps.spi.impl
 
-
 import org.hibernate.exception.ConstraintViolationException
+import org.onap.cps.spi.CpsAdminPersistenceService
 import org.onap.cps.spi.CpsModulePersistenceService
 import org.onap.cps.spi.entities.DataspaceEntity
+import org.onap.cps.spi.entities.SchemaSetEntity
 import org.onap.cps.spi.exceptions.DuplicatedYangResourceException
 import org.onap.cps.spi.model.ModuleReference
 import org.onap.cps.spi.repository.DataspaceRepository
+import org.onap.cps.spi.repository.ModuleReferenceRepository
+import org.onap.cps.spi.repository.SchemaSetRepository
 import org.onap.cps.spi.repository.YangResourceRepository
 import org.spockframework.spring.SpringBean
 import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.dao.DataIntegrityViolationException
-import spock.lang.Shared
+import org.springframework.retry.annotation.EnableRetry
+import spock.lang.Specification
 
 import java.sql.SQLException
 
-class CpsModulePersistenceServiceConcurrencySpec extends CpsPersistenceSpecBase {
+@SpringBootTest(classes=[CpsModulePersistenceServiceImpl])
+@EnableRetry
+class CpsModulePersistenceServiceConcurrencySpec extends Specification {
 
     @Autowired
     CpsModulePersistenceService objectUnderTest
 
     @SpringBean
-    YangResourceRepository yangResourceRepositoryMock = Mock()
+    DataspaceRepository dataspaceRepository = Mock()
+
+    @SpringBean
+    YangResourceRepository yangResourceRepository = Mock()
+
+    @SpringBean
+    SchemaSetRepository schemaSetRepository = Mock()
 
     @SpringBean
-    DataspaceRepository dataspaceRepositoryMock = Mock()
+    CpsAdminPersistenceService cpsAdminPersistenceService = Mock()
 
-    static final String DATASPACE_NAME = 'DATASPACE-001'
-    static final String SCHEMA_SET_NAME_NEW = 'SCHEMA-SET-NEW'
-    static final String NEW_RESOURCE_NAME = 'some new resource'
-    static final String NEW_RESOURCE_CONTENT = 'module stores {\n' +
+    @SpringBean
+    ModuleReferenceRepository moduleReferenceRepository = Mock()
+
+    def NEW_RESOURCE_NAME = 'some new resource'
+    def NEW_RESOURCE_CONTENT = 'module stores {\n' +
             '    yang-version 1.1;\n' +
             '    namespace "org:onap:ccsdk:sample";\n' +
             '}'
 
     def newYangResourcesNameToContentMap = [(NEW_RESOURCE_NAME):NEW_RESOURCE_CONTENT]
 
-    @Shared
-    yangResourceChecksum = 'b13faef573ed1374139d02c40d8ce09c80ea1dc70e63e464c1ed61568d48d539'
+    def yangResourceChecksum = 'b13faef573ed1374139d02c40d8ce09c80ea1dc70e63e464c1ed61568d48d539'
 
-    @Shared
-    yangResourceChecksumDbConstraint = 'yang_resource_checksum_key'
+    def yangResourceChecksumDbConstraint = 'yang_resource_checksum_key'
 
-    @Shared
-    sqlExceptionMessage = String.format('(checksum)=(%s)', yangResourceChecksum)
+    def sqlExceptionMessage = String.format('(checksum)=(%s)', yangResourceChecksum)
 
-    @Shared
-    checksumIntegrityException =
-           new DataIntegrityViolationException("checksum integrity exception",
+    def checksumIntegrityException = new DataIntegrityViolationException("checksum integrity exception",
                  new ConstraintViolationException('', new SQLException(sqlExceptionMessage), yangResourceChecksumDbConstraint))
 
-    def 'Store new schema set, retry mechanism'() {
+    def 'Store new schema set, maximum retries.'() {
         given: 'no pre-existing schemaset in database'
-            dataspaceRepositoryMock.getByName(_) >> new DataspaceEntity()
-            yangResourceRepositoryMock.findAllByChecksumIn(_) >> Collections.emptyList()
+            dataspaceRepository.getByName(_) >> new DataspaceEntity()
+            yangResourceRepository.findAllByChecksumIn(_) >> Collections.emptyList()
         when: 'a new schemaset is stored'
-            objectUnderTest.storeSchemaSet(DATASPACE_NAME, SCHEMA_SET_NAME_NEW, newYangResourcesNameToContentMap)
-        then: ' duplicated yang resource exception is thrown '
-            def e = thrown(DuplicatedYangResourceException)
+            objectUnderTest.storeSchemaSet('some dataspace', 'some new schema set', newYangResourcesNameToContentMap)
+        then: 'a duplicated yang resource exception is thrown '
+            thrown(DuplicatedYangResourceException)
         and: 'the system will attempt to save the data 5 times (because checksum integrity exception is thrown each time)'
-            5 * yangResourceRepositoryMock.saveAll(_) >> { throw checksumIntegrityException }
+            5 * yangResourceRepository.saveAll(_) >> { throw checksumIntegrityException }
+    }
+
+    def 'Store new schema set, succeed on third attempt.'() {
+        given: 'no pre-existing schemaset in database'
+            dataspaceRepository.getByName(_) >> new DataspaceEntity()
+            yangResourceRepository.findAllByChecksumIn(_) >> Collections.emptyList()
+        when: 'a new schemaset is stored'
+            objectUnderTest.storeSchemaSet('some dataspace', 'some new schema set', newYangResourcesNameToContentMap)
+        then: 'no exception is thrown '
+            noExceptionThrown()
+        and: 'the system will attempt to save the data 2 times with checksum integrity exception but then succeed'
+            2 * yangResourceRepository.saveAll(_) >> { throw checksumIntegrityException }
+            1 * yangResourceRepository.saveAll(_) >> []
     }
 
-    def 'Store schema set using modules, retry mechanism'() {
+    def 'Store schema set using modules, maximum retries.'() {
         given: 'map of new modules, a list of existing modules, module reference'
             def mapOfNewModules = [newModule1: 'module newmodule { yang-version 1.1; revision "2021-10-12" { } }']
             def moduleReferenceForExistingModule = new ModuleReference("test","2021-10-12")
             def listOfExistingModulesModuleReference = [moduleReferenceForExistingModule]
         and: 'no pre-existing schemaset in database'
-            dataspaceRepositoryMock.getByName(_) >> new DataspaceEntity()
-            yangResourceRepositoryMock.findAllByChecksumIn(_) >> Collections.emptyList()
+            dataspaceRepository.getByName(_) >> new DataspaceEntity()
+            yangResourceRepository.findAllByChecksumIn(_) >> Collections.emptyList()
         when: 'a new schemaset is stored from a module'
-            objectUnderTest.storeSchemaSetFromModules(DATASPACE_NAME, "newSchemaSetName" , mapOfNewModules, listOfExistingModulesModuleReference)
-        then: ' duplicated yang resource exception is thrown '
-            def e = thrown(DuplicatedYangResourceException)
+            objectUnderTest.storeSchemaSetFromModules('some dataspace', 'some new schema set' , mapOfNewModules, listOfExistingModulesModuleReference)
+        then: 'a duplicated yang resource exception is thrown '
+            thrown(DuplicatedYangResourceException)
         and: 'the system will attempt to save the data 5 times (because checksum integrity exception is thrown each time)'
-            5 * yangResourceRepositoryMock.saveAll(_) >> { throw checksumIntegrityException }
+            5 * yangResourceRepository.saveAll(_) >> { throw checksumIntegrityException }
+    }
+
+    def 'Store schema set using modules, succeed on third attempt.'() {
+        given: 'map of new modules, a list of existing modules, module reference'
+            def mapOfNewModules = [newModule1: 'module newmodule { yang-version 1.1; revision "2021-10-12" { } }']
+            def moduleReferenceForExistingModule = new ModuleReference("test","2021-10-12")
+            def listOfExistingModulesModuleReference = [moduleReferenceForExistingModule]
+        and: 'no pre-existing schemaset in database'
+            def dataspaceEntity = new DataspaceEntity()
+            dataspaceRepository.getByName(_) >> new DataspaceEntity()
+            yangResourceRepository.findAllByChecksumIn(_) >> Collections.emptyList()
+            yangResourceRepository.getResourceIdsByModuleReferences(_) >> []
+        and: 'can retrieve schemaset details after storing it'
+            def schemaSetEntity = new SchemaSetEntity()
+            schemaSetRepository.getByDataspaceAndName(dataspaceEntity, 'new schema set') >> schemaSetEntity
+        when: 'a new schemaset is stored from a module'
+            objectUnderTest.storeSchemaSetFromModules('some dataspace', 'new schema set' , mapOfNewModules, listOfExistingModulesModuleReference)
+        then: 'no exception is thrown '
+            noExceptionThrown()
+        and: 'the system will attempt to save the data 2 times with checksum integrity exception but then succeed'
+            2 * yangResourceRepository.saveAll(_) >> { throw checksumIntegrityException }
+            1 * yangResourceRepository.saveAll(_) >> []
     }
+
 }
diff --git a/cps-ri/src/test/groovy/org/onap/cps/spi/impl/CpsModulePersistenceServiceSpec.groovy b/cps-ri/src/test/groovy/org/onap/cps/spi/impl/CpsModulePersistenceServiceSpec.groovy
index 5e42ce04e..52651c6b1 100644
--- a/cps-ri/src/test/groovy/org/onap/cps/spi/impl/CpsModulePersistenceServiceSpec.groovy
+++ b/cps-ri/src/test/groovy/org/onap/cps/spi/impl/CpsModulePersistenceServiceSpec.groovy
@@ -1,7 +1,7 @@
 /*
  * ============LICENSE_START=======================================================
  * Copyright (c) 2021 Bell Canada.
- * Modifications Copyright (C) 2022 Nordix Foundation
+ * Modifications Copyright (C) 2022-2023 Nordix Foundation
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,6 @@ import org.onap.cps.spi.repository.ModuleReferenceRepository
 import org.onap.cps.spi.repository.SchemaSetRepository
 import org.onap.cps.spi.repository.YangResourceRepository
 import org.springframework.dao.DataIntegrityViolationException
-import spock.lang.Shared
 import spock.lang.Specification
 
 import java.sql.SQLException
@@ -38,17 +37,14 @@ import java.sql.SQLException
  */
 class CpsModulePersistenceServiceSpec extends Specification {
 
-    // Instance to test
     CpsModulePersistenceService objectUnderTest
 
-    // Mocks
     def dataspaceRepositoryMock = Mock(DataspaceRepository)
     def yangResourceRepositoryMock = Mock(YangResourceRepository)
     def schemaSetRepositoryMock = Mock(SchemaSetRepository)
     def cpsAdminPersistenceServiceMock = Mock(CpsAdminPersistenceService)
     def moduleReferenceRepositoryMock = Mock(ModuleReferenceRepository)
 
-    // Constants
     def yangResourceName = 'my-yang-resource-name'
     def yangResourceContent = 'module stores {\n' +
             '    yang-version 1.1;\n' +
@@ -62,17 +58,14 @@ class CpsModulePersistenceServiceSpec extends Specification {
             '    }' +
             '}'
 
-    // Scenario data
     static yangResourceChecksum = 'b13faef573ed1374139d02c40d8ce09c80ea1dc70e63e464c1ed61568d48d539'
     static yangResourceChecksumDbConstraint = 'yang_resource_checksum_key'
     static sqlExceptionMessage = String.format('(checksum)=(%s)', yangResourceChecksum)
-    static checksumIntegrityException =  new DataIntegrityViolationException(
-                    "checksum integrity exception",
+    static checksumIntegrityException =  new DataIntegrityViolationException('checksum integrity exception',
                     new ConstraintViolationException('', new SQLException(sqlExceptionMessage), yangResourceChecksumDbConstraint))
-    static checksumIntegrityExceptionWithoutChecksum =  new DataIntegrityViolationException(
-                    "checksum integrity exception",
+    static checksumIntegrityExceptionWithoutChecksum =  new DataIntegrityViolationException('checksum integrity exception',
                     new ConstraintViolationException('', new SQLException('no checksum'), yangResourceChecksumDbConstraint))
-    static anotherIntegrityException = new DataIntegrityViolationException("another integrity exception")
+    static otherIntegrityException = new DataIntegrityViolationException('another integrity exception')
 
     def setup() {
         objectUnderTest = new CpsModulePersistenceServiceImpl(yangResourceRepositoryMock, schemaSetRepositoryMock,
@@ -94,7 +87,7 @@ class CpsModulePersistenceServiceSpec extends Specification {
             scenario                            | dbException                               || expectedThrownException         | expectedThrownExceptionMessage
             'checksum data failure'             | checksumIntegrityException                || DuplicatedYangResourceException | yangResourceChecksum
             'checksum failure without checksum' | checksumIntegrityExceptionWithoutChecksum || DuplicatedYangResourceException | 'no checksum found'
-            'other data failure'                | anotherIntegrityException                 || DataIntegrityViolationException | 'another integrity exception'
+            'other data failure'                | otherIntegrityException                   || DataIntegrityViolationException | 'another integrity exception'
     }
 
 }
diff --git a/cps-ri/src/test/groovy/org/onap/cps/spi/impl/CpsPersistenceSpecBase.groovy b/cps-ri/src/test/groovy/org/onap/cps/spi/impl/CpsPersistenceSpecBase.groovy
deleted file mode 100644
index 34a040e60..000000000
--- a/cps-ri/src/test/groovy/org/onap/cps/spi/impl/CpsPersistenceSpecBase.groovy
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- *  ============LICENSE_START=======================================================
- *  Copyright (C) 2021-2022 Nordix Foundation
- *  Modifications Copyright (C) 2021 Pantheon.tech
- *  Modifications Copyright (C) 2021 Bell Canada.
- *  Modifications Copyright (C) 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
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an 'AS IS' BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- *  SPDX-License-Identifier: Apache-2.0
- *  ============LICENSE_END=========================================================
- */
-
-package org.onap.cps.spi.impl
-
-import com.fasterxml.jackson.databind.ObjectMapper
-import org.onap.cps.DatabaseTestContainer
-import org.onap.cps.spi.repository.AnchorRepository
-import org.onap.cps.spi.repository.DataspaceRepository
-import org.onap.cps.spi.repository.FragmentRepository
-import org.onap.cps.spi.repository.YangResourceRepository
-import org.onap.cps.utils.JsonObjectMapper
-import org.spockframework.spring.SpringBean
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.context.SpringBootTest
-import org.testcontainers.spock.Testcontainers
-import spock.lang.Shared
-import spock.lang.Specification
-
-@SpringBootTest
-@Testcontainers
-class CpsPersistenceSpecBase extends Specification {
-
-    @Shared
-    DatabaseTestContainer databaseTestContainer = DatabaseTestContainer.getInstance()
-
-    @Autowired
-    DataspaceRepository dataspaceRepository
-
-    @Autowired
-    YangResourceRepository yangResourceRepository
-
-    @Autowired
-    AnchorRepository anchorRepository
-
-    @Autowired
-    FragmentRepository fragmentRepository
-
-    @SpringBean
-    JsonObjectMapper jsonObjectMapper = new JsonObjectMapper(new ObjectMapper())
-
-    protected static final String CLEAR_DATA = '/data/clear-all.sql'
-
-    static def DATASPACE_NAME = 'DATASPACE-001'
-    static def SCHEMA_SET_NAME1 = 'SCHEMA-SET-001'
-    static def SCHEMA_SET_NAME2 = 'SCHEMA-SET-002'
-    static def ANCHOR_NAME1 = 'ANCHOR-001'
-    static def ANCHOR_NAME2 = 'ANCHOR-002'
-    static def ANCHOR_NAME3 = 'ANCHOR-003'
-    static def ANCHOR_FOR_DATA_NODES_WITH_LEAVES = 'ANCHOR-003'
-    static def ANCHOR_FOR_SHOP_EXAMPLE = 'ANCHOR-004'
-    static def ANCHOR_HAVING_SINGLE_TOP_LEVEL_FRAGMENT = 'ANCHOR-005'
-    static def ANCHOR_WITH_MULTIPLE_TOP_LEVEL_FRAGMENTS = 'ANCHOR-006'
-}
diff --git a/cps-ri/src/test/java/org/onap/cps/DatabaseTestContainer.java b/cps-ri/src/test/java/org/onap/cps/DatabaseTestContainer.java
deleted file mode 100755
index 61a5c042a..000000000
--- a/cps-ri/src/test/java/org/onap/cps/DatabaseTestContainer.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *  ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Pantheon.tech
- *  Modifications Copyright (C) 2022 Nordix Foundation.
- *  ================================================================================
- *  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
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- *  SPDX-License-Identifier: Apache-2.0
- *  ============LICENSE_END=========================================================
- */
-
-package org.onap.cps;
-
-import org.testcontainers.containers.PostgreSQLContainer;
-import org.testcontainers.utility.DockerImageName;
-
-/**
- * The Postgresql database test container wrapper.
- * Singleton implementation allows saving time on database initialization which otherwise would occur on each test.
- * for debugging/developing purposes you can suspend any test and connect to this database:
- *  docker exec -it {container-id} sh
- *  psql -d test -U test
- */
-public class DatabaseTestContainer extends PostgreSQLContainer<DatabaseTestContainer> {
-    private static final String IMAGE_VERSION = "registry.nordix.org/onaptest/postgres:14.1";
-    private static DatabaseTestContainer databaseTestContainer;
-
-    private DatabaseTestContainer() {
-        super(DockerImageName.parse(IMAGE_VERSION).asCompatibleSubstituteFor("postgres"));
-    }
-
-    /**
-     * Provides an instance of test container wrapper.
-     * The returned value expected to be assigned to static variable annotated with @ClassRule.
-     * This will allow to initialize DB connection env variables before DataSource object
-     * is initialized by Spring framework.
-     *
-     */
-    public static DatabaseTestContainer getInstance() {
-        if (databaseTestContainer == null) {
-            databaseTestContainer = new DatabaseTestContainer();
-            Runtime.getRuntime().addShutdownHook(new Thread(databaseTestContainer::terminate));
-        }
-        return databaseTestContainer;
-    }
-
-    @Override
-    public void start() {
-        super.start();
-        System.setProperty("DB_URL", databaseTestContainer.getJdbcUrl());
-        System.setProperty("DB_USERNAME", databaseTestContainer.getUsername());
-        System.setProperty("DB_PASSWORD", databaseTestContainer.getPassword());
-    }
-
-    @Override
-    public void stop() {
-        // do nothing on test completion, image removal will be performed via terminate() on JVM shutdown
-    }
-
-    private void terminate() {
-        super.stop();
-    }
-}
diff --git a/cps-ri/src/test/java/org/onap/cps/TestApplication.java b/cps-ri/src/test/java/org/onap/cps/TestApplication.java
deleted file mode 100644
index 075a241fc..000000000
--- a/cps-ri/src/test/java/org/onap/cps/TestApplication.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *  ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Pantheon.tech
- *  Modifications Copyright (C) 2021 Bell Canada.
- *  ================================================================================
- *  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
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- *  SPDX-License-Identifier: Apache-2.0
- *  ============LICENSE_END=========================================================
- */
-
-package org.onap.cps;
-
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.retry.annotation.EnableRetry;
-
-/**
- * The @SpringBootApplication annotated class is required in order to run tests
- * marked with @SpringBootTest annotation.
- */
-@SpringBootApplication(scanBasePackages = "org.onap.cps.spi")
-@EnableRetry
-public class TestApplication {
-}
diff --git a/cps-ri/src/test/resources/application.yml b/cps-ri/src/test/resources/application.yml
deleted file mode 100644
index 4f40aeaa0..000000000
--- a/cps-ri/src/test/resources/application.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-# ============LICENSE_START=======================================================
-# Copyright (C) 2021 Pantheon.tech
-# Modifications Copyright (C) 2022 Nordix Foundation.
-# ================================================================================
-# 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
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#  ============LICENSE_END=========================================================
-
-spring:
-  jpa:
-    ddl-auto: create
-    show-sql: false
-    properties:
-      hibernate:
-        enable_lazy_load_no_trans: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        format_sql: true
-        show_sql: false
-
-  datasource:
-    url: ${DB_URL}
-    username: ${DB_USERNAME}
-    password: ${DB_PASSWORD}
-    driverClassName: org.postgresql.Driver
-    initialization-mode: always
-
-  liquibase:
-    change-log: classpath:changelog/changelog-master.yaml
diff --git a/cps-ri/src/test/resources/data/anchor.sql b/cps-ri/src/test/resources/data/anchor.sql
deleted file mode 100644
index a15d5aed2..000000000
--- a/cps-ri/src/test/resources/data/anchor.sql
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-   ============LICENSE_START=======================================================
-    Copyright (C) 2020 Pantheon.tech
-    Modifications Copyright (C) 2020-2023 Nordix Foundation.
-    Modifications Copyright (C) 2021-2022 Bell Canada.
-   ================================================================================
-   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
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-   SPDX-License-Identifier: Apache-2.0
-   ============LICENSE_END=========================================================
-*/
-
-INSERT INTO DATASPACE (ID, NAME) VALUES
-    (1001, 'DATASPACE-001'),
-    (1002, 'DATASPACE-002-NO-DATA'),
-    (1003, 'DATASPACE-003');
-
-INSERT INTO SCHEMA_SET (ID, NAME, DATASPACE_ID) VALUES
-    (2001, 'SCHEMA-SET-001', 1001),
-    (2002, 'SCHEMA-SET-002', 1001),
-    (2003, 'SCHEMA-SET-002-NO-ANCHORS', 1003);
-
-INSERT INTO ANCHOR (ID, NAME, DATASPACE_ID, SCHEMA_SET_ID) VALUES
-    (3001, 'ANCHOR-001', 1001, 2001),
-    (3002, 'ANCHOR-002', 1001, 2002),
-    (3003, 'ANCHOR-003', 1001, 2002);
-
-INSERT INTO FRAGMENT (ID, ANCHOR_ID, PARENT_ID, XPATH, ATTRIBUTES) VALUES
-    (4001, 3001, null, '/xpath', '{}');
diff --git a/cps-ri/src/test/resources/data/anchors-schemaset-modules.sql b/cps-ri/src/test/resources/data/anchors-schemaset-modules.sql
deleted file mode 100644
index 65b3a48ca..000000000
--- a/cps-ri/src/test/resources/data/anchors-schemaset-modules.sql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-   ============LICENSE_START=======================================================
-    Copyright (C) 2021-2022 Nordix Foundation.
-   ================================================================================
-   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
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-   SPDX-License-Identifier: Apache-2.0
-   ============LICENSE_END=========================================================
-*/
-
-INSERT INTO DATASPACE (ID, NAME) VALUES
-    (1001, 'dataspace-1'), (1002, 'dataspace-2');
-
-INSERT INTO SCHEMA_SET (ID, NAME, DATASPACE_ID) VALUES
-    (2001, 'schema-set-1', 1001),
-    (2002, 'schema-set-2', 1001),
-    (2003, 'schema-set-3', 1001),
-    (2004, 'schema-set-4', 1002);
-
-INSERT INTO YANG_RESOURCE (ID, FILE_NAME, CONTENT, CHECKSUM, MODULE_NAME, REVISION) VALUES
-    (3001, 'module1@revA.yang', 'some-content', 'checksum1','module-name-1','revA'),
-    (3002, 'module2@revA.yang', 'some-content', 'checksum2','module-name-2','revA'),
-    (3003, 'module2@revB.yang', 'some-content', 'checksum3','module-name-2','revB'),
-    (3004, 'module3@revA.yang', 'some-content', 'checksum4','module-name-3','revA');
-
-INSERT INTO SCHEMA_SET_YANG_RESOURCES (SCHEMA_SET_ID, YANG_RESOURCE_ID) VALUES
-    (2001, 3001), --schema-set-1(anchor-1) has modules module1@revA, module2@revA
-    (2001, 3002),
-    (2002, 3001), --schema-set-2(anchor-2) has modules module1@revA, module2@revB
-    (2002, 3003),
-    (2003, 3002), --schema-set-3(anchor-3) has modules module2@revA, module2@revB
-    (2003, 3003),
-    (2004, 3001); --schema-set-4(anchor-4) has module module1@revA but in other dataspace
-
-INSERT INTO ANCHOR (ID, NAME, DATASPACE_ID, SCHEMA_SET_ID) VALUES
-    (6001, 'anchor-1', 1001, 2001),
-    (6002, 'anchor-2', 1001, 2002),
-    (6003, 'anchor-3', 1001, 2003),
-    (6005, 'anchor-4', 1002, 2004);
diff --git a/cps-ri/src/test/resources/data/clear-all.sql b/cps-ri/src/test/resources/data/clear-all.sql
deleted file mode 100644
index 07c8a7aab..000000000
--- a/cps-ri/src/test/resources/data/clear-all.sql
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-   ============LICENSE_START=======================================================
-    Copyright (C) 2020-2021 Pantheon.tech
-    Modifications Copyright (C) 2020,2022 Nordix Foundation.
-    Modifications Copyright (C) 2020 Bell Canada.
-   ================================================================================
-   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
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-   SPDX-License-Identifier: Apache-2.0
-   ============LICENSE_END=========================================================
-*/
-
-DELETE FROM FRAGMENT;
-DELETE FROM ANCHOR;
-DELETE FROM DATASPACE;
-DELETE FROM YANG_RESOURCE
--- following tables are cleared by CASCADE constraint: SCHEMA_SET, SCHEMA_SET_YANG_RESOURCES
-
diff --git a/cps-ri/src/test/resources/data/fragment.sql b/cps-ri/src/test/resources/data/fragment.sql
deleted file mode 100755
index 498007343..000000000
--- a/cps-ri/src/test/resources/data/fragment.sql
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-   ============LICENSE_START=======================================================
-    Copyright (C) 2021-2023 Nordix Foundation.
-    Modifications Copyright (C) 2021 Pantheon.tech
-    Modifications Copyright (C) 2021-2022 Bell Canada.
-   ================================================================================
-   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
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-   SPDX-License-Identifier: Apache-2.0
-   ============LICENSE_END=========================================================
-*/
-
-INSERT INTO DATASPACE (ID, NAME) VALUES
-    (1001, 'DATASPACE-001'),
-    (1002, 'NCMP-Admin');
-
-INSERT INTO SCHEMA_SET (ID, NAME, DATASPACE_ID) VALUES
-    (2001, 'SCHEMA-SET-001', 1001);
-
-INSERT INTO YANG_RESOURCE (ID, FILE_NAME, CONTENT, CHECKSUM, MODULE_NAME, REVISION) VALUES
-    (4001, 'TEST','', 'SAMPLECHECKSUM','TESTMODULENAME', 'SAMPLEREVISION');
-
-UPDATE YANG_RESOURCE SET
-content = 'module stores {
-               yang-version 1.1;
-               namespace "org:onap:ccsdk:sample";
-
-               prefix book-store;
-
-               revision "2020-09-15" {
-                   description
-                   "Sample Model";
-               }
-           }
-'
-where ID = 4001;
-
-INSERT INTO SCHEMA_SET_YANG_RESOURCES (SCHEMA_SET_ID, YANG_RESOURCE_ID) VALUES
-    (2001, 4001);
-
-INSERT INTO ANCHOR (ID, NAME, DATASPACE_ID, SCHEMA_SET_ID) VALUES
-    (3001, 'ANCHOR-001', 1001, 2001),
-    (3003, 'ANCHOR-003', 1001, 2001),
-    (3004, 'ncmp-dmi-registry', 1002, 2001),
-    (3005, 'ANCHOR-005', 1001, 2001),
-    (3006, 'ANCHOR-006', 1001, 2001);
-
-INSERT INTO FRAGMENT (ID, ANCHOR_ID, PARENT_ID, XPATH) VALUES
-    (4001, 3001, null, '/parent-1'),
-    (4002, 3001, null, '/parent-2'),
-    (4003, 3001, null, '/parent-3'),
-    (4004, 3001, 4001, '/parent-1/child-1'),
-    (4005, 3001, 4002, '/parent-2/child-2'),
-    (4006, 3001, 4004, '/parent-1/child-1/grandchild-1');
-
-INSERT INTO FRAGMENT (ID, ANCHOR_ID, PARENT_ID, XPATH, ATTRIBUTES) VALUES
-    (5009, 3005, null, '/parent-207', '{"parent-leaf": "parent-leaf value"}'),
-    (5010, 3005, 5009, '/parent-207/child-001', '{"first-child-leaf": "first-child-leaf value"}'),
-    (5011, 3005, 5009, '/parent-207/child-002', '{"second-child-leaf": "second-child-leaf value"}'),
-    (5012, 3005, 5011, '/parent-207/child-002/grand-child', '{"grand-child-leaf": "grand-child-leaf value"}');
-
-INSERT INTO FRAGMENT (ID, ANCHOR_ID, PARENT_ID, XPATH, ATTRIBUTES) VALUES
-    (5013, 3006, null, '/parent-208', '{"parent-leaf-1": "parent-leaf value-1"}'),
-    (5014, 3006, 5013, '/parent-208/child-001', '{"first-child-leaf": "first-child-leaf value"}'),
-    (5015, 3006, 5013, '/parent-208/child-002', '{"second-child-leaf": "second-child-leaf value"}'),
-    (5016, 3006, 5015, '/parent-208/child-002/grand-child', '{"grand-child-leaf": "grand-child-leaf value"}'),
-    (5017, 3006, null, '/parent-209', '{"parent-leaf-2": "parent-leaf value-2"}'),
-    (5018, 3006, 5017, '/parent-209/child-001', '{"first-child-leaf": "first-child-leaf value"}'),
-    (5019, 3006, 5017, '/parent-209/child-002', '{"second-child-leaf": "second-child-leaf value"}'),
-    (5020, 3006, 5019, '/parent-209/child-002/grand-child', '{"grand-child-leaf": "grand-child-leaf value"}');
-
-INSERT INTO FRAGMENT (ID, ANCHOR_ID, PARENT_ID, XPATH, ATTRIBUTES) VALUES
-    (4201, 3003, null, '/parent-200', '{"leaf-value": "original"}'),
-    (4202, 3003, 4201, '/parent-200/child-201', '{"leaf-value": "original"}'),
-    (4203, 3003, 4202, '/parent-200/child-201/grand-child', '{"leaf-value": "original"}'),
-    (4206, 3003, null, '/parent-201', '{"leaf-value": "original"}'),
-    (4207, 3003, 4206, '/parent-201/child-203', '{}'),
-    (4208, 3003, 4206, '/parent-201/child-204[@key=''A'']', '{"key": "A"}'),
-    (4209, 3003, 4206, '/parent-201/child-204[@key=''B'']', '{"key": "B"}'),
-    (4211, 3003, null, '/parent-202', '{"leaf-value": "original"}'),
-    (4212, 3003, 4211, '/parent-202/child-205[@key=''A'' and @key2=''B'']', '{"key": "A", "key2": "B"}'),
-    (4213, 3003, 4211, '/parent-202/child-206[@key=''A'']', '{"key": "A"}'),
-    (4214, 3003, null, '/parent-203', '{"leaf-value": "original"}'),
-    (4215, 3003, 4214, '/parent-203/child-203', '{}'),
-    (4216, 3003, 4214, '/parent-203/child-204[@key=''A'']', '{"key": "A"}'),
-    (4217, 3003, 4214, '/parent-203/child-204[@key=''B'']', '{"key": "B"}'),
-    (4218, 3003, 4217, '/parent-203/child-204[@key=''B'']/grand-child-204[@key2=''Y'']', '{"key": "B", "key2": "Y"}'),
-    (4226, 3003, null, '/parent-206', '{"leaf-value": "original"}'),
-    (4227, 3003, 4226, '/parent-206/child-206', '{}'),
-    (4228, 3003, 4227, '/parent-206/child-206/grand-child-206', '{}'),
-    (4229, 3003, 4227, '/parent-206/child-206/grand-child-206[@key=''A'']', '{"key": "A"}'),
-    (4230, 3003, 4227, '/parent-206/child-206/grand-child-206[@key=''X'']', '{"key": "X"}'),
-    (4231, 3003, null, '/parent-206[@key=''A'']', '{"key": "A"}'),
-    (4232, 3003, 4231, '/parent-206[@key=''A'']/child-206', '{}'),
-    (4233, 3003, null, '/parent-206[@key=''B'']', '{"key": "B"}');
-
-INSERT INTO FRAGMENT (ID, ANCHOR_ID, PARENT_ID, XPATH, ATTRIBUTES) VALUES
-    (5000, 3004, null, '/dmi-registry/cm-handles[@id=''PNFDemo'']', '{"id": "PNFDemo", "dmi-service-name": "http://172.21.235.14:8783", "dmi-data-service-name": "", "dmi-model-service-name": ""}'),
-    (5001, 3004, null, '/dmi-registry/cm-handles[@id=''PNFDemo2'']', '{"id": "PNFDemo2", "dmi-service-name": "http://172.26.46.68:8783", "dmi-data-service-name": "", "dmi-model-service-name": ""}'),
-    (5002, 3004, null, '/dmi-registry/cm-handles[@id=''PNFDemo3'']', '{"id": "PNFDemo3", "dmi-service-name": "http://172.26.46.68:8783", "dmi-data-service-name": "", "dmi-model-service-name": ""}'),
-    (5003, 3004, null, '/dmi-registry/cm-handles[@id=''PNFDemo4'']', '{"id": "PNFDemo4", "dmi-service-name": "http://172.26.46.68:8783", "dmi-data-service-name": "", "dmi-model-service-name": ""}'),
-    (5004, 3004, 5000, '/dmi-registry/cm-handles[@id=''PNFDemo'']/public-properties[@name=''Contact'']', '{"name": "Contact", "value": "newemailforstore@bookstore.com"}'),
-    (5005, 3004, 5001, '/dmi-registry/cm-handles[@id=''PNFDemo2'']/public-properties[@name=''Contact'']', '{"name": "Contact", "value": "newemailforstore@bookstore.com"}'),
-    (5006, 3004, 5002, '/dmi-registry/cm-handles[@id=''PNFDemo3'']/public-properties[@name=''Contact'']', '{"name": "Contact3", "value": "PNF3@bookstore.com"}'),
-    (5007, 3004, 5003, '/dmi-registry/cm-handles[@id=''PNFDemo4'']/public-properties[@name=''Contact'']', '{"name": "Contact", "value": "newemailforstore@bookstore.com"}'),
-    (5008, 3004, 5004, '/dmi-registry/cm-handles[@id=''PNFDemo4'']/public-properties[@name=''Contact2'']', '{"name": "Contact2", "value": "newemailforstore2@bookstore.com"}');
diff --git a/cps-ri/src/test/resources/data/perf-test.sql b/cps-ri/src/test/resources/data/perf-test.sql
deleted file mode 100644
index 48e8b1fbb..000000000
--- a/cps-ri/src/test/resources/data/perf-test.sql
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-   ============LICENSE_START=======================================================
-    Copyright (C) 2022-2023 Nordix Foundation.
-   ================================================================================
-   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
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-   SPDX-License-Identifier: Apache-2.0
-   ============LICENSE_END=========================================================
-*/
-
-INSERT INTO DATASPACE (ID, NAME) VALUES (9001, 'PERF-DATASPACE');
-
-INSERT INTO SCHEMA_SET (ID, NAME, DATASPACE_ID) VALUES  (9002, 'PERF-SCHEMA-SET', 9001);
-
-INSERT INTO ANCHOR (ID, NAME, DATASPACE_ID, SCHEMA_SET_ID) VALUES (9003, 'PERF-ANCHOR', 9001, 9002);
-
-INSERT INTO FRAGMENT (ID, ANCHOR_ID, PARENT_ID, XPATH) VALUES  (0, 9003, null, '/perf-parent-1');
-
diff --git a/cps-ri/src/test/resources/data/schemaset.sql b/cps-ri/src/test/resources/data/schemaset.sql
deleted file mode 100644
index e5bf63b70..000000000
--- a/cps-ri/src/test/resources/data/schemaset.sql
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-   ============LICENSE_START=======================================================
-    Copyright (C) 2020-2021 Pantheon.tech
-    Modifications Copyright (C) 2020-2023 Nordix Foundation.
-    Modifications Copyright (C) 2020-2021 Bell Canada.
-   ================================================================================
-   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
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-   SPDX-License-Identifier: Apache-2.0
-   ============LICENSE_END=========================================================
-*/
-
-INSERT INTO DATASPACE (ID, NAME) VALUES
-    (1001, 'DATASPACE-001'), (1002, 'DATASPACE-002');
-
-INSERT INTO SCHEMA_SET (ID, NAME, DATASPACE_ID) VALUES
-    (2001, 'SCHEMA-SET-001', 1001),
-    (2002, 'SCHEMA-SET-002', 1001),
-    (2100, 'SCHEMA-SET-100', 1001), -- for removal, not referenced by anchors
-    (2101, 'SCHEMA-SET-101', 1001), -- for removal, having anchor and data associated
-    (2003, 'SCHEMA-SET-003', 1002),
-    (2004, 'SCHEMA-SET-004', 1002),
-    (2005, 'SCHEMA-SET-005', 1001);
-
-INSERT INTO YANG_RESOURCE (ID, FILE_NAME, CONTENT, CHECKSUM, MODULE_NAME, REVISION) VALUES
-    (3001, 'module1@2020-02-02.yang', 'CONTENT-001', 'e8bdda931099310de66532e08c3fafec391db29f55c81927b168f6aa8f81b73b',null,null),
-    (3002, 'module2@2020-02-02.yang', 'CONTENT-002', '7e7d48afbe066ed0a890a09081859046d3dde52300dfcdb13be5b20780353a11','MODULE-NAME-002','REVISION-002'),
-    (3003, 'module3@2020-02-02.yang', 'CONTENT-003', 'ca20c45fec8547633f05ff8905c48ffa7b02b94ec3ad4ed79922e6ba40779df3','MODULE-NAME-003','REVISION-002'),
-    (3004, 'module4@2020-02-02.yang', 'CONTENT-004', 'f6ed09d343562e4d4ae5140f3c6a55df9c53f6da8e30dda8cbd9eaf9cd449be0','MODULE-NAME-004','REVISION-004'),
-    (3100, 'orphan@2020-02-02.yang', 'ORPHAN', 'checksum',null,null), -- for auto-removal as orphan
-    (3005, 'module5@2020-02-02.yang', 'CONTENT-005', 'checksum-005','MODULE-NAME-005','REVISION-002'),
-    (3006, 'module6@2020-02-02.yang', 'CONTENT-006', 'checksum-006','MODULE-NAME-006','REVISION-006');
-
-INSERT INTO SCHEMA_SET_YANG_RESOURCES (SCHEMA_SET_ID, YANG_RESOURCE_ID) VALUES
-    (2001, 3001), (2001, 3002),
-    (2002, 3003), (2005, 3004),
-    (2100, 3003), (2100, 3100), -- orphan removal case
-    (2101, 3003), (2101, 3004),
-    (2003, 3005), (2004, 3006);
-
-INSERT INTO ANCHOR (ID, NAME, DATASPACE_ID, SCHEMA_SET_ID) VALUES -- anchors for removal
-    (6001, 'ANCHOR1', 1001, 2101),
-    (6002, 'ANCHOR2', 1001, 2101),
-    (6003, 'ANCHOR3', 1001, 2005);
-
-INSERT INTO FRAGMENT (ID, XPATH, ANCHOR_ID) VALUES
-    (7001, '/XPATH', 6001);
diff --git a/cps-ri/src/test/resources/hibernate.cfg.xml b/cps-ri/src/test/resources/hibernate.cfg.xml
deleted file mode 100644
index fae9275dd..000000000
--- a/cps-ri/src/test/resources/hibernate.cfg.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!DOCTYPE hibernate-configuration PUBLIC

-        "-//Hibernate/Hibernate Configuration DTD 3.0//EN"

-        "http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">

-

-<hibernate-configuration>

-    <session-factory>

-        <property name="hibernate.connection.driver_class">org.postgresql.Driver</property>

-        <property name="hibernate.connection.url">${DB_URL}</property>

-        <property name="hibernate.connection.username">${DB_USERNAME}</property>

-        <property name="hibernate.connection.password">${DB_PASSWORD}</property>

-        <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQL82Dialect</property>

-        <property name="show_sql">true</property>

-        <property name="hibernate.hbm2ddl.auto">none</property>

-    </session-factory>

-</hibernate-configuration>
\ No newline at end of file
diff --git a/integration-test/src/test/groovy/org/onap/cps/integration/base/CpsIntegrationSpecBase.groovy b/integration-test/src/test/groovy/org/onap/cps/integration/base/CpsIntegrationSpecBase.groovy
index b942a43af..a1e03529c 100644
--- a/integration-test/src/test/groovy/org/onap/cps/integration/base/CpsIntegrationSpecBase.groovy
+++ b/integration-test/src/test/groovy/org/onap/cps/integration/base/CpsIntegrationSpecBase.groovy
@@ -25,10 +25,12 @@ import org.onap.cps.api.impl.CpsAdminServiceImpl
 import org.onap.cps.api.impl.CpsDataServiceImpl
 import org.onap.cps.api.impl.CpsModuleServiceImpl
 import org.onap.cps.integration.DatabaseTestContainer
+import org.onap.cps.spi.config.CpsSessionFactory
 import org.onap.cps.spi.exceptions.DataspaceNotFoundException
 import org.onap.cps.spi.model.DataNode
 import org.onap.cps.spi.repository.DataspaceRepository
 import org.onap.cps.spi.impl.utils.CpsValidatorImpl
+import org.onap.cps.spi.utils.SessionManager
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration
 import org.springframework.boot.autoconfigure.domain.EntityScan
@@ -42,12 +44,12 @@ import spock.lang.Specification
 
 import java.time.OffsetDateTime
 
-@SpringBootTest(classes = [TestConfig, CpsAdminServiceImpl, CpsValidatorImpl])
+@SpringBootTest(classes = [TestConfig, CpsAdminServiceImpl, CpsValidatorImpl, SessionManager, CpsSessionFactory])
 @Testcontainers
 @EnableAutoConfiguration
 @EnableJpaRepositories(basePackageClasses = [DataspaceRepository])
-@ComponentScan(basePackages = ["org.onap.cps.api", "org.onap.cps.spi.repository"])
-@EntityScan("org.onap.cps.spi.entities")
+@ComponentScan(basePackages = ['org.onap.cps.api', 'org.onap.cps.spi.repository'])
+@EntityScan('org.onap.cps.spi.entities')
 class CpsIntegrationSpecBase extends Specification {
 
     @Shared
@@ -69,6 +71,10 @@ class CpsIntegrationSpecBase extends Specification {
     @Lazy
     CpsQueryService cpsQueryService
 
+    @Autowired
+    @Lazy
+    SessionManager sessionManager
+
     def static GENERAL_TEST_DATASPACE = 'generalTestDataspace'
     def static BOOKSTORE_SCHEMA_SET = 'bookstoreSchemaSet'
 
diff --git a/integration-test/src/test/groovy/org/onap/cps/integration/base/TestConfig.groovy b/integration-test/src/test/groovy/org/onap/cps/integration/base/TestConfig.groovy
index 18a294161..e39e11440 100644
--- a/integration-test/src/test/groovy/org/onap/cps/integration/base/TestConfig.groovy
+++ b/integration-test/src/test/groovy/org/onap/cps/integration/base/TestConfig.groovy
@@ -34,6 +34,7 @@ import org.onap.cps.spi.repository.ModuleReferenceRepository
 import org.onap.cps.spi.repository.SchemaSetRepository
 import org.onap.cps.spi.repository.YangResourceRepository
 import org.onap.cps.spi.utils.SessionManager
+import org.onap.cps.spi.utils.TimeLimiterProvider
 import org.onap.cps.utils.JsonObjectMapper
 import org.onap.cps.utils.TimedYangParser
 import org.onap.cps.yang.TimedYangTextSchemaSourceSetBuilder
@@ -75,7 +76,7 @@ class TestConfig extends Specification{
 
     @Autowired
     @Lazy
-    SessionManager stubbedSessionManager
+    SessionManager sessionManager
 
     @Bean
     CpsAdminPersistenceServiceImpl cpsAdminPersistenceService() {
@@ -84,7 +85,7 @@ class TestConfig extends Specification{
 
     @Bean
     CpsDataPersistenceService cpsDataPersistenceService() {
-        return (CpsDataPersistenceService) new CpsDataPersistenceServiceImpl(dataspaceRepository, anchorRepository, fragmentRepository, jsonObjectMapper, stubbedSessionManager)
+        return (CpsDataPersistenceService) new CpsDataPersistenceServiceImpl(dataspaceRepository, anchorRepository, fragmentRepository, jsonObjectMapper, sessionManager)
     }
 
     @Bean
@@ -103,11 +104,6 @@ class TestConfig extends Specification{
     }
 
     @Bean
-    SessionManager sessionManager() {
-        return Stub(SessionManager)
-    }
-
-    @Bean
     TimedYangParser timedYangParser() {
         return new TimedYangParser()
     }
@@ -117,4 +113,9 @@ class TestConfig extends Specification{
         return new TimedYangTextSchemaSourceSetBuilder()
     }
 
+    @Bean
+    TimeLimiterProvider timeLimiterProvider() {
+        return new TimeLimiterProvider()
+    }
+
 }
diff --git a/cps-ri/src/test/groovy/org/onap/cps/spi/utils/SessionManagerIntegrationSpec.groovy b/integration-test/src/test/groovy/org/onap/cps/integration/functional/SessionManagerIntegrationSpec.groovy
index ceb9dd4cf..e0a2602b2 100644
--- a/cps-ri/src/test/groovy/org/onap/cps/spi/utils/SessionManagerIntegrationSpec.groovy
+++ b/integration-test/src/test/groovy/org/onap/cps/integration/functional/SessionManagerIntegrationSpec.groovy
@@ -1,6 +1,6 @@
 /*
  *  ============LICENSE_START=======================================================
- *  Copyright (C) 2022 Nordix Foundation
+ *  Copyright (C) 2022-2023 Nordix Foundation
  *  ================================================================================
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -18,28 +18,21 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.utils
+package org.onap.cps.integration.functional
 
-import org.onap.cps.spi.config.CpsSessionFactory
+import org.onap.cps.integration.base.FunctionalSpecBase
 import org.onap.cps.spi.exceptions.SessionManagerException
-import org.onap.cps.spi.impl.CpsPersistenceSpecBase
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.test.context.jdbc.Sql
+import org.onap.cps.spi.utils.SessionManager
 
-class SessionManagerIntegrationSpec extends CpsPersistenceSpecBase{
+class SessionManagerIntegrationSpec extends FunctionalSpecBase {
 
-    final static String SET_DATA = '/data/anchor.sql'
-
-    @Autowired
     SessionManager objectUnderTest
 
-    @Autowired
-    CpsSessionFactory cpsSessionFactory
-
-    def sessionId
     def shortTimeoutForTesting = 300L
+    def sessionId
 
-    def setup(){
+    def setup() {
+        objectUnderTest = sessionManager
         sessionId = objectUnderTest.startSession()
     }
 
@@ -47,35 +40,32 @@ class SessionManagerIntegrationSpec extends CpsPersistenceSpecBase{
         objectUnderTest.closeSession(sessionId, objectUnderTest.WITH_COMMIT)
     }
 
-    @Sql([CLEAR_DATA, SET_DATA])
     def 'Lock anchor.'(){
         when: 'session tries to acquire anchor lock by passing anchor entity details'
-            objectUnderTest.lockAnchor(sessionId, DATASPACE_NAME, ANCHOR_NAME1, shortTimeoutForTesting)
+            objectUnderTest.lockAnchor(sessionId, FUNCTIONAL_TEST_DATASPACE_1, BOOKSTORE_ANCHOR_1, shortTimeoutForTesting)
         then: 'no exception is thrown'
             noExceptionThrown()
     }
 
-    @Sql([CLEAR_DATA, SET_DATA])
     def 'Attempt to lock anchor when another session is holding the lock.'(){
         given: 'another session that holds an anchor lock'
             def otherSessionId = objectUnderTest.startSession()
-            objectUnderTest.lockAnchor(otherSessionId,DATASPACE_NAME,ANCHOR_NAME1,shortTimeoutForTesting)
+            objectUnderTest.lockAnchor(otherSessionId,FUNCTIONAL_TEST_DATASPACE_1,BOOKSTORE_ANCHOR_1,shortTimeoutForTesting)
         when: 'a session tries to acquire the same anchor lock'
-            objectUnderTest.lockAnchor(sessionId,DATASPACE_NAME,ANCHOR_NAME1,shortTimeoutForTesting)
+            objectUnderTest.lockAnchor(sessionId,FUNCTIONAL_TEST_DATASPACE_1,BOOKSTORE_ANCHOR_1,shortTimeoutForTesting)
         then: 'a session manager exception is thrown specifying operation reached timeout'
             def thrown = thrown(SessionManagerException)
             thrown.message.contains('Timeout')
         then: 'when the other session holding the lock is closed, lock can finally be acquired'
             objectUnderTest.closeSession(otherSessionId, objectUnderTest.WITH_COMMIT)
-            objectUnderTest.lockAnchor(sessionId,DATASPACE_NAME,ANCHOR_NAME1,shortTimeoutForTesting)
+            objectUnderTest.lockAnchor(sessionId,FUNCTIONAL_TEST_DATASPACE_1,BOOKSTORE_ANCHOR_1,shortTimeoutForTesting)
     }
 
-    @Sql([CLEAR_DATA, SET_DATA])
     def 'Lock anchor twice using the same session.'(){
         given: 'session that already holds an anchor lock'
-            objectUnderTest.lockAnchor(sessionId, DATASPACE_NAME, ANCHOR_NAME1, shortTimeoutForTesting)
+            objectUnderTest.lockAnchor(sessionId, FUNCTIONAL_TEST_DATASPACE_1, BOOKSTORE_ANCHOR_1, shortTimeoutForTesting)
         when: 'same session tries to acquire same anchor lock'
-            objectUnderTest.lockAnchor(sessionId, DATASPACE_NAME, ANCHOR_NAME1, shortTimeoutForTesting)
+            objectUnderTest.lockAnchor(sessionId, FUNCTIONAL_TEST_DATASPACE_1, BOOKSTORE_ANCHOR_1, shortTimeoutForTesting)
         then: 'no exception is thrown'
             noExceptionThrown()
     }