summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/main/java/org/onap/dcae/commonFunction/VESLogger.java2
-rw-r--r--src/test/java/org/onap/dcae/vestest/TestCustomExceptionLoader.java47
-rw-r--r--src/test/java/org/onap/dcae/vestest/TestDmaapPropertyReader.java68
-rw-r--r--src/test/java/org/onap/dcae/vestest/TestEventReceipt.java146
-rw-r--r--src/test/java/org/onap/dcae/vestest/TestVESLogger.java110
5 files changed, 96 insertions, 277 deletions
diff --git a/src/main/java/org/onap/dcae/commonFunction/VESLogger.java b/src/main/java/org/onap/dcae/commonFunction/VESLogger.java
index 8902a47c..a967327e 100644
--- a/src/main/java/org/onap/dcae/commonFunction/VESLogger.java
+++ b/src/main/java/org/onap/dcae/commonFunction/VESLogger.java
@@ -36,7 +36,7 @@ import java.util.UUID;
public class VESLogger {
public static final String VES_AGENT = "VES_AGENT";
- private static final String REQUEST_ID = "requestId";
+ public static final String REQUEST_ID = "requestId";
private static final String IP_ADDRESS = "127.0.0.1";
private static final String HOST_NAME = "localhost";
diff --git a/src/test/java/org/onap/dcae/vestest/TestCustomExceptionLoader.java b/src/test/java/org/onap/dcae/vestest/TestCustomExceptionLoader.java
index 1cbd6c43..60d791cc 100644
--- a/src/test/java/org/onap/dcae/vestest/TestCustomExceptionLoader.java
+++ b/src/test/java/org/onap/dcae/vestest/TestCustomExceptionLoader.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,50 +20,39 @@
package org.onap.dcae.vestest;
+import static java.lang.String.format;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.onap.dcae.commonFunction.CustomExceptionLoader.LookupMap;
import com.att.nsa.drumlin.service.standards.HttpStatusCodes;
-import org.junit.After;
-import org.junit.Before;
import org.junit.Test;
import org.onap.dcae.commonFunction.CommonStartup;
import org.onap.dcae.commonFunction.CustomExceptionLoader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class TestCustomExceptionLoader {
- private static final Logger log = LoggerFactory.getLogger(TestCustomExceptionLoader.class);
- private CustomExceptionLoader cl;
-
- @Before
- public void setUp() throws Exception {
- cl = new CustomExceptionLoader();
- CommonStartup.exceptionConfig = "./etc/ExceptionConfig.json";
- }
-
- @After
- public void tearDown() throws Exception {
- }
-
@Test
- public void testLoad() {
- String op;
+ public void shouldLoadMapWithoutExceptions() {
+ CommonStartup.exceptionConfig = "./etc/ExceptionConfig.json";
CustomExceptionLoader.LoadMap();
- op = "dataloaded";
- assertEquals("dataloaded", op);
}
@Test
- public void testLookup() {
- String[] retarray;
-
+ public void shouldLookupErrorMessageOutOfStatusCodeAndReason() {
+ // given
CommonStartup.exceptionConfig = "./etc/ExceptionConfig.json";
CustomExceptionLoader.LoadMap();
- retarray = CustomExceptionLoader
- .LookupMap(String.valueOf(HttpStatusCodes.k401_unauthorized), "Unauthorized user");
+ int statusCode = HttpStatusCodes.k401_unauthorized;
+ String message = "Unauthorized user";
+
+ // when
+ String[] retarray = LookupMap(String.valueOf(statusCode), message);
+
+ // then
if (retarray == null) {
- log.info("Lookup failed");
+ fail(format(
+ "Lookup failed, did not find value for a valid status code %s and message %s", statusCode, message));
} else {
assertEquals("\"POL2000\"", retarray[0]);
}
diff --git a/src/test/java/org/onap/dcae/vestest/TestDmaapPropertyReader.java b/src/test/java/org/onap/dcae/vestest/TestDmaapPropertyReader.java
index 0fa02190..1a7d9f7e 100644
--- a/src/test/java/org/onap/dcae/vestest/TestDmaapPropertyReader.java
+++ b/src/test/java/org/onap/dcae/vestest/TestDmaapPropertyReader.java
@@ -1,15 +1,16 @@
/*-
* ============LICENSE_START=======================================================
- * PROJECT
+ * org.onap.dcaegen2.collectors.ves
* ================================================================================
* Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018 Nokia. 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.
@@ -19,49 +20,34 @@
*/
package org.onap.dcae.vestest;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import java.util.HashMap;
+import org.junit.Test;
import org.onap.dcae.commonFunction.DmaapPropertyReader;
public class TestDmaapPropertyReader {
- DmaapPropertyReader dr;
-
- Boolean flag = false;
-
- @Before
- public void setUp() throws Exception {
-
- // process command line arguments
-
-
-
- }
-
- @After
- public void tearDown() throws Exception {
-
- }
-
- @Test
- public void testDmaapPropertyReader() {
- String testinput = "src/test/resources/testDmaapConfig_ip.json";
- dr = new DmaapPropertyReader(testinput);
- Boolean test = true;
- flag = !dr.dmaap_hash.isEmpty();
- Assert.assertEquals(test, flag);
- }
+ @Test
+ public void shouldReadDMaaPHashes() {
+ DmaapPropertyReader dmaapPropertyReader = new DmaapPropertyReader("src/test/resources/testDmaapConfig_ip.json");
+ HashMap<String, String> dmaapHash = dmaapPropertyReader.dmaap_hash;
+ assertEquals(dmaapHash.get("sec_fault_ueb.cambria.hosts"),
+ "uebsb91kcdc.it.att.com,uebsb92kcdc.it.att.com,uebsb93kcdc.it.att.com");
+ assertEquals(dmaapHash.get("sec_fault_ueb.cambria.topic"), "DCAE-SE-COLLECTOR-EVENTS-DEV");
+ }
+
+ @Test
+ public void shouldReadDMaaPHashesForSecondGeneration() {
+ DmaapPropertyReader dmaapPropertyReader = new DmaapPropertyReader(
+ "src/test/resources/testDmaapConfig_gen2.json");
+ HashMap<String, String> dmaapHash = dmaapPropertyReader.dmaap_hash;
+ assertEquals(dmaapHash.get("ves-thresholdCrossingAlert-secondary.cambria.topic"),
+ "DCAE-SE-COLLECTOR-EVENTS-DEV");
+ assertEquals(dmaapHash.get("ves-thresholdCrossingAlert-secondary.cambria.url"), "UEBHOST:3904");
+ assertEquals(dmaapHash.get("ves-fault-secondary.cambria.url"), "UEBHOST:3904");
+ assertEquals(dmaapHash.get("ves-fault-secondary.cambria.topic"), "DCAE-SE-COLLECTOR-EVENTS-DEV");
+ }
- @Test
- public void testDmaapPropertyReaderNewConfig() {
- String testinput = "src/test/resources/testDmaapConfig_gen2.json";
- dr = new DmaapPropertyReader(testinput);
- Boolean test = true;
- flag = !dr.dmaap_hash.isEmpty();
- Assert.assertEquals(test, flag);
- }
}
diff --git a/src/test/java/org/onap/dcae/vestest/TestEventReceipt.java b/src/test/java/org/onap/dcae/vestest/TestEventReceipt.java
index 2e4053f7..a3893eaa 100644
--- a/src/test/java/org/onap/dcae/vestest/TestEventReceipt.java
+++ b/src/test/java/org/onap/dcae/vestest/TestEventReceipt.java
@@ -7,9 +7,9 @@
* 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.
@@ -21,142 +21,26 @@ package org.onap.dcae.vestest;
import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.util.UUID;
-
-import org.json.JSONException;
import org.json.JSONObject;
-import org.junit.After;
-import org.junit.Before;
import org.junit.Test;
import org.onap.dcae.commonFunction.CommonStartup;
-import org.onap.dcae.commonFunction.CommonStartup.QueueFullException;
-import org.onap.dcae.commonFunction.CustomExceptionLoader;
import org.onap.dcae.restapi.endpoints.EventReceipt;
-import org.onap.dcae.restapi.endpoints.Ui;
-
-import com.att.nsa.apiServer.endpoints.NsaBaseEndpoint;
-import com.att.nsa.drumlin.service.framework.context.DrumlinRequestContext;
-import com.att.nsa.drumlin.service.standards.HttpStatusCodes;
-import com.att.nsa.security.db.simple.NsaSimpleApiKey;
-
-import jline.internal.Log;
-
-public class TestEventReceipt extends NsaBaseEndpoint {
-
- DrumlinRequestContext ctx;
- JSONObject jsonObject;
- Boolean flag = false;
- String ev = "{\"event\": {\"commonEventHeader\": { \"reportingEntityName\": \"VM name will be provided by ECOMP\", \"startEpochMicrosec\": 1477012779802988,\"lastEpochMicrosec\": 1477012789802988,\"eventId\": \"83\",\"sourceName\": \"Dummy VM name - No Metadata available\",\"sequence\": 83,\"priority\": \"Normal\",\"functionalRole\": \"vFirewall\",\"domain\": \"measurementsForVfScaling\",\"reportingEntityId\": \"VM UUID will be provided by ECOMP\",\"sourceId\": \"Dummy VM UUID - No Metadata available\",\"version\": 1.1},\"measurementsForVfScalingFields\": {\"measurementInterval\": 10,\"measurementsForVfScalingVersion\": 1.1,\"vNicUsageArray\": [{\"multicastPacketsIn\": 0,\"bytesIn\": 3896,\"unicastPacketsIn\": 0, \"multicastPacketsOut\": 0,\"broadcastPacketsOut\": 0, \"packetsOut\": 28,\"bytesOut\": 12178,\"broadcastPacketsIn\": 0,\"packetsIn\": 58,\"unicastPacketsOut\": 0,\"vNicIdentifier\": \"eth0\"}]}}}";
-
-
- @Before
- public void setUp() throws Exception {
-
-
- }
-
- @After
- public void tearDown() throws Exception {
- }
-
- @Test
- public void testschemaFileVersion() {
-
- String filename = null;
- CommonStartup.schemaFileJson = new JSONObject(
- "{\"v1\":\"./etc/CommonEventFormat_27.2.json\",\"v2\":\"./etc/CommonEventFormat_27.2.json\",\"v3\":\"./etc/CommonEventFormat_27.2.json\",\"v4\":\"./etc/CommonEventFormat_27.2.json\",\"v5\":\"./etc/CommonEventFormat_28.4.1.json\"}");
- filename = EventReceipt.schemaFileVersion("v5");
-
- if (!filename.isEmpty()) {
- flag = true;
- }
- assertEquals(true, flag);
- }
-
- @Test
- public void testrespondWithCustomMsginJson() {
-
- CommonStartup.exceptionConfig = "./etc/ExceptionConfig.json";
- CustomExceptionLoader.LoadMap();
-
- try {
- EventReceipt.respondWithCustomMsginJson(null, HttpStatusCodes.k401_unauthorized, "Unauthorized user");
- }
- catch (Exception e)
- {
- //As context object is null, handling null pointer exception.
- Log.debug("Response object creation failure");
- }
- assertEquals(true, true);
- }
-
- @Test
- public void testschemaCheck() {
-
- // schemaCheck(NsaSimpleApiKey retkey, int arrayFlag,JSONObject
- // jsonObject, String vesVersion, FileReader fr, DrumlinRequestContext
- // ctx, UUID uuid) throws JSONException, QueueFullException, IOException
- Boolean flag = true;
- NsaSimpleApiKey retkey = null;
- int arrayFlag = 0;
-
- CommonStartup.authflag = 0;
- CommonStartup.schemaValidatorflag = 1;
-
- jsonObject = new org.json.JSONObject(ev);
-
- String vesVersion = "v1";
-
- DrumlinRequestContext ctx = null;
-
-
- UUID uuid = UUID.randomUUID();
-
- try {
- flag = EventReceipt.schemaCheck(retkey, arrayFlag, jsonObject, vesVersion, ctx, uuid);
- } catch (NullPointerException |JSONException | QueueFullException | IOException e) {
-
- Log.debug("Response object creation failure");
- }
- assertEquals(true, flag);
- }
-
- @Test
- public void testgetUser() {
-
- Boolean flag = true;
- String user;
-
- CommonStartup.authflag = 1;
- CommonStartup.schemaValidatorflag = 1;
+public class TestEventReceipt {
- jsonObject = new org.json.JSONObject(ev);
- DrumlinRequestContext ctx = null;
+ @Test
+ public void shouldGetSchemaFileLocationBasedOnVersion() {
+ CommonStartup.schemaFileJson = new JSONObject("{\"v1\":\"filePath1\", \"v5\":\"filePath2\"}");
+ String schemaFilePath = EventReceipt.schemaFileVersion("v5");
+ assertEquals(schemaFilePath, "filePath2");
+ }
- try {
- user = EventReceipt.getUser(ctx);
- } catch (NullPointerException |JSONException e) {
-
- Log.debug("Response object creation failure");
- }
- assertEquals(true, flag);
- }
-
- @Test
- public void testUI() {
+ @Test
+ public void shouldByDefaultReturnV5SchemaFileLocation() {
+ CommonStartup.schemaFileJson = new JSONObject("{\"v1\":\"filePath1\", \"v5\":\"filePath2\"}");
+ String schemaFilePath = EventReceipt.schemaFileVersion("v2");
+ assertEquals(schemaFilePath, "filePath2");
+ }
- try {
- Ui.hello(null);
- }
- catch (Exception e)
- {
- //As context object is null, handling null pointer exception.
- Log.debug("Response object creation failure");
- }
- assertEquals(true, true);
- }
}
diff --git a/src/test/java/org/onap/dcae/vestest/TestVESLogger.java b/src/test/java/org/onap/dcae/vestest/TestVESLogger.java
index 3d41eed6..484f7dc8 100644
--- a/src/test/java/org/onap/dcae/vestest/TestVESLogger.java
+++ b/src/test/java/org/onap/dcae/vestest/TestVESLogger.java
@@ -7,9 +7,9 @@
* 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.
@@ -19,97 +19,57 @@
*/
package org.onap.dcae.vestest;
-import static org.junit.Assert.*;
-
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.onap.dcae.commonFunction.VESLogger.REQUEST_ID;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.UUID;
-
-import org.json.JSONObject;
-import com.google.gson.JsonParser;
import com.att.nsa.logging.LoggingContext;
-import com.google.gson.JsonObject;
-
-import org.junit.After;
-import org.junit.Before;
+import com.att.nsa.logging.log4j.EcompFields;
+import java.util.UUID;
import org.junit.Test;
-import org.onap.dcae.commonFunction.CommonStartup;
-import org.onap.dcae.commonFunction.DmaapPropertyReader;
-import org.onap.dcae.commonFunction.EventProcessor;
-import org.onap.dcae.commonFunction.EventPublisherHash;
import org.onap.dcae.commonFunction.VESLogger;
-import org.onap.dcae.controller.FetchDynamicConfig;
-
public class TestVESLogger {
- LoggingContext threadLC;
-
- @Before
- public void setUp() throws Exception {
+ @Test
+ public void shouldOnLoggingContextInitializationPutRandomUUIDAsRequestID() {
+ LoggingContext commonLoggingContext = VESLogger.getCommonLoggingContext();
+ String requestId = commonLoggingContext.get(REQUEST_ID, "default");
- threadLC = null;
- }
+ assertNotNull(requestId);
+ assertNotSame(requestId, "default");
- @After
- public void tearDown() throws Exception {
}
-
-
@Test
- public void testgetCommonLoggingContext() {
- Boolean flag = false;
- threadLC = VESLogger.getCommonLoggingContext();
- if(!threadLC.equals(""))
- {
- flag = true;
- }
-
- assertEquals(true, flag);
-
- }
- @Test
- public void testUuidgetLoggingContextForThread() {
- Boolean flag = false;
+ public void shouldOnLoggingContextInitializationPutGivenUUIDAsRequestIDAndSupplyEndTimestamp() {
final UUID uuid = UUID.randomUUID();
- threadLC = VESLogger.getLoggingContextForThread(uuid);
- //if(threadLC.get("REQUEST_ID", null) != null)
- if(!threadLC.equals(""))
- {
- flag = true;
- }
-
- assertEquals(true, flag);
-
-
+ LoggingContext loggingContextForThread = VESLogger.getLoggingContextForThread(uuid);
+ String requestId = loggingContextForThread.get(REQUEST_ID, "default");
+ String endTimestamp = loggingContextForThread.get(EcompFields.kEndTimestamp, "default");
+
+ assertNotNull(requestId);
+ assertNotNull(endTimestamp);
+ assertNotSame(endTimestamp, "default");
+ assertEquals(requestId, uuid.toString());
}
+
@Test
- public void testStringgetLoggingContextForThread() {
- Boolean flag = false;
+ public void shouldOnLoggingContextInitializationPutGivenUUIDAsRequestIDAndSupplyEndTimestampAndCompleteStatusCode() {
final UUID uuid = UUID.randomUUID();
- threadLC = VESLogger.getLoggingContextForThread(uuid.toString());
- //if(threadLC.get("REQUEST_ID", null) != null)
- if(!threadLC.equals(""))
- {
- flag = true;
- }
-
- assertEquals(true, flag);
-
- }
+ LoggingContext loggingContextForThread = VESLogger.getLoggingContextForThread(uuid.toString());
+ String requestId = loggingContextForThread.get(REQUEST_ID, "default");
+ String statusCode = loggingContextForThread.get("statusCode", "default");
+ String endTimestamp = loggingContextForThread.get(EcompFields.kEndTimestamp, "default");
- @Test
- public void testsetUpEcompLogging() {
- Boolean flag = false;
- VESLogger.setUpEcompLogging();
-
-
- assertEquals(true, true);
-
+ assertNotNull(requestId);
+ assertNotNull(endTimestamp);
+ assertNotNull(statusCode);
+ assertNotSame(endTimestamp, "default");
+ assertEquals(requestId, uuid.toString());
+ assertEquals(statusCode, "COMPLETE");
}
-
+
}