From 20c7487f77d0728d270b2bed34c2c798d17cc12d Mon Sep 17 00:00:00 2001 From: liamfallon Date: Wed, 26 May 2021 11:02:07 +0100 Subject: Transfer tosca-poc onto master This is the third if three commits, this commit makes the content of the master branch the same as the tosca-poc branch. This commit adds the "src" files for TOSCA control loops to the modules in master. Difference between this commit and the current master: ------------------------------------------------------ diff -qr clamp clamp-master |diff_filter.sh Only in clamp/common: src Only in clamp/models: src Files clamp/participant/participant-impl/participant-impl-dcae/pom.xml and clamp-master/participant/participant-impl/participant-impl-dcae/pom.xml differ Only in clamp/participant/participant-impl/participant-impl-dcae: src Only in clamp/participant/participant-impl/participant-impl-policy: src Only in clamp/participant/participant-impl/participant-impl-simulator: src Files clamp/participant/participant-impl/pom.xml and clamp-master/participant/participant-impl/pom.xml differ Only in clamp/participant/participant-intermediary: src Files clamp/participant/pom.xml and clamp-master/participant/pom.xml differ Files clamp/pom.xml and clamp-master/pom.xml differ Files clamp/runtime/pom.xml and clamp-master/runtime/pom.xml differ Only in clamp: runtime-controlloop Difference between this commit and the current tosca-poc branch: ---------------------------------------------------------------- diff -qr clamp clamp-tp |diff_filter.sh Files clamp/INFO.yaml and clamp-tp/INFO.yaml differ Only in clamp/releases: 6.0.1-container.yaml Only in clamp/releases: 6.0.1.yaml Only in clamp/releases: 6.0.2-container.yaml Only in clamp/releases: 6.0.2.yaml Only in clamp/releases: 6.1.0-container.yaml Only in clamp/releases: 6.1.0.yaml Only in clamp/releases: 6.1.1-container.yaml Only in clamp/releases: 6.1.1.yaml Files clamp/runtime/src/main/resources/META-INF/resources/swagger.html and clamp-tp/runtime/src/main/resources/META-INF/resources/swagger.html differ Issue-ID: POLICY-3215 Change-Id: Ica1aa3fe5d6110df2396ea856703102e800fa770 Signed-off-by: liamfallon --- .../common/exception/ExceptionsTest.java | 84 ++++++++++++++++++++++ .../common/handler/ControlLoopHandlerTest.java | 54 ++++++++++++++ .../common/handler/DummyControlLoopHandler.java | 63 ++++++++++++++++ 3 files changed, 201 insertions(+) create mode 100644 common/src/test/java/org/onap/policy/clamp/controlloop/common/exception/ExceptionsTest.java create mode 100644 common/src/test/java/org/onap/policy/clamp/controlloop/common/handler/ControlLoopHandlerTest.java create mode 100644 common/src/test/java/org/onap/policy/clamp/controlloop/common/handler/DummyControlLoopHandler.java (limited to 'common/src/test/java/org') diff --git a/common/src/test/java/org/onap/policy/clamp/controlloop/common/exception/ExceptionsTest.java b/common/src/test/java/org/onap/policy/clamp/controlloop/common/exception/ExceptionsTest.java new file mode 100644 index 000000000..3c1688582 --- /dev/null +++ b/common/src/test/java/org/onap/policy/clamp/controlloop/common/exception/ExceptionsTest.java @@ -0,0 +1,84 @@ +/*- + * ============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.common.exception; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.io.IOException; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.Status; +import org.junit.Test; +import org.onap.policy.models.errors.concepts.ErrorResponse; + +public class ExceptionsTest { + + private static final String STRING_TEXT = "String"; + private static final String MESSAGE = "Message"; + + @Test + public void testExceptions() { + assertNotNull(new ControlLoopException(Response.Status.OK, MESSAGE)); + assertNotNull(new ControlLoopException(Response.Status.OK, MESSAGE, STRING_TEXT)); + assertNotNull(new ControlLoopException(Response.Status.OK, MESSAGE, new IOException())); + assertNotNull(new ControlLoopException(Response.Status.OK, MESSAGE, new IOException(), STRING_TEXT)); + + String key = "A String"; + ControlLoopException ae = + new ControlLoopException(Response.Status.OK, MESSAGE, new IOException("IO exception message"), key); + ErrorResponse errorResponse = ae.getErrorResponse(); + assertEquals("Message\nIO exception message", String.join("\n", errorResponse.getErrorDetails())); + assertEquals(key, ae.getObject()); + + assertNotNull(new ControlLoopRuntimeException(Response.Status.OK, MESSAGE)); + assertNotNull(new ControlLoopRuntimeException(Response.Status.OK, MESSAGE, STRING_TEXT)); + assertNotNull(new ControlLoopRuntimeException(Response.Status.OK, MESSAGE, new IOException())); + assertNotNull(new ControlLoopRuntimeException(Response.Status.OK, MESSAGE, new IOException(), STRING_TEXT)); + + String rkey = "A String"; + ControlLoopRuntimeException re = new ControlLoopRuntimeException(Response.Status.OK, "Runtime Message", + new IOException("IO runtime exception message"), rkey); + errorResponse = re.getErrorResponse(); + assertEquals("Runtime Message\nIO runtime exception message", + String.join("\n", errorResponse.getErrorDetails())); + assertEquals(key, re.getObject()); + + ControlLoopRuntimeException clre = new ControlLoopRuntimeException(ae); + assertEquals(ae.getErrorResponse().getResponseCode(), clre.getErrorResponse().getResponseCode()); + assertEquals(ae.getMessage(), clre.getMessage()); + + try { + try { + throw new ControlLoopException(Status.BAD_GATEWAY, "An Exception"); + } catch (ControlLoopException cle) { + throw new ControlLoopRuntimeException(cle); + } + } catch (ControlLoopRuntimeException clred) { + assertEquals(Status.BAD_GATEWAY, clred.getErrorResponse().getResponseCode()); + assertEquals("An Exception", clred.getMessage()); + assertEquals(ControlLoopException.class.getName(), clred.getCause().getClass().getName()); + } + + assertThat(ae.toString()).contains("A String"); + assertThat(re.toString()).contains("A String"); + } +} diff --git a/common/src/test/java/org/onap/policy/clamp/controlloop/common/handler/ControlLoopHandlerTest.java b/common/src/test/java/org/onap/policy/clamp/controlloop/common/handler/ControlLoopHandlerTest.java new file mode 100644 index 000000000..845bc8df0 --- /dev/null +++ b/common/src/test/java/org/onap/policy/clamp/controlloop/common/handler/ControlLoopHandlerTest.java @@ -0,0 +1,54 @@ +/*- + * ============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.common.handler; + +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import org.junit.Test; +import org.onap.policy.common.utils.services.Registry; +import org.onap.policy.models.provider.PolicyModelsProviderParameters; + +public class ControlLoopHandlerTest { + + @Test + public void testControlLoopHandler() { + assertThatThrownBy(() -> new DummyControlLoopHandler(null)).isInstanceOf(NullPointerException.class); + + assertNotNull(new DummyControlLoopHandler(new PolicyModelsProviderParameters())); + Registry.unregister(DummyControlLoopHandler.class.getName()); + + String dummyClassName = DummyControlLoopHandler.class.getName(); + assertThatThrownBy(() -> Registry.get(dummyClassName)).isInstanceOf(IllegalArgumentException.class); + + PolicyModelsProviderParameters pars = new PolicyModelsProviderParameters(); + + DummyControlLoopHandler dclh = new DummyControlLoopHandler(pars); + assertNotNull(dclh); + + assertEquals(pars, dclh.getDatabaseProviderParameters()); + assertEquals(0, dclh.getProviderClasses().size()); + + dclh.close(); + assertThatThrownBy(() -> Registry.get(dummyClassName)).isInstanceOf(IllegalArgumentException.class); + } +} diff --git a/common/src/test/java/org/onap/policy/clamp/controlloop/common/handler/DummyControlLoopHandler.java b/common/src/test/java/org/onap/policy/clamp/controlloop/common/handler/DummyControlLoopHandler.java new file mode 100644 index 000000000..1602fb6eb --- /dev/null +++ b/common/src/test/java/org/onap/policy/clamp/controlloop/common/handler/DummyControlLoopHandler.java @@ -0,0 +1,63 @@ +/*- + * ============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.common.handler; + +import java.util.List; +import org.onap.policy.common.endpoints.event.comm.TopicSink; +import org.onap.policy.common.endpoints.listeners.MessageTypeDispatcher; +import org.onap.policy.models.provider.PolicyModelsProviderParameters; + +public class DummyControlLoopHandler extends ControlLoopHandler { + + public DummyControlLoopHandler(PolicyModelsProviderParameters databaseProviderParameters) { + super(databaseProviderParameters); + } + + @Override + public void startAndRegisterListeners(MessageTypeDispatcher msgDispatcher) { + // Do nothing on this dummy class + } + + @Override + public void startAndRegisterPublishers(List topicSinks) { + // Do nothing on this dummy class + } + + @Override + public void stopAndUnregisterPublishers() { + // Do nothing on this dummy class + } + + @Override + public void stopAndUnregisterListeners(MessageTypeDispatcher msgDispatcher) { + // Do nothing on this dummy class + } + + @Override + public void startProviders() { + // Do nothing on this dummy class + } + + @Override + public void stopProviders() { + // Do nothing on this dummy class + } +} -- cgit 1.2.3-korg