From 4d4dc481af71692a15dc66e0504ed7e8dcbe94af Mon Sep 17 00:00:00 2001 From: JoeOLeary Date: Tue, 19 Feb 2019 10:30:26 +0000 Subject: Add XML validation Issue-ID: DCAEGEN2-1217 Change-Id: Ic76885ab1c8e020a2bded05a264092684a747461 Signed-off-by: JoeOLeary --- .../services/pmmapper/utils/XMLValidatorTest.java | 87 ++++++++++++++++++++++ src/test/java/utils/EventUtils.java | 4 +- .../test_data/invalid/no_file_header.xml | 22 ++++++ .../test_data/valid/no_measdata.xml | 10 +++ 4 files changed, 120 insertions(+), 3 deletions(-) create mode 100644 src/test/java/org/onap/dcaegen2/services/pmmapper/utils/XMLValidatorTest.java create mode 100644 src/test/resources/xml_validator_test/test_data/invalid/no_file_header.xml create mode 100644 src/test/resources/xml_validator_test/test_data/valid/no_measdata.xml (limited to 'src/test') diff --git a/src/test/java/org/onap/dcaegen2/services/pmmapper/utils/XMLValidatorTest.java b/src/test/java/org/onap/dcaegen2/services/pmmapper/utils/XMLValidatorTest.java new file mode 100644 index 0000000..aca0fe6 --- /dev/null +++ b/src/test/java/org/onap/dcaegen2/services/pmmapper/utils/XMLValidatorTest.java @@ -0,0 +1,87 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2019 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.dcaegen2.services.pmmapper.utils; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.IOException; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.List; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; +import org.mockito.junit.jupiter.MockitoExtension; +import org.onap.dcaegen2.services.pmmapper.model.Event; +import utils.EventUtils; + + +@ExtendWith(MockitoExtension.class) +class XMLValidatorTest { + private static final Path metadata = Paths.get("src/test/resources/valid_metadata.json"); + private static final Path dataDirectory = Paths.get("src/test/resources/xml_validator_test/test_data/"); + private static final Path xsd = Paths.get("src/main/resources/measCollec_plusString.xsd"); + private XMLValidator objUnderTest; + + @BeforeEach + void setup() { + objUnderTest = new XMLValidator(xsd); + } + + @Test + void testBadSchema() { + assertThrows(IllegalArgumentException.class, () -> + new XMLValidator(Paths.get("src/test/resources/mapping_data/valid_data/meas_type_and_r.xml"))); + } + + @Test + void testNullInput() { + assertThrows(NullPointerException.class, () -> objUnderTest.validate(null)); + } + + @ParameterizedTest + @MethodSource("getValidEvents") + void testValidEventsPass(Event testEvent) { + assertTrue(objUnderTest.validate(testEvent)); + } + + @ParameterizedTest + @MethodSource("getInvalidEvents") + void testInvalidEventsFail(Event testEvent) { + assertFalse(objUnderTest.validate(testEvent)); + } + + private static List getValidEvents() throws IOException { + Path validDataDirectory = Paths.get(dataDirectory.toString() + "/valid/"); + return EventUtils.eventsFromDirectory(validDataDirectory, metadata); + } + + private static List getInvalidEvents() throws IOException { + Path invalidDataDirectory = Paths.get(dataDirectory.toString() + "/invalid/"); + return EventUtils.eventsFromDirectory(invalidDataDirectory, metadata); + } + +} diff --git a/src/test/java/utils/EventUtils.java b/src/test/java/utils/EventUtils.java index b265f1d..90317c2 100644 --- a/src/test/java/utils/EventUtils.java +++ b/src/test/java/utils/EventUtils.java @@ -31,19 +31,17 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; import org.onap.dcaegen2.services.pmmapper.model.Event; import org.onap.dcaegen2.services.pmmapper.model.EventMetadata; -import org.slf4j.MDC; public class EventUtils { /** - * reads contents of files inside the eventBodyDirectory, combines contents with metadata to make an Event Object. + * Reads contents of files inside the eventBodyDirectory, combines contents with metadata to make an Event Object. * Fails test in the event of failure to read a file. * @param eventBodyDirectory Path to directory with event body files. * @param metadataPath Path to file with metadata object. diff --git a/src/test/resources/xml_validator_test/test_data/invalid/no_file_header.xml b/src/test/resources/xml_validator_test/test_data/invalid/no_file_header.xml new file mode 100644 index 0000000..8e5669f --- /dev/null +++ b/src/test/resources/xml_validator_test/test_data/invalid/no_file_header.xml @@ -0,0 +1,22 @@ + + + + + + + + a + b + c + + 86 + 67 + 14 + false + + + + + + + diff --git a/src/test/resources/xml_validator_test/test_data/valid/no_measdata.xml b/src/test/resources/xml_validator_test/test_data/valid/no_measdata.xml new file mode 100644 index 0000000..5b8eb5a --- /dev/null +++ b/src/test/resources/xml_validator_test/test_data/valid/no_measdata.xml @@ -0,0 +1,10 @@ + + + + + + + + + -- cgit 1.2.3-korg