diff options
author | Jim Hahn <jrh3@att.com> | 2021-04-08 20:42:52 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2021-04-08 20:42:52 +0000 |
commit | 6a394bb781d6e6216cf6f9ac2d2d8d788f9691ad (patch) | |
tree | 10517f34ee3dbce901354138f7b89bcbfbae297b /controlloop/common/eventmanager/src | |
parent | 5134a877e479f20319dac1b59a55c3525cb65066 (diff) | |
parent | 7fc651bc66b013bd54aad31b43abf07f2d3d3bf5 (diff) |
Merge "Minor clean-up of drools-apps"
Diffstat (limited to 'controlloop/common/eventmanager/src')
2 files changed, 3 insertions, 79 deletions
diff --git a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/ControlLoopExceptionTest.java b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/ControlLoopExceptionTest.java index aca8d9655..198af71b2 100644 --- a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/ControlLoopExceptionTest.java +++ b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/ControlLoopExceptionTest.java @@ -3,7 +3,7 @@ * eventmanager * ================================================================================ * Copyright (C) 2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2019-20201 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,21 +21,13 @@ package org.onap.policy.controlloop; -import static org.junit.Assert.assertNotNull; - -import java.io.IOException; import org.junit.Test; +import org.onap.policy.common.utils.test.ExceptionsTester; public class ControlLoopExceptionTest { - private static final String IN_OZ = "In Oz"; - @Test public void testControlLoopException() { - assertNotNull(new ControlLoopException()); - assertNotNull(new ControlLoopException(IN_OZ)); - assertNotNull(new ControlLoopException(new IOException())); - assertNotNull(new ControlLoopException(IN_OZ, new IOException())); - assertNotNull(new ControlLoopException(IN_OZ, new IOException(), false, false)); + new ExceptionsTester().test(ControlLoopException.class); } } diff --git a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/SupportUtil.java b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/SupportUtil.java deleted file mode 100644 index 05eba6450..000000000 --- a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/SupportUtil.java +++ /dev/null @@ -1,68 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * util - * ================================================================================ - * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * 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. - * ============LICENSE_END========================================================= - */ - -package org.onap.policy.controlloop; - -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; -import org.apache.commons.io.IOUtils; -import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy; -import org.yaml.snakeyaml.Yaml; -import org.yaml.snakeyaml.constructor.Constructor; - -public final class SupportUtil { - - public static class Pair<A, B> { - public final A key; - public final B value; - - public Pair(A key, B value) { - this.key = key; - this.value = value; - } - } - - private SupportUtil() { - // do nothing - } - - /** - * Load yaml into a Pair object. - * - * @param testFile the yaml file - * @return a Pair - * @throws IOException if the file cannot be read - */ - public static Pair<ToscaPolicy, String> loadYaml(String testFile) throws IOException { - try (InputStream is = new FileInputStream(new File(testFile))) { - String contents = IOUtils.toString(is, StandardCharsets.UTF_8); - // - // Read the yaml into our Java Object - // - Yaml yaml = new Yaml(new Constructor(ToscaPolicy.class)); - ToscaPolicy obj = yaml.load(contents); - return new Pair<>(obj, contents); - } - } - -} |