Investigate and update Spock version

[cps.git] / cps-ri / src / test / groovy / org / onap / cps / spi / impl / CpsModulePersistenceServiceSpec.groovy

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 b0c13af..f08aa03 100644 (file)
--- 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
@@ -25,14 +25,13 @@ import org.onap.cps.spi.CpsAdminPersistenceService
 import org.onap.cps.spi.CpsModulePersistenceService
 import org.onap.cps.spi.entities.YangResourceEntity
 import org.onap.cps.spi.exceptions.DataspaceNotFoundException
-import org.onap.cps.spi.exceptions.SchemaSetAlreadyDefinedException
+import org.onap.cps.spi.exceptions.AlreadyDefinedException
 import org.onap.cps.spi.exceptions.SchemaSetInUseException
 import org.onap.cps.spi.exceptions.SchemaSetNotFoundException
 import org.onap.cps.spi.repository.AnchorRepository
 import org.onap.cps.spi.repository.SchemaSetRepository
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.test.context.jdbc.Sql
-import spock.lang.Unroll
 
 class CpsModulePersistenceServiceSpec extends CpsPersistenceSpecBase {
 
@@ -57,7 +56,7 @@ class CpsModulePersistenceServiceSpec extends CpsPersistenceSpecBase {
     static final Long NEW_RESOURCE_ABSTRACT_ID = 0L
     static final String NEW_RESOURCE_NAME = 'some new resource'
     static final String NEW_RESOURCE_CONTENT = 'some resource content'
-    static final String NEW_RESOURCE_CHECKSUM = '8185b09f11e262f18043f0ea08803f46'
+    static final String NEW_RESOURCE_CHECKSUM = '09002da02ee2683898d2c81c67f9e22cdbf8577d8c2de16c84d724e4ae44a0a6'
 
     def newYangResourcesNameToContentMap = [(NEW_RESOURCE_NAME):NEW_RESOURCE_CONTENT]
     def dataspaceEntity
@@ -66,7 +65,6 @@ class CpsModulePersistenceServiceSpec extends CpsPersistenceSpecBase {
         dataspaceEntity = dataspaceRepository.getByName(DATASPACE_NAME)
     }
 
-    @Unroll
     @Sql([CLEAR_DATA, SET_DATA])
     def 'Store schema set error scenario: #scenario.'() {
         when: 'attempt to store schema set #schemaSetName in dataspace #dataspaceName'
@@ -76,7 +74,7 @@ class CpsModulePersistenceServiceSpec extends CpsPersistenceSpecBase {
         where: 'the following data is used'
             scenario                    | dataspaceName  | schemaSetName            || expectedException
             'dataspace does not exist'  | 'unknown'      | 'not-relevant'           || DataspaceNotFoundException
-            'schema set already exists' | DATASPACE_NAME | EXISTING_SCHEMA_SET_NAME || SchemaSetAlreadyDefinedException
+            'schema set already exists' | DATASPACE_NAME | EXISTING_SCHEMA_SET_NAME || AlreadyDefinedException
     }
 
     @Sql([CLEAR_DATA, SET_DATA])
@@ -110,7 +108,7 @@ class CpsModulePersistenceServiceSpec extends CpsPersistenceSpecBase {
         then: 'the schema persisted (re)uses the existing id, name and has the same checksum'
             def existingResourceId = 3001L
             def existingResourceName = 'module1@2020-02-02.yang'
-            def existingResourceChecksum = '877e65a9f36d54e7702c3f073f6bc42b'
+            def existingResourceChecksum = 'e8bdda931099310de66532e08c3fafec391db29f55c81927b168f6aa8f81b73b'
             assertSchemaSetPersisted(DATASPACE_NAME, SCHEMA_SET_NAME_NEW,
                     existingResourceId, existingResourceName, existingResourceContent, existingResourceChecksum)
     }
@@ -149,7 +147,6 @@ class CpsModulePersistenceServiceSpec extends CpsPersistenceSpecBase {
             sharedResourceIds.each {yangResourceRepository.findById(it).isPresent() }
     }
 
-    @Unroll
     @Sql([CLEAR_DATA, SET_DATA])
     def 'Delete schema set error scenario: #scenario.'() {
         when: 'attempt to delete a schema set where #scenario'