From dbc13c78875a3d5493054a7252a7804daae8cf1f Mon Sep 17 00:00:00 2001 From: FrancescoFioraEst Date: Tue, 15 Jun 2021 16:01:31 +0100 Subject: Move parameters from config Json file to application.yaml Issue-ID: POLICY-3343 Change-Id: Id78c00a5a241337f684a70feeee543f3a88fc01c Signed-off-by: FrancescoFioraEst --- .../simulator/main/parameters/CommonTestData.java | 106 ++------------------- .../TestParticipantSimulatorParameterHandler.java | 71 -------------- .../TestParticipantSimulatorParameters.java | 85 +++++------------ 3 files changed, 29 insertions(+), 233 deletions(-) delete mode 100644 participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/TestParticipantSimulatorParameterHandler.java (limited to 'participant/participant-impl/participant-impl-simulator/src/test/java') diff --git a/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/CommonTestData.java b/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/CommonTestData.java index 2c9b1ccd2..c53410b28 100644 --- a/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/CommonTestData.java +++ b/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/CommonTestData.java @@ -20,19 +20,11 @@ package org.onap.policy.clamp.controlloop.participant.simulator.main.parameters; -import java.io.File; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.TreeMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import org.onap.policy.clamp.controlloop.common.exception.ControlLoopRuntimeException; import org.onap.policy.common.endpoints.parameters.TopicParameters; -import org.onap.policy.common.parameters.ParameterGroup; import org.onap.policy.common.utils.coder.Coder; import org.onap.policy.common.utils.coder.CoderException; import org.onap.policy.common.utils.coder.StandardCoder; @@ -46,30 +38,20 @@ public class CommonTestData { public static final String DESCRIPTION = "Participant description"; public static final long TIME_INTERVAL = 2000; public static final List TOPIC_PARAMS = Arrays.asList(getTopicParams()); - private static final String REST_SERVER_PASSWORD = "zb!XztG34"; - private static final String REST_SERVER_USER = "healthcheck"; - private static final int REST_SERVER_PORT = 6969; - public static final String REST_SERVER_HOST = "0.0.0.0"; - private static final boolean REST_SERVER_HTTPS = true; - private static final boolean REST_SERVER_AAF = false; - public static final Coder coder = new StandardCoder(); + public static final Coder CODER = new StandardCoder(); /** - * Converts the contents of a map to a parameter class. + * Get ParticipantSimulatorParameters. * - * @param the specific parameter group type to convert - * @param source property map - * @param clazz class of object to be created from the map - * @return a new object represented by the map - * @throws ControlLoopRuntimeException on parameter parsing errors + * @return ParticipantSimulatorParameters */ - public T toObject(final Map source, final Class clazz) { + public ParticipantSimulatorParameters getParticipantSimulatorParameters() { try { - return coder.convert(source, clazz); + return CODER.convert(getParticipantParameterGroupMap(PARTICIPANT_GROUP_NAME), + ParticipantSimulatorParameters.class); } catch (final CoderException e) { - throw new ControlLoopRuntimeException(Status.NOT_ACCEPTABLE, - "cannot create " + clazz.getName() + " from map", e); + throw new RuntimeException("cannot create ParticipantSimulatorParameters from map", e); } } @@ -84,33 +66,11 @@ public class CommonTestData { final Map map = new TreeMap<>(); map.put("name", name); - map.put("restServerParameters", getRestServerParametersMap(false)); map.put("intermediaryParameters", getIntermediaryParametersMap(false)); map.put("databaseProviderParameters", getDatabaseProviderParametersMap(false)); return map; } - /** - * Returns a property map for a RestServerParameters map for test cases. - * - * @param isEmpty boolean value to represent that object created should be empty or not - * @return a property map suitable for constructing an object - */ - public Map getRestServerParametersMap(final boolean isEmpty) { - final Map map = new TreeMap<>(); - map.put("https", REST_SERVER_HTTPS); - map.put("aaf", REST_SERVER_AAF); - - if (!isEmpty) { - map.put("host", REST_SERVER_HOST); - map.put("port", REST_SERVER_PORT); - map.put("userName", REST_SERVER_USER); - map.put("password", REST_SERVER_PASSWORD); - } - - return map; - } - /** * Returns a property map for a databaseProviderParameters map for test cases. * @@ -190,58 +150,6 @@ public class CommonTestData { return participantId; } - /** - * Gets the standard participant parameters. - * - * @param port port to be inserted into the parameters - * @return the standard participant parameters - * @throws ControlLoopRuntimeException on parameter read errors - */ - public ParticipantSimulatorParameters getParticipantParameterGroup(int port) { - try { - return coder.decode(getParticipantParameterGroupAsString(port), ParticipantSimulatorParameters.class); - - } catch (CoderException e) { - throw new ControlLoopRuntimeException(Status.NOT_ACCEPTABLE, "cannot read participant parameters", e); - } - } - - /** - * Gets the standard participant parameters, as a String. - * - * @param port port to be inserted into the parameters - * @return the standard participant parameters - * @throws ControlLoopRuntimeException on parameter read errors - */ - public static String getParticipantParameterGroupAsString(int port) { - - try { - File file = new File(getParamFile()); - String json = new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8); - - json = json.replace("${port}", String.valueOf(port)); - json = json.replace("${dbName}", "jdbc:h2:mem:testdb"); - - return json; - - } catch (IOException e) { - throw new ControlLoopRuntimeException(Response.Status.NOT_ACCEPTABLE, "cannot read participant parameters", - e); - - } - } - - /** - * Gets the full path to the parameter file, which may vary depending on whether or - * not this is an end-to-end test. - * - * @return the parameter file name - */ - private static String getParamFile() { - String paramFile = "src/test/resources/parameters/TestParametersStd.json"; - return paramFile; - } - /** * Nulls out a field within a JSON string. * diff --git a/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/TestParticipantSimulatorParameterHandler.java b/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/TestParticipantSimulatorParameterHandler.java deleted file mode 100644 index 44b49f355..000000000 --- a/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/TestParticipantSimulatorParameterHandler.java +++ /dev/null @@ -1,71 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * Copyright (C) 2021 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.policy.clamp.controlloop.participant.simulator.main.parameters; - -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.junit.Assert.assertEquals; - -import java.io.FileNotFoundException; -import org.apache.commons.io.DirectoryWalker.CancelException; -import org.junit.jupiter.api.Test; -import org.onap.policy.clamp.controlloop.common.exception.ControlLoopException; -import org.onap.policy.common.utils.coder.CoderException; - -/** - * Class to perform unit test of {@link ParticipantParameterHandler}. - */ -class TestParticipantSimulatorParameterHandler { - - @Test - void testParameterHandlerNoParameterFile() throws ControlLoopException { - final String path = "src/test/resources/parameters/NoParametersFile.json"; - - assertThatThrownBy(() -> new ParticipantSimulatorParameterHandler().toParticipantSimulatorParameters(path)) - .hasCauseInstanceOf(CoderException.class) - .hasRootCauseInstanceOf(FileNotFoundException.class); - } - - @Test - void testParameterHandlerInvalidParameters() throws ControlLoopException { - final String path = "src/test/resources/parameters/InvalidParameters.json"; - - assertThatThrownBy(() -> new ParticipantSimulatorParameterHandler().toParticipantSimulatorParameters(path)) - .hasMessageStartingWith("error reading parameters from") - .hasCauseInstanceOf(CoderException.class); - } - - @Test - void testParameterHandlerNoParameters() throws CancelException, ControlLoopException { - final String path = "src/test/resources/parameters/EmptyParameters.json"; - - assertThatThrownBy(() -> new ParticipantSimulatorParameterHandler().toParticipantSimulatorParameters(path)) - .hasMessageContaining("no parameters found"); - } - - @Test - void testParticipantParameterGroup() throws ControlLoopException { - final String path = "src/test/resources/parameters/TestParameters.json"; - - final ParticipantSimulatorParameters parGroup = new ParticipantSimulatorParameterHandler() - .toParticipantSimulatorParameters(path); - assertEquals(CommonTestData.PARTICIPANT_GROUP_NAME, parGroup.getName()); - } -} diff --git a/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/TestParticipantSimulatorParameters.java b/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/TestParticipantSimulatorParameters.java index 41c5b09b0..e5c7b5e30 100644 --- a/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/TestParticipantSimulatorParameters.java +++ b/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/TestParticipantSimulatorParameters.java @@ -21,90 +21,49 @@ package org.onap.policy.clamp.controlloop.participant.simulator.main.parameters; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import java.util.Map; +import javax.validation.Validation; +import javax.validation.ValidatorFactory; import org.junit.jupiter.api.Test; -import org.onap.policy.common.parameters.ValidationResult; /** * Class to perform unit test of {@link ParticipantParameterGroup}. */ class TestParticipantSimulatorParameters { - CommonTestData commonTestData = new CommonTestData(); - - @Test - void testParticipantParameterGroup_Named() { - final ParticipantSimulatorParameters participantParameters = new ParticipantSimulatorParameters("my-name"); - assertEquals("my-name", participantParameters.getName()); - } + private CommonTestData commonTestData = new CommonTestData(); + private ValidatorFactory validatorFactory = Validation.buildDefaultValidatorFactory(); @Test void testParticipantParameterGroup() { - final ParticipantSimulatorParameters participantParameters = commonTestData.toObject( - commonTestData.getParticipantParameterGroupMap(CommonTestData.PARTICIPANT_GROUP_NAME), - ParticipantSimulatorParameters.class); - assertThat(participantParameters.validate().isValid()).isTrue(); - assertEquals(CommonTestData.PARTICIPANT_GROUP_NAME, participantParameters.getName()); + final ParticipantSimulatorParameters participantParameters = commonTestData.getParticipantSimulatorParameters(); + assertThat(validatorFactory.getValidator().validate(participantParameters)).isEmpty(); } @Test - void testParticipantParameterGroup_NullName() { - final ParticipantSimulatorParameters participantParameters = commonTestData - .toObject(commonTestData.getParticipantParameterGroupMap(null), - ParticipantSimulatorParameters.class); - final ValidationResult validationResult = participantParameters.validate(); - assertFalse(validationResult.isValid()); - assertEquals(null, participantParameters.getName()); - assertThat(validationResult.getResult()).contains("is null"); - } - - @Test - void testParticipantParameterGroup_EmptyName() { - final ParticipantSimulatorParameters participantParameters = commonTestData - .toObject(commonTestData.getParticipantParameterGroupMap(""), - ParticipantSimulatorParameters.class); - final ValidationResult validationResult = participantParameters.validate(); - assertFalse(validationResult.isValid()); - assertEquals("", participantParameters.getName()); - assertThat(validationResult.getResult()).contains( - "item \"name\" value \"\" INVALID, " + "is blank"); + void testParticipantParameterGroup_EmptyParticipantIntermediaryParameters() { + final ParticipantSimulatorParameters participantParameters = commonTestData.getParticipantSimulatorParameters(); + participantParameters.setIntermediaryParameters(null); + assertThat(validatorFactory.getValidator().validate(participantParameters)).isNotEmpty(); } @Test - void testParticipantParameterGroup_SetName() { - final ParticipantSimulatorParameters participantParameters = commonTestData.toObject( - commonTestData.getParticipantParameterGroupMap(CommonTestData.PARTICIPANT_GROUP_NAME), - ParticipantSimulatorParameters.class); - participantParameters.setName("ParticipantNewGroup"); - assertThat(participantParameters.validate().isValid()).isTrue(); - assertEquals("ParticipantNewGroup", participantParameters.getName()); + void testParticipantParameterGroup_EmptyDatabaseProviderParameters() { + final ParticipantSimulatorParameters participantParameters = commonTestData.getParticipantSimulatorParameters(); + participantParameters.setDatabaseProviderParameters(null); + assertThat(validatorFactory.getValidator().validate(participantParameters)).isNotEmpty(); } @Test - void testParticipantParameterGroup_EmptyParticipantIntermediaryParameters() { - final Map map = - commonTestData.getParticipantParameterGroupMap(CommonTestData.PARTICIPANT_GROUP_NAME); - map.replace("intermediaryParameters", commonTestData.getIntermediaryParametersMap(true)); - final ParticipantSimulatorParameters participantParameters = - commonTestData.toObject(map, ParticipantSimulatorParameters.class); - final ValidationResult validationResult = participantParameters.validate(); - assertNull(validationResult.getResult()); + void testParticipantPolicyParameters_NullTopicSinks() { + final ParticipantSimulatorParameters participantParameters = commonTestData.getParticipantSimulatorParameters(); + participantParameters.getIntermediaryParameters().getClampControlLoopTopics().setTopicSinks(null); + assertThat(validatorFactory.getValidator().validate(participantParameters)).isNotEmpty(); } @Test - void testParticipantParameterGroupp_EmptyTopicParameters() { - final Map map = - commonTestData.getParticipantParameterGroupMap(CommonTestData.PARTICIPANT_GROUP_NAME); - final Map intermediaryParametersMap = commonTestData.getIntermediaryParametersMap(false); - intermediaryParametersMap.put("clampControlLoopTopics", commonTestData.getTopicParametersMap(true)); - map.replace("intermediaryParameters", intermediaryParametersMap); - - final ParticipantSimulatorParameters participantParameters = - commonTestData.toObject(map, ParticipantSimulatorParameters.class); - final ValidationResult validationResult = participantParameters.validate(); - assertNull(validationResult.getResult()); + void testParticipantPolicyParameters_NullTopicSources() { + final ParticipantSimulatorParameters participantParameters = commonTestData.getParticipantSimulatorParameters(); + participantParameters.getIntermediaryParameters().getClampControlLoopTopics().setTopicSources(null); + assertThat(validatorFactory.getValidator().validate(participantParameters)).isNotEmpty(); } } -- cgit 1.2.3-korg