summaryrefslogtreecommitdiffstats
path: root/cps-service/src/test
diff options
context:
space:
mode:
authorleventecsanyi <levente.csanyi@est.tech>2022-10-26 10:44:08 +0200
committerleventecsanyi <levente.csanyi@est.tech>2022-12-01 21:32:44 +0100
commit37d72855721caa646144ad323fe51ae78af15507 (patch)
tree0d4494c83572f779aded34a7de3b03774c19873c /cps-service/src/test
parent94d77dd3430bf504b1fe1209760cfeedb47752a7 (diff)
Filter on private properties of CM Handles
- Moved cm handle query validation to cps-ncmp-service (where it belongs!) - Added new enum type for private/public field types - Created new methods for private and public queries - Added new REST endpoint - Created service methods for filtering on different types of properties - Refactored getPublicPropertyPairs and queryCmHandleAnyProperties - Added unit test for the controller layer - Fixed refactoring suggestions - Imporved code coverage with unit tests - Refactoring - Added new functionality to NcmpRestInputMapper - Updated version number to 3.2.1-SNAPSHOT and updated release-notes.rst Issue-ID: CPS-1236 Change-Id: I0ddf6866473f7c3c6b8507d222d441bf97ca6bdc Signed-off-by: leventecsanyi <levente.csanyi@est.tech>
Diffstat (limited to 'cps-service/src/test')
-rw-r--r--cps-service/src/test/groovy/org/onap/cps/utils/CmHandleQueryRestParametersValidatorSpec.groovy121
1 files changed, 0 insertions, 121 deletions
diff --git a/cps-service/src/test/groovy/org/onap/cps/utils/CmHandleQueryRestParametersValidatorSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/utils/CmHandleQueryRestParametersValidatorSpec.groovy
deleted file mode 100644
index c40ffa9a35..0000000000
--- a/cps-service/src/test/groovy/org/onap/cps/utils/CmHandleQueryRestParametersValidatorSpec.groovy
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * Copyright (C) 2022 Nordix Foundation
- * ================================================================================
- * 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.spi.exceptions.DataValidationException
-import org.onap.cps.spi.model.CmHandleQueryServiceParameters
-import org.onap.cps.spi.model.ConditionProperties
-import spock.lang.Specification
-
-class CmHandleQueryRestParametersValidatorSpec extends Specification {
- def 'CM Handle Query validation: empty query.'() {
- given: 'a cm handle query'
- def cmHandleQueryParameters = new CmHandleQueryServiceParameters()
- when: 'validator is invoked'
- CmHandleQueryRestParametersValidator.validateCmHandleQueryParameters(cmHandleQueryParameters)
- then: 'data validation exception is not thrown'
- noExceptionThrown()
- }
-
- def 'CM Handle Query validation: normal query.'() {
- given: 'a cm handle query'
- def cmHandleQueryParameters = new CmHandleQueryServiceParameters()
- def condition = new ConditionProperties()
- condition.conditionName = 'hasAllProperties'
- condition.conditionParameters = [[key1:'value1'],[key2:'value2']]
- cmHandleQueryParameters.cmHandleQueryParameters = [condition]
- when: 'validator is invoked'
- CmHandleQueryRestParametersValidator.validateCmHandleQueryParameters(cmHandleQueryParameters)
- then: 'data validation exception is not thrown'
- noExceptionThrown()
- }
-
- def 'CM Handle Query validation: #scenario.'() {
- given: 'a cm handle query'
- def cmHandleQueryParameters = new CmHandleQueryServiceParameters()
- def condition = new ConditionProperties()
- condition.conditionName = conditionName
- condition.conditionParameters = conditionParameters
- cmHandleQueryParameters.cmHandleQueryParameters = [condition]
- when: 'validator is invoked'
- CmHandleQueryRestParametersValidator.validateCmHandleQueryParameters(cmHandleQueryParameters)
- then: 'a data validation exception is thrown'
- thrown(DataValidationException)
- where:
- scenario | conditionName | conditionParameters
- 'empty properties' | 'hasAllProperties' | [[ : ]]
- 'empty conditions' | 'hasAllProperties' | []
- 'wrong condition name' | 'wrong' | []
- 'no condition name' | '' | []
- 'too many properties' | 'hasAllProperties' | [[key1:'value1', key2:'value2']]
- 'wrong properties' | 'hasAllProperties' | [['':'wrong']]
- }
-
- def 'CM Handle Query validation: validate module name condition properties - valid query.'() {
- given: 'a condition property'
- def conditionProperty = [moduleName: 'value']
- when: 'validator is invoked'
- CmHandleQueryRestParametersValidator.validateModuleNameConditionProperties(conditionProperty)
- then: 'data validation exception is not thrown'
- noExceptionThrown()
- }
-
- def 'CM Handle Query validation: validate module name condition properties - #scenario.'() {
- when: 'validator is invoked'
- CmHandleQueryRestParametersValidator.validateModuleNameConditionProperties(conditionProperty)
- then: 'a data validation exception is thrown'
- thrown(DataValidationException)
- where:
- scenario | conditionProperty
- 'invalid value' | [moduleName: '']
- 'invalid name' | [wrongName: 'value']
- }
-
- def 'Validate CmHandle where an exception is thrown due to #scenario.'() {
- when: 'the validator is called on a cps path condition property'
- CmHandleQueryRestParametersValidator.validateCpsPathConditionProperties(conditionProperty)
- then: 'a data validation exception is thrown'
- def e = thrown(DataValidationException)
- and: 'exception message matches the expected message'
- e.details.contains(exceptionMessage)
- where:
- scenario | conditionProperty || exceptionMessage
- 'more than one condition is supplied' | ['cpsPath':'some-path', 'cpsPath2':'some-path'] || 'Only one condition property is allowed for the CPS path query.'
- 'cpsPath key not supplied' | ['wrong-key':'some-path'] || 'Wrong CPS path condition property. - expecting "cpsPath" as the condition property.'
- 'cpsPath not supplied' | ['cpsPath':''] || 'Wrong CPS path. - please supply a valid CPS path.'
- }
-
- def 'No conditions.'() {
- expect: 'no conditions always returns true'
- CmHandleQueryRestParametersValidator.validateCpsPathConditionProperties([:]) == true
- }
-
- def 'Validate CmHandle where #scenario.'() {
- when: 'the validator is called on a cps path condition property'
- def result = CmHandleQueryRestParametersValidator.validateCpsPathConditionProperties(['cpsPath':cpsPath])
- then: 'the expected boolean value is returned'
- result == expectedBoolean
- where:
- scenario | cpsPath || expectedBoolean
- 'cpsPath is valid' | '/some/valid/path' || true
- 'cpsPath attempts to query private properties' | "//additional-properties[@some-property='some-value']" || false
- }
-}