From d2f49e50a098695bef48e070dab251b86e80a0a0 Mon Sep 17 00:00:00 2001 From: Ruslan Kashapov Date: Thu, 11 Feb 2021 13:36:30 +0200 Subject: Fix yang resource parse failure if filename matches IETF recommended format Issue-ID: CPS-237 Change-Id: I9a8f95552b9814f02886d1b5074aa6e7a09f582d Signed-off-by: Ruslan Kashapov --- .../org/onap/cps/utils/YangTextSchemaSourceSetSpec.groovy | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'cps-service/src/test/groovy/org/onap') 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 9a19def89c..f7efd5dffd 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 @@ -23,25 +23,29 @@ import org.onap.cps.TestUtils import org.onap.cps.spi.exceptions.ModelValidationException import org.onap.cps.yang.YangTextSchemaSourceSetBuilder import org.opendaylight.yangtools.yang.common.Revision -import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException import spock.lang.Specification import spock.lang.Unroll class YangTextSchemaSourceSetSpec extends Specification { - def 'Generating a valid YangTextSchemaSource Set '() { + @Unroll + def 'Building a valid YangTextSchemaSourceSet using #filenameCase filename.'() { given: 'a yang model (file)' - def yangResourceNameToContent = TestUtils.getYangResourcesAsMap('bookstore.yang') + def yangResourceNameToContent = [filename: TestUtils.getResourceFileContent('bookstore.yang')] when: 'the content is parsed' 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')) optionalModule.isPresent() + where: + filenameCase | filename + 'generic' | 'bookstore' + 'RFC-6020 recommended' | 'bookstore-test@2020-09-15.YANG' } @Unroll - def 'Generating invalid YangTextSchemaSource Set (#description).'() { + def 'Building YangTextSchemaSourceSet error case: #description.'() { given: 'a file with #description' def yangResourceNameToContent = TestUtils.getYangResourcesAsMap(filename) when: 'the content is parsed' -- cgit 1.2.3-korg