diff options
Diffstat (limited to 'plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api')
4 files changed, 55 insertions, 57 deletions
diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiAutomationCompositionForwarderParametersTest.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiAutomationCompositionForwarderParametersTest.java index 1904edc7..091b245c 100644 --- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiAutomationCompositionForwarderParametersTest.java +++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiAutomationCompositionForwarderParametersTest.java @@ -22,10 +22,10 @@ package org.onap.policy.distribution.forwarding.lifecycle.api; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.onap.policy.common.parameters.ValidationStatus; import org.onap.policy.distribution.forwarding.testclasses.CommonTestData; @@ -34,7 +34,7 @@ import org.onap.policy.distribution.forwarding.testclasses.CommonTestData; * * @author Sirisha Manchikanti (sirisha.manchikanti@est.tech) */ -public class LifecycleApiAutomationCompositionForwarderParametersTest { +class LifecycleApiAutomationCompositionForwarderParametersTest { private static final String AUTOMATION_COMPOSITION_RUNTIME_HOST_NAME = "localhost"; private static final int AUTOMATION_COMPOSITION_RUNTIME_PORT = 6969; @@ -43,8 +43,8 @@ public class LifecycleApiAutomationCompositionForwarderParametersTest { @Test - public void testValidParameters() { - final LifecycleApiAutomationCompositionForwarderParameters configurationParameters = + void testValidParameters() { + final var configurationParameters = CommonTestData.getPolicyForwarderParameters( "src/test/resources/parameters/LifecycleApiAutomationCompositionForwarderParameters.json", LifecycleApiAutomationCompositionForwarderParameters.class); @@ -67,8 +67,8 @@ public class LifecycleApiAutomationCompositionForwarderParametersTest { } @Test - public void testInvalidParameters() { - final LifecycleApiForwarderParameters configurationParameters = + void testInvalidParameters() { + final var configurationParameters = CommonTestData.getPolicyForwarderParameters( "src/test/resources/parameters/LifecycleApiPolicyForwarderParametersInvalid.json", LifecycleApiForwarderParameters.class); @@ -77,8 +77,8 @@ public class LifecycleApiAutomationCompositionForwarderParametersTest { } @Test - public void testEmptyParameters() { - final LifecycleApiForwarderParameters configurationParameters = + void testEmptyParameters() { + final var configurationParameters = CommonTestData.getPolicyForwarderParameters("src/test/resources/parameters/EmptyParameters.json", LifecycleApiForwarderParameters.class); diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiAutomationCompositionForwarderTest.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiAutomationCompositionForwarderTest.java index 0c9a8f6e..f28b52e5 100644 --- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiAutomationCompositionForwarderTest.java +++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiAutomationCompositionForwarderTest.java @@ -25,10 +25,9 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.util.ArrayList; import java.util.Collection; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.onap.policy.common.parameters.ParameterGroup; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.onap.policy.common.parameters.ParameterService; import org.onap.policy.common.utils.coder.CoderException; import org.onap.policy.common.utils.coder.StandardCoder; @@ -45,7 +44,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; * * @author Sirisha Manchikanti (sirisha.manchikanti@est.tech) */ -public class LifecycleApiAutomationCompositionForwarderTest { +class LifecycleApiAutomationCompositionForwarderTest { private static final String AUTOMATION_COMPOSITION = "src/test/resources/parameters/sample_automation_composition.json"; @@ -60,9 +59,9 @@ public class LifecycleApiAutomationCompositionForwarderTest { * @throws PolicyForwardingException if any error occurs * @throws InterruptedException if any error occurs */ - @BeforeClass - public static void setUp() throws PolicyForwardingException, CoderException, InterruptedException { - final ParameterGroup parameterGroup = CommonTestData.getPolicyForwarderParameters( + @BeforeAll + static void setUp() throws PolicyForwardingException, CoderException, InterruptedException { + final var parameterGroup = CommonTestData.getPolicyForwarderParameters( "src/test/resources/parameters/LifecycleApiAutomationCompositionForwarderParameters.json", LifecycleApiAutomationCompositionForwarderParameters.class); ParameterService.register(parameterGroup); @@ -75,19 +74,19 @@ public class LifecycleApiAutomationCompositionForwarderTest { /** * Tear down. */ - @AfterClass - public static void tearDown() { + @AfterAll + static void tearDown() { ParameterService.deregister(LifecycleApiAutomationCompositionForwarderParameters.class.getSimpleName()); simulator.stopLifecycycleApiSimulator(); } @Test - public void testForwardAutomationCompositionUsingSimulator() throws Exception { + void testForwardAutomationCompositionUsingSimulator() throws Exception { assertThatCode(() -> { - final ToscaServiceTemplate toscaServiceTemplate = standardCoder.decode( + final var toscaServiceTemplate = standardCoder.decode( ResourceUtils.getResourceAsString(AUTOMATION_COMPOSITION), ToscaServiceTemplate.class); - final LifecycleApiAutomationCompositionForwarder forwarder = + final var forwarder = new LifecycleApiAutomationCompositionForwarder(); forwarder.configure(LifecycleApiAutomationCompositionForwarderParameters.class.getSimpleName()); @@ -100,12 +99,12 @@ public class LifecycleApiAutomationCompositionForwarderTest { } @Test - public void testForwardAutomationCompositionFailureUsingSimulator() throws Exception { + void testForwardAutomationCompositionFailureUsingSimulator() throws Exception { - final ToscaEntity toscaEntity = new ToscaEntity(); + final var toscaEntity = new ToscaEntity(); toscaEntity.setName("FailureCase"); - final LifecycleApiAutomationCompositionForwarder forwarder = new LifecycleApiAutomationCompositionForwarder(); + final var forwarder = new LifecycleApiAutomationCompositionForwarder(); forwarder.configure(LifecycleApiAutomationCompositionForwarderParameters.class.getSimpleName()); final Collection<ToscaEntity> automationCompositionList = new ArrayList<>(); diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiForwarderParametersTest.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiForwarderParametersTest.java index 42602cf7..2cee6e6c 100644 --- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiForwarderParametersTest.java +++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiForwarderParametersTest.java @@ -22,11 +22,11 @@ package org.onap.policy.distribution.forwarding.lifecycle.api; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.onap.policy.common.parameters.ValidationStatus; import org.onap.policy.distribution.forwarding.testclasses.CommonTestData; @@ -35,7 +35,7 @@ import org.onap.policy.distribution.forwarding.testclasses.CommonTestData; * * @author Ram Krishna Verma (ram.krishna.verma@est.tech) */ -public class LifecycleApiForwarderParametersTest { +class LifecycleApiForwarderParametersTest { private static final String POLICY_API_HOST_NAME = "localhost"; private static final int POLICY_API_PORT = 6969; @@ -48,8 +48,8 @@ public class LifecycleApiForwarderParametersTest { @Test - public void testValidParameters() { - final LifecycleApiForwarderParameters configurationParameters = + void testValidParameters() { + final var configurationParameters = CommonTestData.getPolicyForwarderParameters( "src/test/resources/parameters/LifecycleApiPolicyForwarderParameters.json", LifecycleApiForwarderParameters.class); @@ -73,8 +73,8 @@ public class LifecycleApiForwarderParametersTest { } @Test - public void testInvalidParameters() { - final LifecycleApiForwarderParameters configurationParameters = + void testInvalidParameters() { + final var configurationParameters = CommonTestData.getPolicyForwarderParameters( "src/test/resources/parameters/LifecycleApiPolicyForwarderParametersInvalid.json", LifecycleApiForwarderParameters.class); @@ -83,8 +83,8 @@ public class LifecycleApiForwarderParametersTest { } @Test - public void testEmptyParameters() { - final LifecycleApiForwarderParameters configurationParameters = + void testEmptyParameters() { + final var configurationParameters = CommonTestData.getPolicyForwarderParameters("src/test/resources/parameters/EmptyParameters.json", LifecycleApiForwarderParameters.class); diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarderTest.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarderTest.java index 604445ed..ba85505d 100644 --- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarderTest.java +++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarderTest.java @@ -26,10 +26,9 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.util.ArrayList; import java.util.Collection; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.onap.policy.common.parameters.ParameterGroup; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.onap.policy.common.parameters.ParameterService; import org.onap.policy.common.utils.coder.CoderException; import org.onap.policy.common.utils.coder.StandardCoder; @@ -46,7 +45,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; * * @author Ram Krishna Verma (ram.krishna.verma@est.tech) */ -public class LifecycleApiPolicyForwarderTest { +class LifecycleApiPolicyForwarderTest { private static final String POLICY = "src/test/resources/parameters/sample_policy.json"; private static final String POLICY_ERROR = "src/test/resources/parameters/sample_policy_failure.json"; @@ -61,9 +60,9 @@ public class LifecycleApiPolicyForwarderTest { * @throws PolicyForwardingException if any error occurs * @throws InterruptedException if any error occurs */ - @BeforeClass - public static void setUp() throws PolicyForwardingException, CoderException, InterruptedException { - final ParameterGroup parameterGroup = CommonTestData.getPolicyForwarderParameters( + @BeforeAll + static void setUp() throws PolicyForwardingException, CoderException, InterruptedException { + final var parameterGroup = CommonTestData.getPolicyForwarderParameters( "src/test/resources/parameters/LifecycleApiPolicyForwarderParameters.json", LifecycleApiForwarderParameters.class); ParameterService.register(parameterGroup); @@ -76,21 +75,21 @@ public class LifecycleApiPolicyForwarderTest { /** * Tear down. */ - @AfterClass - public static void tearDown() { + @AfterAll + static void tearDown() { ParameterService.deregister(LifecycleApiForwarderParameters.class.getSimpleName()); simulator.stopLifecycycleApiSimulator(); } @Test - public void testForwardPolicyUsingSimulator() throws Exception { + void testForwardPolicyUsingSimulator() throws Exception { assertThatCode(() -> { - final ToscaServiceTemplate toscaServiceTemplate1 = + final var toscaServiceTemplate1 = standardCoder.decode(ResourceUtils.getResourceAsString(POLICY_TYPE), ToscaServiceTemplate.class); - final ToscaServiceTemplate toscaServiceTemplate2 = + final var toscaServiceTemplate2 = standardCoder.decode(ResourceUtils.getResourceAsString(POLICY), ToscaServiceTemplate.class); - final LifecycleApiPolicyForwarder forwarder = new LifecycleApiPolicyForwarder(); + final var forwarder = new LifecycleApiPolicyForwarder(); forwarder.configure(LifecycleApiForwarderParameters.class.getSimpleName()); final Collection<ToscaEntity> policies = new ArrayList<>(); @@ -103,17 +102,17 @@ public class LifecycleApiPolicyForwarderTest { } @Test - public void testForwardPolicyFailureUsingSimulator() throws Exception { + void testForwardPolicyFailureUsingSimulator() throws Exception { - final ToscaServiceTemplate toscaServiceTemplate1 = + final var toscaServiceTemplate1 = standardCoder.decode(ResourceUtils.getResourceAsString(POLICY_TYPE), ToscaServiceTemplate.class); - final ToscaServiceTemplate toscaServiceTemplate2 = + final var toscaServiceTemplate2 = standardCoder.decode(ResourceUtils.getResourceAsString(POLICY), ToscaServiceTemplate.class); - final ToscaServiceTemplate toscaServiceTemplate3 = + final var toscaServiceTemplate3 = standardCoder.decode(ResourceUtils.getResourceAsString(POLICY_ERROR), ToscaServiceTemplate.class); - final ToscaEntity unsupportedPolicy = new UnsupportedPolicy(); + final var unsupportedPolicy = new UnsupportedPolicy(); - final LifecycleApiPolicyForwarder forwarder = new LifecycleApiPolicyForwarder(); + final var forwarder = new LifecycleApiPolicyForwarder(); forwarder.configure(LifecycleApiForwarderParameters.class.getSimpleName()); final Collection<ToscaEntity> policies = new ArrayList<>(); |