From: Toine Siebelink <toine.siebelink@est.tech>
Date: Wed, 6 Mar 2024 14:36:40 +0000 (+0000)
Subject: Merge "Test of retry of failed module sync"
X-Git-Tag: 3.4.7~20
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=cps.git;a=commitdiff_plain;h=b4b2b568b37aabba4b7a71dcafeeb48144a315d4

Merge "Test of retry of failed module sync"
---

b4b2b568b37aabba4b7a71dcafeeb48144a315d4
diff --cc integration-test/src/test/groovy/org/onap/cps/integration/base/CpsIntegrationSpecBase.groovy
index 1577524f2,21e225e0b..33945a6c2
--- 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
@@@ -55,13 -53,17 +55,18 @@@ import spock.lang.Share
  import spock.lang.Specification
  import spock.util.concurrent.PollingConditions
  
+ import java.time.format.DateTimeFormatter
+ 
  import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo
  import static org.springframework.test.web.client.response.MockRestResponseCreators.withStatus
+ import static org.onap.cps.ncmp.api.impl.ncmppersistence.NcmpPersistence.NCMP_DATASPACE_NAME;
+ import static org.onap.cps.ncmp.api.impl.ncmppersistence.NcmpPersistence.NCMP_DMI_REGISTRY_ANCHOR;
+ import static org.onap.cps.ncmp.api.impl.ncmppersistence.NcmpPersistence.NCMP_DMI_REGISTRY_PARENT;
  
 -@SpringBootTest(classes = [CpsDataspaceService])
 +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.MOCK, classes = [CpsDataspaceService])
  @Testcontainers
  @EnableAutoConfiguration
 +@AutoConfigureMockMvc
  @EnableJpaRepositories(basePackageClasses = [DataspaceRepository])
  @ComponentScan(basePackages = ['org.onap.cps'])
  @EntityScan('org.onap.cps.spi.entities')