AbstractListener unit tests

Improved code coverage.

Change-Id: I131f8bbbc72e0587572baa340d10fb56f6a1c5bc
Issue-ID: APPC-747
Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>

diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/AbstractListener.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/AbstractListener.java
index 89c75a3..be19cf3 100644 (file)
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/AbstractListener.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/AbstractListener.java
@@ -43,18 +43,13 @@ public abstract class AbstractListener implements Listener {
     private final EELFLogger LOG = EELFManager.getInstance().getLogger(AbstractListener.class);
 
     protected AtomicBoolean run = new AtomicBoolean(false);
-
     protected int QUEUED_MIN = 1;
     protected int QUEUED_MAX = 10;
-
     protected int THREAD_MIN = 4;
     protected int THREAD_MAX = THREAD_MIN; // Fixed thread pool
     protected int THREAD_SCALE_DOWN_SEC = 10; // Number of seconds to wait until we remove idle threads
-
     protected ThreadPoolExecutor executor;
-
     protected EventHandler dmaap;
-
     protected ListenerProperties props;
 
     private String listenerId;
@@ -157,6 +152,5 @@ public abstract class AbstractListener implements Listener {
         public void rejectedExecution(Runnable r, ThreadPoolExecutor executor) {
             LOG.error(String.format("A job was rejected. [%s]", r));
         }
-
     }
 }

diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/onap/appc/listener/TestAbstractListener.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/onap/appc/listener/AbstractListenerTest.java
similarity index 55%
rename from appc-event-listener/appc-event-listener-bundle/src/test/java/org/onap/appc/listener/TestAbstractListener.java
rename to appc-event-listener/appc-event-listener-bundle/src/test/java/org/onap/appc/listener/AbstractListenerTest.java
index a21bcd4..9a408ac 100644 (file)
--- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/onap/appc/listener/TestAbstractListener.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/onap/appc/listener/AbstractListenerTest.java
@@ -28,30 +28,24 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import java.util.Properties;
+import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 
+import java.util.concurrent.TimeUnit;
 import org.junit.Before;
 import org.junit.Test;
 import org.onap.appc.listener.AbstractListener;
 import org.onap.appc.listener.ListenerProperties;
+import sun.awt.windows.ThemeReader;
 
-public class TestAbstractListener {
-
-    private class DummyListener extends AbstractListener {
-        public DummyListener(ListenerProperties props) {
-            super(props);
-        }
-
-        public boolean getRun() {
-            return run.get();
-        }
-
-        public ThreadPoolExecutor getExecutor() {
-            return executor;
-        }
-    }
+public class AbstractListenerTest {
 
     private DummyListener listener;
     private ListenerProperties props;
@@ -65,37 +59,96 @@ public class TestAbstractListener {
     }
 
     @Test
-    public void testRun() {
-        Thread t = new Thread(listener);
-        t.run();
-        assertFalse(t.isAlive()); // Should die immediately
-    }
+    public void stop_should_shutdown_executor() {
+
+        EventHandler mockEventHandler = mock(EventHandler.class);
+        listener.setEventHandler(mockEventHandler);
+
+        Thread thread = new Thread(listener);
+        thread.start();
+
+        assertTrue(thread.isAlive());
+        assertTrue(listener.getRun());
+        assertFalse(listener.getExecutor().isShutdown());
+        assertFalse(listener.getExecutor().isTerminated());
 
-    @Test
-    public void testStop() {
         listener.stop();
+
         assertFalse(listener.getRun());
         assertTrue(listener.getExecutor().isShutdown());
+        assertTrue(listener.getExecutor().isTerminated());
+
+        verify(mockEventHandler).closeClients();
+
     }
 
     @Test
-    public void testStopNow() {
+    public void stopNow_should_clear_executors_queue_and_call_stop() throws InterruptedException {
+        EventHandler mockEventHandler = mock(EventHandler.class);
+        listener.setEventHandler(mockEventHandler);
+
+        ThreadPoolExecutor mockExecutor = mock(ThreadPoolExecutor.class);
+        BlockingQueue<Runnable> mockBlockingQueue = mock(BlockingQueue.class);
+        listener.setExecutor(mockExecutor);
+        when(mockExecutor.getQueue()).thenReturn(mockBlockingQueue);
+
+        Thread thread = new Thread(listener);
+        thread.start();
+
+        assertTrue(thread.isAlive());
+        assertTrue(listener.getRun());
+
         listener.stopNow();
+
         assertFalse(listener.getRun());
-        assertTrue(listener.getExecutor().isShutdown());
+        verify(mockExecutor).shutdown();
+        verify(mockExecutor).awaitTermination(anyLong(), any(TimeUnit.class));
+        verify(mockBlockingQueue).clear();
+        verify(mockEventHandler).closeClients();
     }
 
     @Test
-    public void testBenchmark() {
+    public void getBenchmark_result_should_contain_listenerId() {
         String out = listener.getBenchmark();
         assertNotNull(out);
         assertTrue(out.contains(listener.getListenerId()));
     }
 
     @Test
-    public void testListenerId() {
+    public void getListenerId_should_return_properties_prefix_by_default() {
         assertEquals(props.getPrefix(), listener.getListenerId());
         listener.setListenerId("newId");
         assertEquals("newId", listener.getListenerId());
     }
+
+
+    private class DummyListener extends AbstractListener {
+
+        DummyListener(ListenerProperties props) {
+            super(props);
+        }
+
+        boolean getRun() {
+            return run.get();
+        }
+
+        public ThreadPoolExecutor getExecutor() {
+            return executor;
+        }
+
+        void setEventHandler(EventHandler eventHandler){
+            dmaap = eventHandler;
+        }
+
+        void setExecutor(ThreadPoolExecutor executor){
+            this.executor = executor;
+        }
+
+        @Override
+        public void run() {
+
+            while (run.get()) {
+            }
+        }
+    }
 }

diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/onap/appc/listener/TestAppcDmaapListenerActivator.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/onap/appc/listener/AppcEventListenerActivatorTest.java
similarity index 93%
rename from appc-event-listener/appc-event-listener-bundle/src/test/java/org/onap/appc/listener/TestAppcDmaapListenerActivator.java
rename to appc-event-listener/appc-event-listener-bundle/src/test/java/org/onap/appc/listener/AppcEventListenerActivatorTest.java
index f8cbdb3..817c8fa 100644 (file)
--- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/onap/appc/listener/TestAppcDmaapListenerActivator.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/onap/appc/listener/AppcEventListenerActivatorTest.java
@@ -38,7 +38,7 @@ import static org.mockito.Mockito.doReturn;
 
 import org.onap.appc.listener.AppcEventListenerActivator;
 
-public class TestAppcDmaapListenerActivator {
+public class AppcEventListenerActivatorTest {
 
     @Test
     public void testStartStopDefaultProperties() {
@@ -53,21 +53,21 @@ public class TestAppcDmaapListenerActivator {
         }
         assertNotNull(appc.getName());
     }
-    
+
     @Test
     public void testStartStopEmptyProperties() {
         InputStream input = getClass().getResourceAsStream("/org/onap/appc/empty.properties");
         Properties props = new Properties();
-         try {
-             props.load(input);
-         } catch (IOException e) {
-             e.printStackTrace();
-         }
+        try {
+            props.load(input);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
 
         AppcEventListenerActivator appc = new AppcEventListenerActivator();
         AppcEventListenerActivator spyAppc = Mockito.spy(appc);
         doReturn(props).when(spyAppc).getProperties();
-        
+
         try {
             spyAppc.start(null);
             Thread.sleep(1000);

diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/onap/appc/listener/TestListenerProperties.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/onap/appc/listener/ListenerPropertiesTest.java
similarity index 99%
rename from appc-event-listener/appc-event-listener-bundle/src/test/java/org/onap/appc/listener/TestListenerProperties.java
rename to appc-event-listener/appc-event-listener-bundle/src/test/java/org/onap/appc/listener/ListenerPropertiesTest.java
index 42c2633..79a18ce 100644 (file)
--- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/onap/appc/listener/TestListenerProperties.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/onap/appc/listener/ListenerPropertiesTest.java
@@ -40,7 +40,7 @@ import org.onap.appc.listener.AbstractListener;
 import org.onap.appc.listener.ListenerProperties;
 import org.onap.appc.listener.ListenerProperties.KEYS;
 
-public class TestListenerProperties {
+public class ListenerPropertiesTest {
 
     private Properties good, bad, both;
     private String prefix;