diff options
author | 2019-07-19 10:02:12 +0000 | |
---|---|---|
committer | 2019-07-19 10:02:12 +0000 | |
commit | 2c8ddf3501cfc5106d20b51ef077cc6d07ab65dc (patch) | |
tree | 700976f3c0621acfd7d96e43e71bc1eadda19abd /src/test/java/utils | |
parent | 0e85c3644ea0141f7761da89926e358ef68acb41 (diff) |
Add DMaaP plugin support
- Update blueprint with DMaaP plugin support.
- Update configuration with new DMaaP plugin format.
- Move Configuration tests to correct package.
- Add latest-staging Docker image tag to pom.
- Change file endings in some files to LF.
- Remove publishing to non authenticated topic.
- Fix some tests which were not executing correctly.
- Fix some Sonar smells.
Issue-ID: DCAEGEN2-1581
Change-Id: I37fbb662419179e3fe9fb8bdf710d6a6e8f0308a
Signed-off-by: JoeOLeary <joseph.o.leary@est.tech>
Diffstat (limited to 'src/test/java/utils')
-rw-r--r-- | src/test/java/utils/ConfigUtils.java | 38 | ||||
-rw-r--r-- | src/test/java/utils/EventUtils.java | 11 | ||||
-rw-r--r-- | src/test/java/utils/FileUtils.java | 82 |
3 files changed, 124 insertions, 7 deletions
diff --git a/src/test/java/utils/ConfigUtils.java b/src/test/java/utils/ConfigUtils.java new file mode 100644 index 0000000..8cf6d87 --- /dev/null +++ b/src/test/java/utils/ConfigUtils.java @@ -0,0 +1,38 @@ +/*- + * ============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 utils; + +import com.google.gson.Gson; +import org.onap.dcaegen2.services.pmmapper.model.MapperConfig; + + +public class ConfigUtils { + + /** + * Returns A MapperConfig Object Created from a file. + * Fails test in the event of failure to read file. + * @param mapperConfigFile Filename for the mapper config + * @return A Mapper Config Object + */ + public static MapperConfig getMapperConfigFromFile(String mapperConfigFile) { + return new Gson().fromJson(FileUtils.getFileContents(mapperConfigFile), MapperConfig.class); + } +} diff --git a/src/test/java/utils/EventUtils.java b/src/test/java/utils/EventUtils.java index eae050d..f14e080 100644 --- a/src/test/java/utils/EventUtils.java +++ b/src/test/java/utils/EventUtils.java @@ -51,13 +51,10 @@ public class EventUtils { */ public static List<Event> eventsFromDirectory(Path eventBodyDirectory, Path metadataPath) throws IOException { EventMetadata eventMetadata = new Gson().fromJson(fileContentsToString(metadataPath), EventMetadata.class); - try (Stream<Path> eventFileStream = Files.walk(eventBodyDirectory)) { - return eventFileStream.filter(Files::isRegularFile) - .filter(Files::isReadable) - .map(EventUtils::fileContentsToString) - .map(body -> EventUtils.makeMockEvent(body, eventMetadata)) - .collect(Collectors.toList()); - } + List<String> eventFiles = FileUtils.getFilesFromDirectory(eventBodyDirectory); + return eventFiles.stream() + .map(contents -> EventUtils.makeMockEvent(contents, eventMetadata)) + .collect(Collectors.toList()); } /** diff --git a/src/test/java/utils/FileUtils.java b/src/test/java/utils/FileUtils.java new file mode 100644 index 0000000..8b58618 --- /dev/null +++ b/src/test/java/utils/FileUtils.java @@ -0,0 +1,82 @@ +/*- + * ============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 utils; + +import static org.junit.jupiter.api.Assertions.fail; + +import java.io.IOException; +import java.net.URISyntaxException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +public class FileUtils { + + /** + * 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 targetDirectory Path to directory with files. + * @return List of Strings containing the body as acquired from files inside targetDirectory. + * @throws IOException in the event it fails to read from the files. + */ + public static List<String> getFilesFromDirectory(Path targetDirectory ) throws IOException { + try (Stream<Path> eventFileStream = Files.walk(targetDirectory)) { + return eventFileStream.filter(Files::isRegularFile) + .filter(Files::isReadable) + .map(FileUtils::getFileContents) + .collect(Collectors.toList()); + } + } + + /** + * reads contents of file into a string. + * fails a tests in the event failure occurs. + * @param path path to file. + * @return string containing files contents + */ + public static String getFileContents(Path path) { + try { + return new String(Files.readAllBytes(path)); + } catch (IOException exception) { + fail("IOException occurred while reading file."); + } + return null; + } + + /** + * Reads contents of resource. + * fails a test in the event failure occurs. + * @param fileName of file in resources to be read. + * @return contents of file + */ + public static String getFileContents(String fileName) { + try { + Path path = Paths.get(ClassLoader.getSystemResource(fileName).toURI()); + return getFileContents(path); + } catch (URISyntaxException exception) { + fail("Exception occurred, failed to acquire resource URI."); + } + return null; + } +} |