Remove topic.properties and incorporate into overall config file

[policy/pap.git] / main / src / test / java / org / onap / policy / pap / main / startstop / TestPapActivator.java

diff --git a/main/src/test/java/org/onap/policy/pap/main/startstop/TestPapActivator.java b/main/src/test/java/org/onap/policy/pap/main/startstop/TestPapActivator.java
index 8e8e6c0..fe2e837 100644 (file)
--- a/main/src/test/java/org/onap/policy/pap/main/startstop/TestPapActivator.java
+++ b/main/src/test/java/org/onap/policy/pap/main/startstop/TestPapActivator.java
@@ -21,22 +21,27 @@
 
 package org.onap.policy.pap.main.startstop;
 
+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.assertNotNull;
-import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
+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.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.onap.policy.pap.main.rest.PapStatisticsManager;
 
 
 /**
@@ -46,62 +51,71 @@ import org.slf4j.LoggerFactory;
  */
 public class TestPapActivator {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(TestPapActivator.class);
     private PapActivator activator;
 
     /**
      * Initializes an activator.
+     *
      * @throws Exception if an error occurs
      */
     @Before
     public void setUp() throws Exception {
-        final String[] papConfigParameters = { "-c", "parameters/PapConfigParameters.json" };
+        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);
-        activator = new PapActivator(parGroup);
+
+        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() {
-        try {
-            if (activator != null) {
-                activator.terminate();
-            }
-        } catch (final PolicyPapException exp) {
-            LOGGER.error("teardown failed", exp);
+    public void teardown() throws Exception {
+        if (activator != null && activator.isAlive()) {
+            activator.stop();
         }
     }
 
     @Test
     public void testPapActivator() throws PolicyPapException {
-        try {
-            assertFalse(activator.isAlive());
-            activator.initialize();
-            assertTrue(activator.isAlive());
-            assertTrue(activator.getParameterGroup().isValid());
-            assertEquals(CommonTestData.PAP_GROUP_NAME, activator.getParameterGroup().getName());
-        } catch (final Exception exp) {
-            LOGGER.error("testPapActivator failed", exp);
-            fail("Test should not throw an exception");
-        }
-    }
+        assertFalse(activator.isAlive());
+        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));
 
-    @Test(expected = PolicyPapException.class)
-    public void testPapActivatorError() throws PolicyPapException {
-        activator.initialize();
+        // repeat - should throw an exception
+        assertThatIllegalStateException().isThrownBy(() -> activator.start());
+        assertTrue(activator.isAlive());
         assertTrue(activator.getParameterGroup().isValid());
-        activator.initialize();
     }
 
     @Test
-    public void testGetCurrent_testSetCurrent() {
-        assertNotNull(PapActivator.getCurrent());
+    public void testTerminate() throws Exception {
+        activator.start();
+        activator.stop();
+        assertFalse(activator.isAlive());
 
-        PapActivator.setCurrent(activator);
+        // 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));
 
-        assertSame(activator, PapActivator.getCurrent());
+        // repeat - should throw an exception
+        assertThatIllegalStateException().isThrownBy(() -> activator.stop());
+        assertFalse(activator.isAlive());
     }
 }