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>

2 files changed, 24 insertions, 21 deletions

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() {

 

diff --git a/src/main/java/org/onap/dcae/restapi/RestfulCollectorServlet.java b/src/main/java/org/onap/dcae/restapi/RestfulCollectorServlet.java
index 7aa82c9f..d664b137 100644
--- a/src/main/java/org/onap/dcae/restapi/RestfulCollectorServlet.java
+++ b/src/main/java/org/onap/dcae/restapi/RestfulCollectorServlet.java
@@ -47,12 +47,11 @@ import com.att.nsa.security.NsaAuthenticator;
 import com.att.nsa.security.authenticators.SimpleAuthenticator;

 import com.att.nsa.security.db.simple.NsaSimpleApiKey;

 

-

 public class RestfulCollectorServlet extends CommonServlet

 {

 

 	public static String authlist;

-	

+

 	public RestfulCollectorServlet ( rrNvReadable settings ) throws loadException, missingReqdSetting

 	{

 		super ( settings, "collector", false );

@@ -76,7 +75,7 @@ public class RestfulCollectorServlet extends CommonServlet
 			// logging. The Restful Collector likely doesn't need API authentication, so for now,

 			// we init the base class services with an in-memory (and empty!) config DB.

 			commonServletSetup ( ConfigDbType.MEMORY );

-			

+

 			VESLogger.setUpEcompLogging();

 

 			// setup the servlet routing and error handling

@@ -101,10 +100,10 @@ public class RestfulCollectorServlet extends CommonServlet
 			if (CommonStartup.authflag > 0) {

 				NsaAuthenticator<NsaSimpleApiKey> NsaAuth;

 				NsaAuth = AuthlistHandler(authlist);

-				

+

 				this.getSecurityManager().addAuthenticator(NsaAuth);

 			}

-			

+

 			log.info ( "Restful Collector Servlet is up." );

 		}

 		catch ( SecurityException e )

@@ -127,13 +126,13 @@ public class RestfulCollectorServlet extends CommonServlet
 		if (authlist != null)

 		{

 			String authpair[] = authlist.split("\\|");

-			for (String pair: authpair) {           

-					String lineid[] = pair.split(",");

-					String listauthid =  lineid[0];	

-					String listauthpwd =  new String(Base64.decodeBase64(lineid[1]));

-					((SimpleAuthenticator) NsaAuth).add(listauthid,listauthpwd);

-		    }

-			

+			for (String pair: authpair) {

+				String lineid[] = pair.split(",");

+				String listauthid =  lineid[0];

+				String listauthpwd =  new String(Base64.decodeBase64(lineid[1]));

+				((SimpleAuthenticator) NsaAuth).add(listauthid,listauthpwd);

+			}

+

 		}

 		else

 		{

@@ -143,8 +142,9 @@ public class RestfulCollectorServlet extends CommonServlet
 		return NsaAuth;

 

 	}

-	

+

 

 	private static final long serialVersionUID = 1L;

 	private static final Logger log = LoggerFactory.getLogger ( RestfulCollectorServlet.class );

 }

+