diff options
Diffstat (limited to 'main/src/test/java/org/onap/policy/distribution/main/startstop')
3 files changed, 36 insertions, 37 deletions
diff --git a/main/src/test/java/org/onap/policy/distribution/main/startstop/TestDistributionActivator.java b/main/src/test/java/org/onap/policy/distribution/main/startstop/TestDistributionActivator.java index dd498bfa..af0b58e1 100644 --- a/main/src/test/java/org/onap/policy/distribution/main/startstop/TestDistributionActivator.java +++ b/main/src/test/java/org/onap/policy/distribution/main/startstop/TestDistributionActivator.java @@ -22,17 +22,16 @@ package org.onap.policy.distribution.main.startstop; -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 java.io.IOException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.onap.policy.common.parameters.ParameterService; import org.onap.policy.distribution.main.PolicyDistributionException; import org.onap.policy.distribution.main.parameters.CommonTestData; -import org.onap.policy.distribution.main.parameters.DistributionParameterGroup; import org.onap.policy.distribution.main.parameters.DistributionParameterHandler; import org.onap.policy.distribution.main.testclasses.DummyPolicyForwarderParameterGroup; @@ -41,24 +40,24 @@ import org.onap.policy.distribution.main.testclasses.DummyPolicyForwarderParamet * * @author Ram Krishna Verma (ram.krishna.verma@ericsson.com) */ -public class TestDistributionActivator { +class TestDistributionActivator { - @Before - public void setUp() { + @BeforeEach + void setUp() { ParameterService.clear(); } @Test - public void testDistributionActivator() throws PolicyDistributionException, IOException { + void testDistributionActivator() throws PolicyDistributionException, IOException { CommonTestData.makeConfigFile("parameters/DistributionConfigParameters.json"); final String[] distributionConfigParameters = { "-c", CommonTestData.CONFIG_FILE }; - final DistributionCommandLineArguments arguments = + final var arguments = new DistributionCommandLineArguments(distributionConfigParameters); - final DistributionParameterGroup parGroup = new DistributionParameterHandler().getParameters(arguments); + final var parGroup = new DistributionParameterHandler().getParameters(arguments); - final DistributionActivator activator = new DistributionActivator(parGroup); + final var activator = new DistributionActivator(parGroup); activator.initialize(); assertTrue(activator.getDistributionParameterGroup().isValid()); assertTrue(DistributionActivator.isAlive()); diff --git a/main/src/test/java/org/onap/policy/distribution/main/startstop/TestDistributionCommandLineArguments.java b/main/src/test/java/org/onap/policy/distribution/main/startstop/TestDistributionCommandLineArguments.java index 0a0e5fa0..09ab1314 100644 --- a/main/src/test/java/org/onap/policy/distribution/main/startstop/TestDistributionCommandLineArguments.java +++ b/main/src/test/java/org/onap/policy/distribution/main/startstop/TestDistributionCommandLineArguments.java @@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.Assert.assertThrows; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.onap.policy.distribution.main.PolicyDistributionRuntimeException; /** @@ -33,49 +33,49 @@ import org.onap.policy.distribution.main.PolicyDistributionRuntimeException; * @author Adheli Tavares (adheli.tavares@est.tech) * */ -public class TestDistributionCommandLineArguments { +class TestDistributionCommandLineArguments { @Test - public void testDistributionOnlyFileName() { + void testDistributionOnlyFileName() { String[] testArgs = {"src/test/resources/parameters/DistributionConfigParameters.json"}; assertThrows(PolicyDistributionRuntimeException.class, () -> new DistributionCommandLineArguments(testArgs)); } @Test - public void testDistributionCommandLineArgumentsException() { + void testDistributionCommandLineArgumentsException() { String[] wrongParams = {"arg1", "nothing", "{\"someJson\":1}"}; assertThrows(PolicyDistributionRuntimeException.class, () -> new DistributionCommandLineArguments(wrongParams)); } @Test - public void testValidateFileNameEmpty() { + void testValidateFileNameEmpty() { String[] argsOnlyKeyNoValue = {"-c", ""}; assertValidate(argsOnlyKeyNoValue, "policy-distribution configuration file was not specified as an argument"); } @Test - public void testValidateFileNameDoesNotExist() { + void testValidateFileNameDoesNotExist() { String[] fileNameNotExistentArgs = {"-c", "someFileName.json"}; assertValidate(fileNameNotExistentArgs, "policy-distribution configuration file \"someFileName.json\" does not exist"); } @Test - public void testValidateFileNameIsNotFile() { + void testValidateFileNameIsNotFile() { String[] folderAsFileNameArgs = {"-c", "src/test/resources/parameters"}; assertValidate(folderAsFileNameArgs, "policy-distribution configuration file \"src/test/resources/parameters\" is not a normal file"); } @Test - public void testDistributionVersion() { + void testDistributionVersion() { String[] testArgs = {"-v"}; - DistributionCommandLineArguments sutArgs = new DistributionCommandLineArguments(testArgs); + var sutArgs = new DistributionCommandLineArguments(testArgs); assertThat(sutArgs.version()).startsWith("ONAP Policy Framework Distribution Service"); } private void assertValidate(String[] testArgs, String expectedErrorMsg) { - DistributionCommandLineArguments sutArgs = new DistributionCommandLineArguments(testArgs); - assertThatThrownBy(() -> sutArgs.validate()).hasMessage(expectedErrorMsg); + var sutArgs = new DistributionCommandLineArguments(testArgs); + assertThatThrownBy(sutArgs::validate).hasMessage(expectedErrorMsg); } } diff --git a/main/src/test/java/org/onap/policy/distribution/main/startstop/TestMain.java b/main/src/test/java/org/onap/policy/distribution/main/startstop/TestMain.java index bdb2ba7d..831b337b 100644 --- a/main/src/test/java/org/onap/policy/distribution/main/startstop/TestMain.java +++ b/main/src/test/java/org/onap/policy/distribution/main/startstop/TestMain.java @@ -25,12 +25,12 @@ package org.onap.policy.distribution.main.startstop; import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.onap.policy.common.parameters.ParameterService; import org.onap.policy.common.utils.resources.MessageConstants; import org.onap.policy.distribution.main.PolicyDistributionException; @@ -42,25 +42,25 @@ import org.onap.policy.distribution.main.parameters.CommonTestData; * * @author Ram Krishna Verma (ram.krishna.verma@ericsson.com) */ -public class TestMain { +class TestMain { - @Before - public void setUp() { + @BeforeEach + void setUp() { ParameterService.clear(); } @Test - public void testMain() throws PolicyDistributionException, IOException { + void testMain() throws PolicyDistributionException, IOException { CommonTestData.makeConfigFile("parameters/DistributionConfigParameters.json"); final String[] distributionConfigParameters = { "-c", CommonTestData.CONFIG_FILE }; - final Main main = new Main(distributionConfigParameters); + final var main = new Main(distributionConfigParameters); assertTrue(main.getDistributionParameterGroup().isValid()); assertEquals(CommonTestData.DISTRIBUTION_GROUP_NAME, main.getDistributionParameterGroup().getName()); main.shutdown(); } @Test - public void testMain_NoArguments() { + void testMain_NoArguments() { final String[] distributionConfigParameters = {}; assertThatThrownBy(() -> new Main(distributionConfigParameters)) .isInstanceOf(PolicyDistributionRuntimeException.class) @@ -68,7 +68,7 @@ public class TestMain { } @Test - public void testMain_InvalidArguments() { + void testMain_InvalidArguments() { final String[] distributionConfigParameters = {"parameters/DistributionConfigParameters.json"}; assertThatThrownBy(() -> new Main(distributionConfigParameters)) .isInstanceOf(PolicyDistributionRuntimeException.class) @@ -76,7 +76,7 @@ public class TestMain { } @Test - public void testMain_Help() { + void testMain_Help() { assertThatCode(() -> { final String[] distributionConfigParameters = { "-h" }; @@ -85,7 +85,7 @@ public class TestMain { } @Test - public void testMain_InvalidParameters() { + void testMain_InvalidParameters() { final String[] distributionConfigParameters = {"-c", "parameters/DistributionConfigParameters_InvalidName.json"}; assertThatThrownBy(() -> new Main(distributionConfigParameters)) |