diff options
Diffstat (limited to 'cps-service/src')
| -rw-r--r-- | cps-service/src/test/groovy/org/onap/cps/api/impl/CpsModuleServiceImplSpec.groovy | 19 | ||||
| -rw-r--r-- | cps-service/src/test/groovy/org/onap/cps/utils/YangTextSchemaSourceSetSpec.groovy | 3 |
2 files changed, 10 insertions, 12 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 d20149bc4..0af0334d5 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,8 +21,6 @@ package org.onap.cps.api.impl import org.onap.cps.TestUtils -import org.onap.cps.api.CpsAdminService -import org.onap.cps.spi.CpsDataPersistenceService import org.onap.cps.spi.CpsModulePersistenceService import org.onap.cps.spi.exceptions.ModelValidationException import org.onap.cps.spi.model.ModuleReference @@ -30,8 +28,8 @@ 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.annotation.EnableCaching import org.springframework.cache.caffeine.CaffeineCacheManager -import org.springframework.context.annotation.ComponentScan import org.springframework.test.context.ContextConfiguration import spock.lang.Specification @@ -39,19 +37,18 @@ 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) +@EnableCaching +@ContextConfiguration(classes = [YangTextSchemaSourceSetCache.class, CpsModuleServiceImpl.class]) class CpsModuleServiceImplSpec extends Specification { + @SpringBean CpsModulePersistenceService mockModuleStoreService = Mock() + @SpringBean - CpsAdminService mockCpsAdminService = Mock() - @SpringBean - CpsDataPersistenceService mockDataPersistenceService = Mock() + CacheManager cacheManager = new CaffeineCacheManager("yangSchema") + @Autowired - CpsModuleServiceImpl objectUnderTest = new CpsModuleServiceImpl() - @SpringBean - CacheManager cacheManager = new CaffeineCacheManager("yangSchema"); + CpsModuleServiceImpl objectUnderTest def 'Create schema set'() { given: 'Valid yang resource as name-to-content map' diff --git a/cps-service/src/test/groovy/org/onap/cps/utils/YangTextSchemaSourceSetSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/utils/YangTextSchemaSourceSetSpec.groovy index e58f44212..be5610cb3 100644 --- a/cps-service/src/test/groovy/org/onap/cps/utils/YangTextSchemaSourceSetSpec.groovy +++ b/cps-service/src/test/groovy/org/onap/cps/utils/YangTextSchemaSourceSetSpec.groovy @@ -1,6 +1,7 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2020 Nordix Foundation + * 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. @@ -31,7 +32,7 @@ class YangTextSchemaSourceSetSpec extends Specification { given: 'a yang model (file)' def yangResourceNameToContent = [filename: TestUtils.getResourceFileContent('bookstore.yang')] when: 'the content is parsed' - def result = YangTextSchemaSourceSetBuilder.of(yangResourceNameToContent).getSchemaContext(); + def result = YangTextSchemaSourceSetBuilder.of(yangResourceNameToContent).getSchemaContext() then: 'the result contains 1 module of the correct name and revision' result.modules.size() == 1 def optionalModule = result.findModule('stores', Revision.of('2020-09-15')) |