Prepare codebase for dynamic DMaaP configuration

From now on, there is only one single place
where we can create whole app core concerning sending events
and it has a single entry point, based on DMaaP configuration.
It can be used to rebuild part of app that is responsible
for sending events dynamically.
Changes are in scope for the dynamic DMaaP config feature.
+ bumped up code coverage a bit

Change-Id: Iecc8c4e534ae9b781f47e3616409271ba83169c8
Signed-off-by: PawelSzalapski <pawel.szalapski@nokia.com>
Issue-ID: DCAEGEN2-517

1 files changed, 4 insertions, 31 deletions

diff --git a/src/test/java/org/onap/dcae/commonFunction/EventProcessorTest.java b/src/test/java/org/onap/dcae/commonFunction/EventProcessorTest.java
index 973ee014..e211c12a 100644
--- a/src/test/java/org/onap/dcae/commonFunction/EventProcessorTest.java
+++ b/src/test/java/org/onap/dcae/commonFunction/EventProcessorTest.java
@@ -20,17 +20,17 @@
  */
 package org.onap.dcae.commonFunction;
 
-import com.att.nsa.cambria.client.CambriaBatchingPublisher;
 import com.google.gson.Gson;
+import java.util.concurrent.atomic.AtomicReference;
 import org.json.JSONObject;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 
 import java.util.List;
+import org.onap.dcae.commonFunction.event.publishing.EventPublisher;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
@@ -52,7 +52,7 @@ public class EventProcessorTest {
     @Test
     public void testLoad() {
         //given
-        EventProcessor ec = new EventProcessor();
+        EventProcessor ec = new EventProcessor(mock(EventPublisher.class));
         ec.event = new org.json.JSONObject(ev);
         //when
         ec.overrideEvent();
@@ -65,7 +65,7 @@ public class EventProcessorTest {
     @Test
     public void shouldParseJsonEvents() throws ReflectiveOperationException {
         //given
-        EventProcessor eventProcessor = new EventProcessor();
+        EventProcessor eventProcessor = new EventProcessor(mock(EventPublisher.class));
         String event_json = "[{ \"filter\": {\"event.commonEventHeader.domain\":\"heartbeat\",\"VESversion\":\"v4\"},\"processors\":[" +
                 "{\"functionName\": \"concatenateValue\",\"args\":{\"field\":\"event.commonEventHeader.eventName\",\"concatenate\": [\"$event.commonEventHeader.domain\",\"$event.commonEventHeader.eventType\",\"$event.faultFields.alarmCondition\"], \"delimiter\":\"_\"}}" +
                 ",{\"functionName\": \"addAttribute\",\"args\":{\"field\": \"event.heartbeatFields.heartbeatFieldsVersion\",\"value\": \"1.0\",\"fieldType\": \"number\"}}" +
@@ -84,32 +84,5 @@ public class EventProcessorTest {
         assertThat(stringArgumentCaptor.getAllValues()).contains("concatenateValue", "addAttribute", "map");
     }
 
-    @Test
-    public void shouldCreateDmaapPublisher() {
-
-        //given
-        EventPublisherHash eph = EventPublisherHash.getInstance();
-        EventProcessor ec = new EventProcessor();
-        ec.event = new org.json.JSONObject(ev);
-        CommonStartup.cambriaConfigFile = "src/test/resources/testDmaapConfig_ip.json";
-
-        //when
-        CambriaBatchingPublisher pub = eph.getDmaapPublisher("sec_fault_ueb");
-
-        //then
-        assertNotNull(pub);
-    }
-
-    @Test
-    public void shouldSendEventWithNoError() {
-
-        EventPublisherHash eph = EventPublisherHash.getInstance();
-        EventProcessor eventProcessor = new EventProcessor();
-        eventProcessor.event = new org.json.JSONObject(ev);
-        CommonStartup.cambriaConfigFile = "src/test/resources/testDmaapConfig_ip.json";
-
-        //when
-        eph.sendEvent(eventProcessor.event, "sec_fault_ueb");
-    }
 }