From 7ec767641505f52cd8ecf8b9a76fa35afe32635e Mon Sep 17 00:00:00 2001 From: Sirisha_Manchikanti Date: Mon, 28 Feb 2022 17:10:36 +0000 Subject: Rename ControlLoop to AutomationCompsition Issue-ID: POLICY-3938 Signed-off-by: Sirisha_Manchikanti Change-Id: I63188fa9bc5d634d3aeb7e2d7051c4d67b5a202c --- ...ositionDecoderFileInCsarParameterGroupTest.java | 68 +++++++++++++++ ...AutomationCompositionDecoderFileInCsarTest.java | 97 +++++++++++++++++++++ ...rolLoopDecoderFileInCsarParameterGroupTest.java | 67 -------------- .../file/ControlLoopDecoderFileInCsarTest.java | 96 -------------------- ...CsarAutomationCompositionDecoderParameters.json | 3 + ...omationCompositionDecoderParametersInvalid.json | 3 + .../FileInCsarControlLoopDecoderParameters.json | 3 - ...eInCsarControlLoopDecoderParametersInvalid.json | 3 - .../test/resources/service-Sampleservice-acm.csar | Bin 0 -> 79303 bytes .../service-Sampleservice-controlloop.csar | Bin 79322 -> 0 bytes 10 files changed, 171 insertions(+), 169 deletions(-) create mode 100644 plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/AutomationCompositionDecoderFileInCsarParameterGroupTest.java create mode 100644 plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/AutomationCompositionDecoderFileInCsarTest.java delete mode 100644 plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/ControlLoopDecoderFileInCsarParameterGroupTest.java delete mode 100644 plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/ControlLoopDecoderFileInCsarTest.java create mode 100644 plugins/reception-plugins/src/test/resources/parameters/FileInCsarAutomationCompositionDecoderParameters.json create mode 100644 plugins/reception-plugins/src/test/resources/parameters/FileInCsarAutomationCompositionDecoderParametersInvalid.json delete mode 100644 plugins/reception-plugins/src/test/resources/parameters/FileInCsarControlLoopDecoderParameters.json delete mode 100644 plugins/reception-plugins/src/test/resources/parameters/FileInCsarControlLoopDecoderParametersInvalid.json create mode 100644 plugins/reception-plugins/src/test/resources/service-Sampleservice-acm.csar delete mode 100644 plugins/reception-plugins/src/test/resources/service-Sampleservice-controlloop.csar (limited to 'plugins/reception-plugins/src/test') diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/AutomationCompositionDecoderFileInCsarParameterGroupTest.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/AutomationCompositionDecoderFileInCsarParameterGroupTest.java new file mode 100644 index 00000000..ea844e4e --- /dev/null +++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/AutomationCompositionDecoderFileInCsarParameterGroupTest.java @@ -0,0 +1,68 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2022 Nordix Foundation. + * Modifications Copyright (C) 2022 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.distribution.reception.decoding.policy.file; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.onap.policy.common.parameters.ValidationStatus; +import org.onap.policy.distribution.reception.handling.sdc.CommonTestData; + +/** + * Class to perform unit test of {@link AutomationCompositionDecoderFileInCsarParameterGroup}. + * + * @author Sirisha Manchikanti (sirisha.manchikanti@est.tech) + */ +public class AutomationCompositionDecoderFileInCsarParameterGroupTest { + + @Test + public void testValidParameters() { + final AutomationCompositionDecoderFileInCsarParameterGroup configurationParameters = CommonTestData + .getPolicyDecoderParameters( + "src/test/resources/parameters/FileInCsarAutomationCompositionDecoderParameters.json", + AutomationCompositionDecoderFileInCsarParameterGroup.class); + + assertEquals(AutomationCompositionDecoderFileInCsarParameterGroup.class.getSimpleName(), + configurationParameters.getName()); + assertEquals("acm", configurationParameters.getAutomationCompositionType()); + assertEquals(ValidationStatus.CLEAN, configurationParameters.validate().getStatus()); + } + + @Test + public void testInvalidParameters() { + final AutomationCompositionDecoderFileInCsarParameterGroup configurationParameters = + CommonTestData.getPolicyDecoderParameters( + "src/test/resources/parameters/FileInCsarAutomationCompositionDecoderParametersInvalid.json", + AutomationCompositionDecoderFileInCsarParameterGroup.class); + + assertEquals(ValidationStatus.INVALID, configurationParameters.validate().getStatus()); + } + + @Test + public void testEmptyParameters() { + final AutomationCompositionDecoderFileInCsarParameterGroup configurationParameters = + CommonTestData.getPolicyDecoderParameters("src/test/resources/parameters/EmptyParameters.json", + AutomationCompositionDecoderFileInCsarParameterGroup.class); + + assertEquals(ValidationStatus.INVALID, configurationParameters.validate().getStatus()); + } +} diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/AutomationCompositionDecoderFileInCsarTest.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/AutomationCompositionDecoderFileInCsarTest.java new file mode 100644 index 00000000..80c520a4 --- /dev/null +++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/AutomationCompositionDecoderFileInCsarTest.java @@ -0,0 +1,97 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2022 Nordix Foundation. + * Modifications Copyright (C) 2022 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.distribution.reception.decoding.policy.file; + +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.util.Collection; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.runners.MockitoJUnitRunner; +import org.onap.policy.common.parameters.ParameterService; +import org.onap.policy.distribution.model.Csar; +import org.onap.policy.distribution.reception.decoding.PolicyDecodingException; +import org.onap.policy.distribution.reception.handling.sdc.CommonTestData; +import org.onap.policy.models.tosca.authorative.concepts.ToscaEntity; + +/** + * Class to perform unit test of {@link AutomationCompositionDecoderFileInCsar}. + * + * @author Sirisha Manchikanti (sirisha.manchikanti@est.tech) + */ +@RunWith(MockitoJUnitRunner.class) +public class AutomationCompositionDecoderFileInCsarTest { + + /** + * Set up. + */ + @BeforeClass + public static void setUp() { + final AutomationCompositionDecoderFileInCsarParameterGroup configurationParameters = CommonTestData + .getPolicyDecoderParameters( + "src/test/resources/parameters/FileInCsarAutomationCompositionDecoderParameters.json", + AutomationCompositionDecoderFileInCsarParameterGroup.class); + configurationParameters.setName(AutomationCompositionDecoderFileInCsarParameterGroup.class.getSimpleName()); + ParameterService.register(configurationParameters); + } + + /** + * Tear down. + */ + @AfterClass + public static void tearDown() { + ParameterService.deregister(AutomationCompositionDecoderFileInCsarParameterGroup.class.getSimpleName()); + } + + @Test + public void testDecodeAutomationComposition() throws PolicyDecodingException { + + final AutomationCompositionDecoderFileInCsar decoder = new AutomationCompositionDecoderFileInCsar(); + decoder.configure(AutomationCompositionDecoderFileInCsarParameterGroup.class.getSimpleName()); + + final File file = new File("src/test/resources/service-Sampleservice-acm.csar"); + final Csar csar = new Csar(file.getAbsolutePath()); + + assertTrue(decoder.canHandle(csar)); + final Collection automationCompositionHolders = decoder.decode(csar); + assertEquals(1, automationCompositionHolders.size()); + } + + @Test + public void testDecodeAutomationCompositionZipError() { + + final AutomationCompositionDecoderFileInCsar decoder = new AutomationCompositionDecoderFileInCsar(); + decoder.configure(AutomationCompositionDecoderFileInCsarParameterGroup.class.getSimpleName()); + + final File file = new File("unknown.csar"); + final Csar csar = new Csar(file.getAbsolutePath()); + + assertTrue(decoder.canHandle(csar)); + assertThatThrownBy(() -> decoder.decode(csar)).isInstanceOf(PolicyDecodingException.class) + .hasMessageContaining("Failed decoding the acm"); + } +} diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/ControlLoopDecoderFileInCsarParameterGroupTest.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/ControlLoopDecoderFileInCsarParameterGroupTest.java deleted file mode 100644 index 16f80096..00000000 --- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/ControlLoopDecoderFileInCsarParameterGroupTest.java +++ /dev/null @@ -1,67 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * Copyright (C) 2022 Nordix Foundation. - * Modifications Copyright (C) 2022 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.distribution.reception.decoding.policy.file; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; -import org.onap.policy.common.parameters.ValidationStatus; -import org.onap.policy.distribution.reception.handling.sdc.CommonTestData; - -/** - * Class to perform unit test of {@link ControlLoopDecoderFileInCsarParameterGroup}. - * - * @author Sirisha Manchikanti (sirisha.manchikanti@est.tech) - */ -public class ControlLoopDecoderFileInCsarParameterGroupTest { - - @Test - public void testValidParameters() { - final ControlLoopDecoderFileInCsarParameterGroup configurationParameters = CommonTestData - .getPolicyDecoderParameters("src/test/resources/parameters/FileInCsarControlLoopDecoderParameters.json", - ControlLoopDecoderFileInCsarParameterGroup.class); - - assertEquals(ControlLoopDecoderFileInCsarParameterGroup.class.getSimpleName(), - configurationParameters.getName()); - assertEquals("controlloop", configurationParameters.getControlLoopType()); - assertEquals(ValidationStatus.CLEAN, configurationParameters.validate().getStatus()); - } - - @Test - public void testInvalidParameters() { - final ControlLoopDecoderFileInCsarParameterGroup configurationParameters = - CommonTestData.getPolicyDecoderParameters( - "src/test/resources/parameters/FileInCsarControlLoopDecoderParametersInvalid.json", - ControlLoopDecoderFileInCsarParameterGroup.class); - - assertEquals(ValidationStatus.INVALID, configurationParameters.validate().getStatus()); - } - - @Test - public void testEmptyParameters() { - final ControlLoopDecoderFileInCsarParameterGroup configurationParameters = - CommonTestData.getPolicyDecoderParameters("src/test/resources/parameters/EmptyParameters.json", - ControlLoopDecoderFileInCsarParameterGroup.class); - - assertEquals(ValidationStatus.INVALID, configurationParameters.validate().getStatus()); - } -} diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/ControlLoopDecoderFileInCsarTest.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/ControlLoopDecoderFileInCsarTest.java deleted file mode 100644 index e452a7ce..00000000 --- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/ControlLoopDecoderFileInCsarTest.java +++ /dev/null @@ -1,96 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * Copyright (C) 2022 Nordix Foundation. - * Modifications Copyright (C) 2022 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.distribution.reception.decoding.policy.file; - -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.io.File; -import java.util.Collection; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; -import org.onap.policy.common.parameters.ParameterService; -import org.onap.policy.distribution.model.Csar; -import org.onap.policy.distribution.reception.decoding.PolicyDecodingException; -import org.onap.policy.distribution.reception.handling.sdc.CommonTestData; -import org.onap.policy.models.tosca.authorative.concepts.ToscaEntity; - -/** - * Class to perform unit test of {@link ControlLoopDecoderFileInCsar}. - * - * @author Sirisha Manchikanti (sirisha.manchikanti@est.tech) - */ -@RunWith(MockitoJUnitRunner.class) -public class ControlLoopDecoderFileInCsarTest { - - /** - * Set up. - */ - @BeforeClass - public static void setUp() { - final ControlLoopDecoderFileInCsarParameterGroup configurationParameters = CommonTestData - .getPolicyDecoderParameters("src/test/resources/parameters/FileInCsarControlLoopDecoderParameters.json", - ControlLoopDecoderFileInCsarParameterGroup.class); - configurationParameters.setName(ControlLoopDecoderFileInCsarParameterGroup.class.getSimpleName()); - ParameterService.register(configurationParameters); - } - - /** - * Tear down. - */ - @AfterClass - public static void tearDown() { - ParameterService.deregister(ControlLoopDecoderFileInCsarParameterGroup.class.getSimpleName()); - } - - @Test - public void testDecodeControlLoop() throws PolicyDecodingException { - - final ControlLoopDecoderFileInCsar decoder = new ControlLoopDecoderFileInCsar(); - decoder.configure(ControlLoopDecoderFileInCsarParameterGroup.class.getSimpleName()); - - final File file = new File("src/test/resources/service-Sampleservice-controlloop.csar"); - final Csar csar = new Csar(file.getAbsolutePath()); - - assertTrue(decoder.canHandle(csar)); - final Collection controlLoopHolders = decoder.decode(csar); - assertEquals(1, controlLoopHolders.size()); - } - - @Test - public void testDecodeControlLoopZipError() { - - final ControlLoopDecoderFileInCsar decoder = new ControlLoopDecoderFileInCsar(); - decoder.configure(ControlLoopDecoderFileInCsarParameterGroup.class.getSimpleName()); - - final File file = new File("unknown.csar"); - final Csar csar = new Csar(file.getAbsolutePath()); - - assertTrue(decoder.canHandle(csar)); - assertThatThrownBy(() -> decoder.decode(csar)).isInstanceOf(PolicyDecodingException.class) - .hasMessageContaining("Failed decoding the controlloop"); - } -} diff --git a/plugins/reception-plugins/src/test/resources/parameters/FileInCsarAutomationCompositionDecoderParameters.json b/plugins/reception-plugins/src/test/resources/parameters/FileInCsarAutomationCompositionDecoderParameters.json new file mode 100644 index 00000000..672a6677 --- /dev/null +++ b/plugins/reception-plugins/src/test/resources/parameters/FileInCsarAutomationCompositionDecoderParameters.json @@ -0,0 +1,3 @@ +{ + "automationCompositionType": "acm" +} diff --git a/plugins/reception-plugins/src/test/resources/parameters/FileInCsarAutomationCompositionDecoderParametersInvalid.json b/plugins/reception-plugins/src/test/resources/parameters/FileInCsarAutomationCompositionDecoderParametersInvalid.json new file mode 100644 index 00000000..ef58553a --- /dev/null +++ b/plugins/reception-plugins/src/test/resources/parameters/FileInCsarAutomationCompositionDecoderParametersInvalid.json @@ -0,0 +1,3 @@ +{ + "acm": "" +} diff --git a/plugins/reception-plugins/src/test/resources/parameters/FileInCsarControlLoopDecoderParameters.json b/plugins/reception-plugins/src/test/resources/parameters/FileInCsarControlLoopDecoderParameters.json deleted file mode 100644 index ca112388..00000000 --- a/plugins/reception-plugins/src/test/resources/parameters/FileInCsarControlLoopDecoderParameters.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "controlLoopType": "controlloop" -} diff --git a/plugins/reception-plugins/src/test/resources/parameters/FileInCsarControlLoopDecoderParametersInvalid.json b/plugins/reception-plugins/src/test/resources/parameters/FileInCsarControlLoopDecoderParametersInvalid.json deleted file mode 100644 index 9d33896e..00000000 --- a/plugins/reception-plugins/src/test/resources/parameters/FileInCsarControlLoopDecoderParametersInvalid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "controlLoop": "" -} diff --git a/plugins/reception-plugins/src/test/resources/service-Sampleservice-acm.csar b/plugins/reception-plugins/src/test/resources/service-Sampleservice-acm.csar new file mode 100644 index 00000000..226ab158 Binary files /dev/null and b/plugins/reception-plugins/src/test/resources/service-Sampleservice-acm.csar differ diff --git a/plugins/reception-plugins/src/test/resources/service-Sampleservice-controlloop.csar b/plugins/reception-plugins/src/test/resources/service-Sampleservice-controlloop.csar deleted file mode 100644 index 03e29366..00000000 Binary files a/plugins/reception-plugins/src/test/resources/service-Sampleservice-controlloop.csar and /dev/null differ -- cgit 1.2.3-korg