import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import java.io.FileInputStream;
import java.util.Properties;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.onap.policy.common.endpoints.http.server.HttpServletServer;
+import org.onap.policy.common.endpoints.utils.ParameterUtils;
+import org.onap.policy.common.utils.services.Registry;
+import org.onap.policy.pap.main.PapConstants;
import org.onap.policy.pap.main.PolicyPapException;
+import org.onap.policy.pap.main.comm.PdpModifyRequestMap;
import org.onap.policy.pap.main.parameters.CommonTestData;
import org.onap.policy.pap.main.parameters.PapParameterGroup;
import org.onap.policy.pap.main.parameters.PapParameterHandler;
+import org.onap.policy.pap.main.rest.PapStatisticsManager;
/**
*/
@Before
public void setUp() throws Exception {
- final String[] papConfigParameters =
- {"-c", "parameters/PapConfigParameters.json", "-p", "parameters/topic.properties"};
+ Registry.newRegistry();
+ HttpServletServer.factory.destroy();
+
+ final String[] papConfigParameters = {"-c", "parameters/PapConfigParameters.json"};
final PapCommandLineArguments arguments = new PapCommandLineArguments(papConfigParameters);
final PapParameterGroup parGroup = new PapParameterHandler().getParameters(arguments);
- Properties props = new Properties();
- String propFile = arguments.getFullConfigurationFilePath();
- try (FileInputStream stream = new FileInputStream(propFile)) {
- props.load(stream);
- }
+ Properties props = ParameterUtils.getTopicProperties(parGroup.getTopicParameterGroup());
activator = new PapActivator(parGroup, props);
}
/**
* Method for cleanup after each test.
+ *
* @throws Exception if an error occurs
*/
@After
public void teardown() throws Exception {
if (activator != null && activator.isAlive()) {
- activator.terminate();
+ activator.stop();
}
}
@Test
public void testPapActivator() throws PolicyPapException {
assertFalse(activator.isAlive());
- activator.initialize();
+ activator.start();
assertTrue(activator.isAlive());
assertTrue(activator.getParameterGroup().isValid());
assertEquals(CommonTestData.PAP_GROUP_NAME, activator.getParameterGroup().getName());
+ // ensure items were added to the registry
+ assertNotNull(Registry.get(PapConstants.REG_PDP_MODIFY_LOCK, Object.class));
+ assertNotNull(Registry.get(PapConstants.REG_STATISTICS_MANAGER, PapStatisticsManager.class));
+ assertNotNull(Registry.get(PapConstants.REG_PDP_MODIFY_MAP, PdpModifyRequestMap.class));
+
// repeat - should throw an exception
- assertThatIllegalStateException().isThrownBy(() -> activator.initialize());
+ assertThatIllegalStateException().isThrownBy(() -> activator.start());
assertTrue(activator.isAlive());
assertTrue(activator.getParameterGroup().isValid());
}
- @Test
- public void testGetCurrent_testSetCurrent() {
- assertSame(activator, PapActivator.getCurrent());
- }
-
@Test
public void testTerminate() throws Exception {
- activator.initialize();
- activator.terminate();
+ activator.start();
+ activator.stop();
assertFalse(activator.isAlive());
+ // ensure items have been removed from the registry
+ assertNull(Registry.getOrDefault(PapConstants.REG_PDP_MODIFY_LOCK, Object.class, null));
+ assertNull(Registry.getOrDefault(PapConstants.REG_STATISTICS_MANAGER, PapStatisticsManager.class, null));
+ assertNull(Registry.getOrDefault(PapConstants.REG_PDP_MODIFY_MAP, PdpModifyRequestMap.class, null));
+
// repeat - should throw an exception
- assertThatIllegalStateException().isThrownBy(() -> activator.terminate());
+ assertThatIllegalStateException().isThrownBy(() -> activator.stop());
assertFalse(activator.isAlive());
}
}