From 0fce7537299e6af0d2b1fdb1d5c01654ce9573c0 Mon Sep 17 00:00:00 2001 From: Bartosz Gardziejewski Date: Thu, 6 May 2021 10:14:57 +0200 Subject: Rename PM_Dictionary_Validator to Dictionary_Validator Signed-off-by: Bartosz Gardziejewski Change-Id: Icb65e6f832804aa4a958e530422d35e079ffe3c1 Issue-ID: VNFSDK-769 --- .../PmDictionaryValidateRuleFunctionalTest.java | 133 --------------------- .../org/onap/functional/util/OnapCliWrapper.java | 42 ------- .../onap/functional/util/ValidationUtility.java | 49 -------- 3 files changed, 224 deletions(-) delete mode 100644 pmdictionaryvalidation/src/test/java/org/onap/functional/PmDictionaryValidateRuleFunctionalTest.java delete mode 100644 pmdictionaryvalidation/src/test/java/org/onap/functional/util/OnapCliWrapper.java delete mode 100644 pmdictionaryvalidation/src/test/java/org/onap/functional/util/ValidationUtility.java (limited to 'pmdictionaryvalidation/src/test/java/org/onap/functional') diff --git a/pmdictionaryvalidation/src/test/java/org/onap/functional/PmDictionaryValidateRuleFunctionalTest.java b/pmdictionaryvalidation/src/test/java/org/onap/functional/PmDictionaryValidateRuleFunctionalTest.java deleted file mode 100644 index fc212e7..0000000 --- a/pmdictionaryvalidation/src/test/java/org/onap/functional/PmDictionaryValidateRuleFunctionalTest.java +++ /dev/null @@ -1,133 +0,0 @@ -/* - * Copyright 2020 Nokia - *

- * 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. - */ - -package org.onap.functional; - -import org.junit.Test; -import org.onap.functional.util.OnapCliWrapper; -import org.onap.validation.rule.PMDictionaryValidate; -import org.onap.validation.rule.PMDictionaryValidateResponse; - -import java.net.URISyntaxException; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.onap.functional.util.ValidationUtility.OPERATION_STATUS_FAILED; -import static org.onap.functional.util.ValidationUtility.OPERATION_STATUS_PASS; -import static org.onap.functional.util.ValidationUtility.getCliCommandValidationResult; -import static org.onap.functional.util.ValidationUtility.verifyThatOperationFinishedWithError; -import static org.onap.functional.util.ValidationUtility.verifyThatOperationFinishedWithoutAnyError; - - -public class PmDictionaryValidateRuleFunctionalTest { - - - private static final String YAML_SCHEMA_SIMPLE_VALID_SCHEMA_YAML = "yaml_schema/Simple_Valid_Schema.yaml"; - private static final String NO_ERRORS = "[]"; - private static final String YAML_SCHEMA_PM_DICTIONARY_YAML = "yaml_schema/PM_Dictionary.yaml"; - private static final String PATH_TO_NON_EXITING_FILE_YAML = "path/to/nonExitingFile.yaml"; - private static final String NOT_YAML_FILE_TXT = "Not_Yaml_File.txt"; - - @Test - public void shouldSuccessfullyValidatePMDictionaryYamlFile() throws URISyntaxException { - // given - OnapCliWrapper cli = new OnapCliWrapper(createPnfValidationRequestInfo(YAML_SCHEMA_SIMPLE_VALID_SCHEMA_YAML)); - - // when - cli.handle(); - - // then - final PMDictionaryValidateResponse result = getCliCommandValidationResult(cli, PMDictionaryValidateResponse.class); - - assertThat(result.getFile()).contains(YAML_SCHEMA_SIMPLE_VALID_SCHEMA_YAML); - assertThat(result.getPlatform()).contains(PMDictionaryValidateResponse.PLATFORM_VTP_1_0); - assertThat(result.getContact()).contains(PMDictionaryValidateResponse.ONAP_DISCUSS_LISTS_ONAP_ORG); - assertThat(result.getCriteria()).isEqualTo(OPERATION_STATUS_PASS); - assertThat(result.getErrors()).isEqualTo(NO_ERRORS); - verifyThatOperationFinishedWithoutAnyError(cli); - } - - @Test - public void shouldFailsWhenPMDictionaryYamlFileHasSomeErrors() throws URISyntaxException { - // given - OnapCliWrapper cli = new OnapCliWrapper(createPnfValidationRequestInfo(YAML_SCHEMA_PM_DICTIONARY_YAML)); - - // when - cli.handle(); - - // then - final PMDictionaryValidateResponse result = getCliCommandValidationResult(cli, PMDictionaryValidateResponse.class); - - assertThat(result.getFile()).contains(YAML_SCHEMA_PM_DICTIONARY_YAML); - assertThat(result.getPlatform()).contains(PMDictionaryValidateResponse.PLATFORM_VTP_1_0); - assertThat(result.getContact()).contains(PMDictionaryValidateResponse.ONAP_DISCUSS_LISTS_ONAP_ORG); - assertThat(result.getCriteria()).isEqualTo(OPERATION_STATUS_FAILED); - final String errors = result.getErrors(); - assertThat(errors).contains( - "Value(s) is/are not in array of accepted values.", - "accepted value(s): [float, uint32, uint64]", - "Key not found: measChangeType", - "accepted value(s): [X, Y, Z]" - ); - verifyThatOperationFinishedWithoutAnyError(cli); - } - - @Test - public void shouldReportAnErrorWhenYamlFileDoesNotExist() { - // given - OnapCliWrapper cli = new OnapCliWrapper(new String[]{PATH_TO_NON_EXITING_FILE_YAML}); - - // when - cli.handle(); - - verifyThatOperationFinishedWithError(cli); - } - - - @Test - public void shouldReportThatValidationFailedWithInternalError() throws URISyntaxException { - // given - OnapCliWrapper cli = new OnapCliWrapper(createPnfValidationRequestInfo(NOT_YAML_FILE_TXT)); - - // when - cli.handle(); - - // then - final PMDictionaryValidateResponse result = getCliCommandValidationResult(cli, PMDictionaryValidateResponse.class); - - assertThat(result.getFile()).contains(NOT_YAML_FILE_TXT); - assertThat(result.getPlatform()).contains(PMDictionaryValidateResponse.PLATFORM_VTP_1_0); - assertThat(result.getContact()).contains(PMDictionaryValidateResponse.ONAP_DISCUSS_LISTS_ONAP_ORG); - assertThat(result.getCriteria()).isEqualTo(OPERATION_STATUS_FAILED); - assertThat(result.getErrors()).contains("Provided yaml file has invalid structure!"); - verifyThatOperationFinishedWithoutAnyError(cli); - } - - - private String[] createPnfValidationRequestInfo(String yamlPath) throws URISyntaxException { - return new String[]{ - "--product", "onap-honolulu", - "pm-dictionary-validate", - "--format", "json", - "--yaml", absoluteFilePath(yamlPath) - }; - } - - - public static String absoluteFilePath(String relativeFilePath) throws URISyntaxException { - return PMDictionaryValidate.class.getClassLoader().getResource(relativeFilePath) - .toURI().getPath(); - } -} diff --git a/pmdictionaryvalidation/src/test/java/org/onap/functional/util/OnapCliWrapper.java b/pmdictionaryvalidation/src/test/java/org/onap/functional/util/OnapCliWrapper.java deleted file mode 100644 index 347a7bb..0000000 --- a/pmdictionaryvalidation/src/test/java/org/onap/functional/util/OnapCliWrapper.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2020 Nokia - *

- * 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. - */ - -package org.onap.functional.util; - - -import org.onap.cli.fw.cmd.OnapCommand; -import org.onap.cli.fw.error.OnapCommandException; -import org.onap.cli.fw.output.OnapCommandResult; -import org.onap.cli.main.OnapCli; - -public class OnapCliWrapper extends OnapCli { - - private OnapCommandResult commandResult; - - public OnapCliWrapper(String[] args) { - super(args); - } - - @Override - public void handleTracking(OnapCommand cmd) throws OnapCommandException { - super.handleTracking(cmd); - this.commandResult = cmd.getResult(); - } - - public OnapCommandResult getCommandResult() { - return this.commandResult; - } -} diff --git a/pmdictionaryvalidation/src/test/java/org/onap/functional/util/ValidationUtility.java b/pmdictionaryvalidation/src/test/java/org/onap/functional/util/ValidationUtility.java deleted file mode 100644 index 3a497f4..0000000 --- a/pmdictionaryvalidation/src/test/java/org/onap/functional/util/ValidationUtility.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2020 Nokia - *

- * 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. - */ - -package org.onap.functional.util; - -import com.google.gson.Gson; -import org.onap.cli.fw.output.OnapCommandResult; - - -import static org.assertj.core.api.Assertions.assertThat; - - -public final class ValidationUtility { - - private static final int NO_ERROR_CODE = 0; - public static final int ERROR_CODE = 1; - - private ValidationUtility(){} - - public static final String OPERATION_STATUS_PASS = "PASS"; - public static final String OPERATION_STATUS_FAILED = "FAILED"; - - public static T getCliCommandValidationResult(OnapCliWrapper cli, Class clazz) { - final OnapCommandResult onapCommandResult = cli.getCommandResult(); - final String json = onapCommandResult.getOutput().toString(); - return new Gson().fromJson(json, clazz); - } - - public static void verifyThatOperationFinishedWithoutAnyError(OnapCliWrapper cli) { - assertThat(cli.getExitCode()).isEqualTo(NO_ERROR_CODE); - } - - public static void verifyThatOperationFinishedWithError(OnapCliWrapper cli) { - assertThat(cli.getExitCode()).isEqualTo(ERROR_CODE); - } -} -- cgit 1.2.3-korg