diff options
Diffstat (limited to 'main/src/test')
| -rw-r--r-- | main/src/test/java/org/onap/policy/distribution/main/startstop/TestDistributionActivator.java | 13 | ||||
| -rw-r--r-- | main/src/test/java/org/onap/policy/distribution/main/startstop/TestMain.java | 5 |
2 files changed, 10 insertions, 8 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 6505dfbe..dd498bfa 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 @@ -2,6 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2018 Ericsson. All rights reserved. * Modifications Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2021 Bell Canada. 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. @@ -59,22 +60,22 @@ public class TestDistributionActivator { final DistributionActivator activator = new DistributionActivator(parGroup); activator.initialize(); - assertTrue(activator.getParameterGroup().isValid()); + assertTrue(activator.getDistributionParameterGroup().isValid()); assertTrue(DistributionActivator.isAlive()); - assertEquals(CommonTestData.DISTRIBUTION_GROUP_NAME, activator.getParameterGroup().getName()); + assertEquals(CommonTestData.DISTRIBUTION_GROUP_NAME, activator.getDistributionParameterGroup().getName()); assertEquals(CommonTestData.RECEPTION_HANDLER_TYPE, - activator.getParameterGroup().getReceptionHandlerParameters() + activator.getDistributionParameterGroup().getReceptionHandlerParameters() .get(CommonTestData.DUMMY_RECEPTION_HANDLER_KEY).getReceptionHandlerType()); assertEquals(CommonTestData.DECODER_TYPE, - activator.getParameterGroup().getReceptionHandlerParameters() + activator.getDistributionParameterGroup().getReceptionHandlerParameters() .get(CommonTestData.DUMMY_RECEPTION_HANDLER_KEY).getPluginHandlerParameters() .getPolicyDecoders().get(CommonTestData.DUMMY_DECODER_KEY).getDecoderType()); assertEquals(CommonTestData.FORWARDER_TYPE, - activator.getParameterGroup().getReceptionHandlerParameters() + activator.getDistributionParameterGroup().getReceptionHandlerParameters() .get(CommonTestData.DUMMY_RECEPTION_HANDLER_KEY).getPluginHandlerParameters() .getPolicyForwarders().get(CommonTestData.DUMMY_ENGINE_FORWARDER_KEY).getForwarderType()); assertEquals(DummyPolicyForwarderParameterGroup.class, - activator.getParameterGroup().getPolicyForwarderConfigurationParameters() + activator.getDistributionParameterGroup().getPolicyForwarderConfigurationParameters() .get(CommonTestData.FORWARDER_CONFIGURATION_PARAMETERS).getClass()); activator.terminate(); assertFalse(DistributionActivator.isAlive()); 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 e00c1810..bdb2ba7d 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 @@ -3,6 +3,7 @@ * Copyright (C) 2018 Ericsson. All rights reserved. * Modifications Copyright (C) 2020-2021 AT&T Inc. * Modifications Copyright (C) 2020 Bell Canada. All rights reserved. + * Modifications Copyright (C) 2021 Bell Canada. 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. @@ -53,8 +54,8 @@ public class TestMain { CommonTestData.makeConfigFile("parameters/DistributionConfigParameters.json"); final String[] distributionConfigParameters = { "-c", CommonTestData.CONFIG_FILE }; final Main main = new Main(distributionConfigParameters); - assertTrue(main.getParameters().isValid()); - assertEquals(CommonTestData.DISTRIBUTION_GROUP_NAME, main.getParameters().getName()); + assertTrue(main.getDistributionParameterGroup().isValid()); + assertEquals(CommonTestData.DISTRIBUTION_GROUP_NAME, main.getDistributionParameterGroup().getName()); main.shutdown(); } |