- Fixed and refactored unit test to get over the 97% coverage baseline.
- Removed unused exception.
Issue-ID: CPS-475
Change-Id: I6dbcba58b880a584f6d9346e2aca6c763e5d2081
Signed-off-by: leventecsanyi <levente.csanyi@est.tech>
return new NcmpDatastorePassthroughRunningResourceRequestHandler(networkCmProxyDataService,
cpsNcmpTaskExecutor, timeOutInMilliSeconds, notificationFeatureEnabled);
case PASSTHROUGH_OPERATIONAL:
+ default:
return new NcmpDatastorePassthroughOperationalResourceRequestHandler(networkCmProxyDataService,
cpsNcmpTaskExecutor, timeOutInMilliSeconds, notificationFeatureEnabled);
- default:
- return null;
}
}
}
+++ /dev/null
-/*
- * ============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.ncmp.rest.exceptions;
-
-import lombok.Getter;
-
-public class CpsTaskExecutionException extends RuntimeException {
-
- private static final long serialVersionUID = 1481520410918497454L;
-
- @Getter
- final String details;
-
- /**
- * Constructor.
- *
- * @param message the error message
- * @param details the error details
- * @param cause the cause of the exception
- */
- public CpsTaskExecutionException(final String message, final String details, final Throwable cause) {
- super(message, cause);
- this.details = details;
- }
-
-}
\ No newline at end of file
dataStores.setOperational(operationalSyncState);
}
-
return dataStores;
-
}
/**
import java.time.ZoneOffset
import java.time.format.DateTimeFormatter
-class CmHandleStateMapperTest extends Specification {
+class CmHandleStateMapperSpec extends Specification {
def formattedDateAndTime = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSZ")
.format(OffsetDateTime.of(2022, 12, 31, 20, 30, 40, 1, ZoneOffset.UTC))
assert result.dataSyncState.operational.getSyncState() != null
}
+ def 'Handling null state.'() {
+ expect: 'converting null returns null'
+ objectUnderTest.toDataStores(null) == null
+ }
+
def 'Internal to External Lock Reason Mapping of #scenario'() {
given: 'a LOCKED composite state with locked reason of #scenario'
def compositeState = new CompositeStateBuilder()
cmHandleQueryServiceParameters.getCmHandleQueryParameters().forEach(
conditionApiProperty -> {
if (Strings.isNullOrEmpty(conditionApiProperty.getConditionName())) {
- throwDataValidationException("Missing 'conditionName' - please supply a valid name.");
+ throw createDataValidationException("Missing 'conditionName' - please supply a valid name.");
}
if (Arrays.stream(ValidQueryProperties.values()).noneMatch(validQueryProperty ->
validQueryProperty.getQueryProperty().equals(conditionApiProperty.getConditionName()))) {
- throwDataValidationException(
+ throw createDataValidationException(
String.format("Wrong 'conditionName': %s - please supply a valid name.",
conditionApiProperty.getConditionName()));
}
if (conditionApiProperty.getConditionParameters().isEmpty()) {
- throwDataValidationException(
+ throw createDataValidationException(
"Empty 'conditionsParameters' - please supply a valid condition parameter.");
}
conditionApiProperty.getConditionParameters().forEach(
private static void validateConditionParameter(final Map<String, String> conditionParameter) {
if (conditionParameter.isEmpty()) {
- throwDataValidationException(
+ throw createDataValidationException(
"Empty 'conditionsParameter' - please supply a valid condition parameter.");
}
if (conditionParameter.size() > 1) {
- throwDataValidationException("Too many name in one 'conditionsParameter' -"
+ throw createDataValidationException("Too many name in one 'conditionsParameter' -"
+ " please supply one name in one condition parameter.");
}
conditionParameter.forEach((key, value) -> {
if (Strings.isNullOrEmpty(key)) {
- throwDataValidationException(
+ throw createDataValidationException(
"Missing 'conditionsParameterName' - please supply a valid name.");
}
});
if (conditionProperty.containsKey("moduleName") && !conditionProperty.get("moduleName").isEmpty()) {
return;
}
- throwDataValidationException("Wrong module condition property. - please supply a valid condition property.");
+ throw createDataValidationException("Wrong module condition property. - "
+ + "please supply a valid condition property.");
}
/**
return true;
}
if (conditionProperty.size() > 1) {
- throwDataValidationException("Only one condition property is allowed for the CPS path query.");
+ throw createDataValidationException("Only one condition property is allowed for the CPS path query.");
}
if (!conditionProperty.containsKey("cpsPath")) {
- throwDataValidationException(
+ throw createDataValidationException(
"Wrong CPS path condition property. - expecting \"cpsPath\" as the condition property.");
}
final String cpsPath = conditionProperty.get("cpsPath");
if (cpsPath.isBlank()) {
- throwDataValidationException(
+ throw createDataValidationException(
"Wrong CPS path. - please supply a valid CPS path.");
}
if (cpsPath.contains("/additional-properties")) {
return true;
}
- private static void throwDataValidationException(final String details) {
- throw new DataValidationException("Invalid Query Parameter.", details);
+ private static DataValidationException createDataValidationException(final String details) {
+ return new DataValidationException("Invalid Query Parameter.", details);
}
}
'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])
package org.onap.cps.utils
-
+import com.fasterxml.jackson.core.JsonProcessingException
import com.fasterxml.jackson.databind.ObjectMapper
import com.fasterxml.jackson.databind.SerializationFeature
import groovy.json.JsonSlurper
assert contentMap.'test:bookstore'.'bookstore-name' == 'Chapters'
}
+ def 'Map a structured object to json String error.'() {
+ given: 'some object'
+ def object = new Object()
+ and: 'the Object mapper throws an exception'
+ spiedObjectMapper.writeValueAsString(object) >> { throw new JsonProcessingException('Sample problem'){} }
+ when: 'attempting to convert the object to a string'
+ jsonObjectMapper.asJsonString(object);
+ then: 'a Data Validation Exception is thrown'
+ def thrown = thrown(DataValidationException)
+ and: 'the details containing the original error message'
+ assert thrown.details == 'Sample problem'
+ }
+
def 'Map a structurally compatible object to class object of specific class type T.'() {
given: 'a map object model'
def contentMap = new JsonSlurper().parseText(TestUtils.getResourceFileContent('bookstore.json'))
given: 'Unstructured json string'
def content = '{ "nest": { "birds": "bird"] } }'
when: 'mapping json string to given class type'
- def contentMap = jsonObjectMapper.convertJsonString(content, Map);
+ jsonObjectMapper.convertJsonString(content, Map);
then: 'an exception is thrown'
thrown(DataValidationException)
}
Code Review / cps.git / commitdiff