From 7737d7203349209323b237da7800ec5a3b98cb57 Mon Sep 17 00:00:00 2001 From: kissand Date: Thu, 28 Apr 2022 10:20:39 +0200 Subject: Fix sonar code smells * Increase code coverage https://sonarcloud.io/component_measures?metric=uncovered_conditions&id=onap_cps Issue-ID: CPS-475 Change-Id: I124bad6c01acbcb9658f52eb68079628e074168e Signed-off-by: kissand --- .../cps/utils/YangTextSchemaSourceSetSpec.groovy | 61 --------------------- .../yang/YangTextSchemaSourceSetBuilderSpec.groovy | 63 ++++++++++++++++++++++ 2 files changed, 63 insertions(+), 61 deletions(-) delete mode 100644 cps-service/src/test/groovy/org/onap/cps/utils/YangTextSchemaSourceSetSpec.groovy create mode 100644 cps-service/src/test/groovy/org/onap/cps/yang/YangTextSchemaSourceSetBuilderSpec.groovy (limited to 'cps-service') 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 deleted file mode 100644 index b6250612e..000000000 --- a/cps-service/src/test/groovy/org/onap/cps/utils/YangTextSchemaSourceSetSpec.groovy +++ /dev/null @@ -1,61 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * Copyright (C) 2020-2021 Pantheon.tech - * Modifications Copyright (C) 2020-2021 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * SPDX-License-Identifier: Apache-2.0 - * ============LICENSE_END========================================================= - */ - -package org.onap.cps.utils - -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 spock.lang.Specification - -class YangTextSchemaSourceSetSpec extends Specification { - - def 'Building a valid YangTextSchemaSourceSet using #filenameCase filename.'() { - given: 'a yang model (file)' - 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' - } - - def 'Building YangTextSchemaSourceSet error case: #description.'() { - given: 'a file with #description' - def yangResourceNameToContent = TestUtils.getYangResourcesAsMap(filename) - when: 'the content is parsed' - YangTextSchemaSourceSetBuilder.of(yangResourceNameToContent) - then: 'an exception is thrown' - thrown(expectedException) - where: 'the following parameters are used' - filename | description || expectedException - 'invalid.yang' | 'invalid content' || ModelValidationException - 'invalid-empty.yang' | 'no valid content' || ModelValidationException - 'invalid-missing-import.yang' | 'no dependency module' || ModelValidationException - } -} diff --git a/cps-service/src/test/groovy/org/onap/cps/yang/YangTextSchemaSourceSetBuilderSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/yang/YangTextSchemaSourceSetBuilderSpec.groovy new file mode 100644 index 000000000..236221aca --- /dev/null +++ b/cps-service/src/test/groovy/org/onap/cps/yang/YangTextSchemaSourceSetBuilderSpec.groovy @@ -0,0 +1,63 @@ +/* + * ============LICENSE_START======================================================= + * Copyright (C) 2020-2021 Pantheon.tech + * Modifications Copyright (C) 2020-2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.cps.yang + + +import org.onap.cps.TestUtils +import org.onap.cps.spi.exceptions.ModelValidationException +import org.opendaylight.yangtools.yang.common.Revision +import spock.lang.Specification + +class YangTextSchemaSourceSetBuilderSpec extends Specification { + + def 'Building a valid YangTextSchemaSourceSet using #filenameCase filename.'() { + given: 'a yang model (file)' + def yangResourceNameToContent = [filename: TestUtils.getResourceFileContent('bookstore.yang')] + when: 'the content is parsed' + def result = YangTextSchemaSourceSetBuilder.of(yangResourceNameToContent).getSchemaContext() + then: 'it can be validated successfully' + YangTextSchemaSourceSetBuilder.validate(yangResourceNameToContent) + and: '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' + } + + def 'Building YangTextSchemaSourceSet error case: #description.'() { + given: 'a file with #description' + def yangResourceNameToContent = TestUtils.getYangResourcesAsMap(filename) + when: 'the content is parsed' + YangTextSchemaSourceSetBuilder.of(yangResourceNameToContent) + then: 'an exception is thrown' + thrown(expectedException) + where: 'the following parameters are used' + filename | description || expectedException + 'invalid.yang' | 'invalid content' || ModelValidationException + 'invalid-empty.yang' | 'no valid content' || ModelValidationException + 'invalid-missing-import.yang' | 'no dependency module' || ModelValidationException + } +} -- cgit 1.2.3-korg