2 files changed, 33 insertions, 9 deletions

diff --git a/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsModuleServiceImplSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsModuleServiceImplSpec.groovy
index f380d106c7..5f2168aeb9 100644
--- a/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsModuleServiceImplSpec.groovy
+++ b/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsModuleServiceImplSpec.groovy
@@ -21,23 +21,35 @@
 package org.onap.cps.api.impl
 
 import org.onap.cps.TestUtils
-import org.onap.cps.spi.CascadeDeleteAllowed
-import org.onap.cps.spi.CpsModulePersistenceService;
+import org.onap.cps.api.CpsAdminService
+import org.onap.cps.spi.CpsModulePersistenceService
 import org.onap.cps.spi.exceptions.ModelValidationException
 import org.onap.cps.spi.model.ModuleReference
+import org.spockframework.spring.SpringBean
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.cache.CacheManager
+import org.springframework.cache.caffeine.CaffeineCacheManager
+import org.springframework.context.annotation.ComponentScan
+import org.springframework.test.context.ContextConfiguration
 import spock.lang.Specification
 import spock.lang.Unroll
 
 import static org.onap.cps.spi.CascadeDeleteAllowed.CASCADE_DELETE_ALLOWED
 import static org.onap.cps.spi.CascadeDeleteAllowed.CASCADE_DELETE_PROHIBITED
 
+@SpringBootTest
+@ComponentScan("org.onap.cps")
+@ContextConfiguration(classes = CpsModuleServiceImplSpec.class)
 class CpsModuleServiceImplSpec extends Specification {
-    def mockModuleStoreService = Mock(CpsModulePersistenceService)
-    def objectUnderTest = new CpsModuleServiceImpl()
-
-    def setup() {
-        objectUnderTest.cpsModulePersistenceService = mockModuleStoreService
-    }
+    @SpringBean
+    CpsModulePersistenceService mockModuleStoreService = Mock()
+    @SpringBean
+    CpsAdminService mockCpsAdminService = Mock()
+    @Autowired
+    CpsModuleServiceImpl objectUnderTest = new CpsModuleServiceImpl()
+    @SpringBean
+    CacheManager cacheManager = new CaffeineCacheManager("yangSchema");
 
     def 'Create schema set'() {
         given: 'Valid yang resource as name-to-content map'
@@ -69,6 +81,17 @@ class CpsModuleServiceImplSpec extends Specification {
             result.getModuleReferences().contains(new ModuleReference('stores', 'org:onap:ccsdk:sample', '2020-09-15'))
     }
 
+    def 'Schema set caching.'() {
+        given: 'an  schema set'
+            def yangResourcesNameToContentMap = TestUtils.getYangResourcesAsMap('bookstore.yang')
+        when: 'get schema set method is invoked twice'
+            2.times {
+                objectUnderTest.getSchemaSet('someDataspace', 'someSchemaSet')
+            }
+        then: 'the persistency service called only once'
+            1 * mockModuleStoreService.getYangSchemaResources('someDataspace', 'someSchemaSet') >> yangResourcesNameToContentMap
+    }
+
     @Unroll
     def 'Delete set by name and dataspace with #cascadeDeleteOption.'(){
         when: 'schema set deletion is requested'
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 22dc39ad90..d6751bb4e2 100755
--- 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
@@ -24,13 +24,14 @@ import org.onap.cps.TestUtils
 import org.onap.cps.spi.CpsModulePersistenceService

 import spock.lang.Specification

 

-

 class E2ENetworkSliceSpec extends Specification {

     def mockModuleStoreService = Mock(CpsModulePersistenceService)

+    def mockYangTextSchemaSourceSetCache = Mock(YangTextSchemaSourceSetCache)

     def objectUnderTest = new CpsModuleServiceImpl()

 

     def setup() {

         objectUnderTest.cpsModulePersistenceService = mockModuleStoreService

+        objectUnderTest.yangTextSchemaSourceSetCache = mockYangTextSchemaSourceSetCache

     }

 

     def 'E2E model can be parsed by CPS.'() {