From 875136b42a4b64760486829dc832d659de2a2ffc Mon Sep 17 00:00:00 2001
From: PawelSzalapski <pawel.szalapski@nokia.com>
Date: Wed, 6 Jun 2018 15:30:06 +0200
Subject: Refactor tests to check actual behavior of methods

Testcases were skimming through the code, but actually make no asserts.

Change-Id: Icba8fe890c01fc11a4507ca468ab4d9b6141caf9
Issue-ID: DCAEGEN2-524
Signed-off-by: PawelSzalapski <pawel.szalapski@nokia.com>
---
 .../org/onap/dcae/commonFunction/EventProcessor.java  | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'src/main/java/org/onap/dcae/commonFunction/EventProcessor.java')

diff --git a/src/main/java/org/onap/dcae/commonFunction/EventProcessor.java b/src/main/java/org/onap/dcae/commonFunction/EventProcessor.java
index 04687b32..6dd2f5c8 100644
--- a/src/main/java/org/onap/dcae/commonFunction/EventProcessor.java
+++ b/src/main/java/org/onap/dcae/commonFunction/EventProcessor.java
@@ -25,6 +25,7 @@ import com.att.nsa.logging.LoggingContext;
 import com.att.nsa.logging.log4j.EcompFields;
 import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
+import java.util.Map;
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,7 +39,6 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
-import java.util.TimeZone;
 
 
 public class EventProcessor implements Runnable {
@@ -50,23 +50,26 @@ public class EventProcessor implements Runnable {
     }.getType();
     private final SimpleDateFormat dateFormat = new SimpleDateFormat("EEE, MM dd yyyy hh:mm:ss z");
 
-    private static HashMap<String, String[]> streamidHash = new HashMap<>();
-    JSONObject event;
+	static Map<String, String[]> streamidHash = new HashMap<>();
+	public JSONObject event;
 
     public EventProcessor() {
-        dateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
-        String[] list = CommonStartup.streamid.split("\\|");
+        streamidHash = parseStreamIdToStreamHashMapping(CommonStartup.streamid);
+    }
+
+    private Map<String, String[]> parseStreamIdToStreamHashMapping(String streamId) {
+        Map<String, String[]> streamidHash = new HashMap<>();
+        String[] list = streamId.split("\\|");
         for (String aList : list) {
             String domain = aList.split("=")[0];
-
             String[] streamIdList = aList.substring(aList.indexOf('=') + 1).split(",");
 
-            log.debug(String.format("Domain: %s streamIdList:%s", domain, Arrays.toString(streamIdList)));
             streamidHash.put(domain, streamIdList);
         }
-
+        return streamidHash;
     }
 
+
     @Override
     public void run() {
 
-- 
cgit 1.2.3-korg