diff options
Diffstat (limited to 'src')
3 files changed, 54 insertions, 105 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/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"); } - + } |