Merge "Refactor tests to check actual behavior of methods"

4 files changed, 153 insertions, 193 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 );

 }

+

diff --git a/src/test/java/org/onap/dcae/commonFunction/TestCommonStartup.java b/src/test/java/org/onap/dcae/commonFunction/TestCommonStartup.java
new file mode 100644
index 00000000..18194864
--- /dev/null
+++ b/src/test/java/org/onap/dcae/commonFunction/TestCommonStartup.java
@@ -0,0 +1,129 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PROJECT
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.dcae.commonFunction;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
+
+import com.att.nsa.cmdLine.NsaCommandLineUtil;
+import com.att.nsa.drumlin.service.framework.context.DrumlinRequest;
+import com.att.nsa.drumlin.till.nv.impl.nvReadableStack;
+import com.att.nsa.drumlin.till.nv.impl.nvReadableTable;
+import com.att.nsa.drumlin.till.nv.rrNvReadable.loadException;
+import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting;
+import com.att.nsa.security.authenticators.SimpleAuthenticator;
+import com.att.nsa.security.db.simple.NsaSimpleApiKey;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Base64;
+import java.util.Map;
+import java.util.concurrent.LinkedBlockingQueue;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.onap.dcae.commonFunction.CommonStartup.QueueFullException;
+import org.onap.dcae.restapi.RestfulCollectorServlet;
+
+
+public class TestCommonStartup {
+
+    @Test
+    public void testParseCLIArguments() {
+        // given
+        String args[] = {"-a", "aa"};
+        Map<String, String> argMap = NsaCommandLineUtil.processCmdLine(args, true);
+        // when
+        nvReadableStack settings = new nvReadableStack();
+        settings.push(new nvReadableTable(argMap));
+
+        // then
+        assertEquals(settings.getString("a", "default"), "aa");
+    }
+
+    @Test
+    public void shouldPutValidVESEventOnProcessingQueueWithoutExceptions() throws IOException, QueueFullException {
+        // given
+        CommonStartup.fProcessingInputQueue = new LinkedBlockingQueue<>(
+            CommonStartup.KDEFAULT_MAXQUEUEDEVENTS);
+        JsonElement vesEvent = new JsonParser().parse(new FileReader("src/test/resources/VES_valid.txt"));
+        JSONObject validVESEvent = new JSONObject(vesEvent.toString());
+        JSONArray jsonArrayMod = new JSONArray().put(validVESEvent);
+
+        // then
+        CommonStartup.handleEvents(jsonArrayMod);
+    }
+
+
+    @Test
+    public void testParseStreamIdToStreamHashMapping() {
+        // given
+        CommonStartup.streamid = "fault=sec_fault|syslog=sec_syslog|heartbeat=sec_heartbeat|measurementsForVfScaling=sec_measurement|mobileFlow=sec_mobileflow|other=sec_other|stateChange=sec_statechange|thresholdCrossingAlert=sec_thresholdCrossingAlert|voiceQuality=ves_voicequality|sipSignaling=ves_sipsignaling";
+        EventProcessor eventProcessor = new EventProcessor();
+
+        // when
+        Map<String, String[]> streamHashMapping = EventProcessor.streamidHash;
+
+        // then
+        assertEquals(streamHashMapping.get("fault")[0], "sec_fault");
+        assertEquals(streamHashMapping.get("measurementsForVfScaling")[0], "sec_measurement");
+    }
+
+    @Test
+    public void testAuthListHandler() throws loadException, missingReqdSetting {
+        // given
+        final nvReadableStack settings = new nvReadableStack();
+
+        String user1 = "secureid";
+        String password1Hashed = "IWRjYWVSb2FkbTEyMyEt";
+        String password1UnHashed = decode("IWRjYWVSb2FkbTEyMyEt");
+        String user2 = "sample1";
+        String password2Hashed = "c2FtcGxlMQ";
+
+        String authlist = user1 + "," + password1Hashed + "|" + user2 + "," + password2Hashed;
+
+        RestfulCollectorServlet rsv = new RestfulCollectorServlet(settings);
+
+        DrumlinRequest drumlinRequestMock = Mockito.mock(DrumlinRequest.class);
+
+        String basicHeaderForUser1 = "Basic " + encode(user1, password1UnHashed);
+        when(drumlinRequestMock.getFirstHeader("Authorization")).thenReturn(basicHeaderForUser1);
+
+        // when
+        SimpleAuthenticator simpleAuthenticator = (SimpleAuthenticator) rsv.AuthlistHandler(authlist);
+        NsaSimpleApiKey authentic = simpleAuthenticator.isAuthentic(drumlinRequestMock);
+
+        // then
+        assertEquals(authentic.getSecret(), password1UnHashed);
+    }
+
+    private String decode(String hashedPassword) {
+        return new String(Base64.getDecoder().decode(hashedPassword.getBytes()));
+    }
+
+    private String encode(String user1, String password1UnHashed) {
+        return Base64.getEncoder().encodeToString((user1 + ":" + password1UnHashed).getBytes());
+    }
+
+}
+
+
diff --git a/src/test/java/org/onap/dcae/vestest/TestCommonStartup.java b/src/test/java/org/onap/dcae/vestest/TestCommonStartup.java
deleted file mode 100644
index aa56c611..00000000
--- a/src/test/java/org/onap/dcae/vestest/TestCommonStartup.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * PROJECT

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- *

- *      http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-package org.onap.dcae.vestest;

-

-import java.io.FileReader;

-import java.io.IOException;

-import java.net.URL;

-import java.util.Map;

-import java.util.concurrent.LinkedBlockingQueue;

-

-import org.json.JSONArray;

-import org.json.JSONException;

-import org.json.JSONObject;

-import org.junit.After;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Test;

-import org.onap.dcae.commonFunction.CommonStartup;

-import org.onap.dcae.commonFunction.EventProcessor;

-import org.onap.dcae.commonFunction.CommonStartup.QueueFullException;

-import org.onap.dcae.restapi.RestfulCollectorServlet;

-

-import com.att.nsa.cmdLine.NsaCommandLineUtil;

-import com.att.nsa.drumlin.service.framework.DrumlinServlet;

-import com.att.nsa.drumlin.till.nv.rrNvReadable.loadException;

-import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting;

-import com.att.nsa.security.NsaAuthenticator;

-import com.att.nsa.security.authenticators.SimpleAuthenticator;

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

-import com.google.gson.JsonParser;

-import com.att.nsa.drumlin.till.nv.impl.nvPropertiesFile;

-import com.att.nsa.drumlin.till.nv.impl.nvReadableStack;

-import com.att.nsa.drumlin.till.nv.impl.nvReadableTable;

-

-

-public class TestCommonStartup {

-

-        String payload = null;

-        @Before

-        public void setUp() throws Exception {

-

-                // process command line arguments

-                payload = new JsonParser().parse(new FileReader("src/test/resources/VES_valid.txt")).toString();

-                CommonStartup.fProcessingInputQueue = new LinkedBlockingQueue<JSONObject> (CommonStartup.KDEFAULT_MAXQUEUEDEVENTS);

-        }

-

-        @After

-        public void tearDown() throws Exception {

-

-        }

-

-        @Test

-        public void testCommonStartupload() {

-

-                String args[] = { "junittest" };

-                final Map<String, String> argMap = NsaCommandLineUtil.processCmdLine(args, true);

-                final String config = NsaCommandLineUtil.getSetting(argMap, "c", "collector.properties");

-                final URL settingStream = DrumlinServlet.findStream(config, CommonStartup.class);

-

-                final nvReadableStack settings = new nvReadableStack();

-                try {

-                        settings.push(new nvPropertiesFile(settingStream));

-                } catch (loadException e) {

-                        // TODO Auto-generated catch block

-                        e.printStackTrace();

-                }

-                settings.push(new nvReadableTable(argMap));

-                Assert.assertEquals("true", "true");

-        }

-

-        @Test

-        public void testhandleevent() {

-                JSONArray jsonArrayMod = new JSONArray().put(new JSONObject(payload));

-                try {

-

-

-                        CommonStartup.handleEvents (jsonArrayMod);

-                } catch ( JSONException | QueueFullException | IOException e) {

-                        // TODO Auto-generated catch block

-                        //e.printStackTrace();

-                        System.out.println("junit reported:" + e.getMessage());

-                }

-                Assert.assertEquals("true", "true");

-        }

-

-

-/*

-        @Test

-        public void testServlet()  {

-                try

-                {

-                        RestfulCollectorServlet rsv = new RestfulCollectorServlet(null);

-                }

-                catch (NullPointerException|loadException| missingReqdSetting e){

-                        System.out.println("junit reported:" + e.getMessage());

-                }

-                Assert.assertEquals("true", "true");

-        }

-*/

-

-

-     

-		@Test

-        public void testEventProcessorinstantiation()

-        {

-                CommonStartup.streamid="fault=sec_fault|syslog=sec_syslog|heartbeat=sec_heartbeat|measurementsForVfScaling=sec_measurement|mobileFlow=sec_mobileflow|other=sec_other|stateChange=sec_statechange|thresholdCrossingAlert=sec_thresholdCrossingAlert|voiceQuality=ves_voicequality|sipSignaling=ves_sipsignaling";

-                EventProcessor ep = new EventProcessor ();

-                Thread epThread=new Thread(ep);

-                epThread.start();

-                 Assert.assertEquals("true", "true");

-                epThread.interrupt();

-

-        }

-

-        @Test

-        public void testAuthListHandler()

-        {

-        	

-        	final Map<String, String> argMap = NsaCommandLineUtil.processCmdLine ( new String[0], true );

-			final String config = NsaCommandLineUtil.getSetting ( argMap, "c", "collector.properties" );

-			final URL settingStream = DrumlinServlet.findStream ( config, CommonStartup.class );

-

-			final nvReadableStack settings = new nvReadableStack ();

-			try {

-				settings.push ( new nvPropertiesFile ( settingStream ) );

-				settings.push ( new nvReadableTable ( argMap ) );

-			} catch (loadException e1) {

-				// TODO Auto-generated catch block

-				e1.printStackTrace();

-			}

-			

-			

-        	RestfulCollectorServlet rsv = null;

-        	NsaAuthenticator<NsaSimpleApiKey> NsaAuth = null;

-        	Boolean flag = false;

-	            try

-	            {

-	                    rsv = new RestfulCollectorServlet(settings);

-	            }

-	            catch (NullPointerException|loadException| missingReqdSetting e){

-	                    System.out.println("junit reported:" + e.getMessage());

-	            }

-	            String authlist = "secureid,IWRjYWVSb2FkbTEyMyEt|sample1,c2FtcGxlMQ==|vdnsagg,dmRuc2FnZw==";

-	            NsaAuth = rsv.AuthlistHandler(authlist);

-	            if (NsaAuth != null)

-	            {

-	            	flag = true;

-	            }

-                Assert.assertEquals(true, flag);

-              

-

-        }

-}

-

-