From 679ce33d39364e13489832852ddcda67d95daa20 Mon Sep 17 00:00:00 2001 From: uj426b Date: Thu, 11 Jun 2020 13:32:53 -0400 Subject: Removing log4j from policy/common Change-Id: Ib662556533f72c99180b611d0a1933f20e231b2c Issue-ID: POLICY-2623 Signed-off-by: uj426b --- .../common/logging/flexlogger/FlexLoggerTest.java | 28 -- .../common/logging/flexlogger/Logger4JTest.java | 351 --------------------- 2 files changed, 379 deletions(-) delete mode 100644 common-logging/src/test/java/org/onap/policy/common/logging/flexlogger/Logger4JTest.java (limited to 'common-logging/src/test') diff --git a/common-logging/src/test/java/org/onap/policy/common/logging/flexlogger/FlexLoggerTest.java b/common-logging/src/test/java/org/onap/policy/common/logging/flexlogger/FlexLoggerTest.java index 500c484f..f43c85df 100644 --- a/common-logging/src/test/java/org/onap/policy/common/logging/flexlogger/FlexLoggerTest.java +++ b/common-logging/src/test/java/org/onap/policy/common/logging/flexlogger/FlexLoggerTest.java @@ -42,13 +42,6 @@ public class FlexLoggerTest { assertNotEquals(logger, FlexLogger.getLogger(String.class)); } - @Test - public void testGetLoggerClassOfQLog4j() { - Whitebox.setInternalState(FlexLogger.class, "loggerType", LoggerType.LOG4J); - Logger logger = FlexLogger.getLogger(this.getClass()); - assertSame(logger, FlexLogger.getLogger(this.getClass())); - } - @Test public void testGetLoggerClassOfQSystemOut() { Whitebox.setInternalState(FlexLogger.class, "loggerType", LoggerType.SYSTEMOUT); @@ -63,13 +56,6 @@ public class FlexLoggerTest { assertSame(logger, FlexLogger.getLogger("str1")); } - @Test - public void testGetLoggerStringLog4j() { - Whitebox.setInternalState(FlexLogger.class, "loggerType", LoggerType.LOG4J); - Logger logger = FlexLogger.getLogger("str1"); - assertSame(logger, FlexLogger.getLogger("str1")); - } - @Test public void testGetLoggerStringSystemOut() { Whitebox.setInternalState(FlexLogger.class, "loggerType", LoggerType.SYSTEMOUT); @@ -84,13 +70,6 @@ public class FlexLoggerTest { assertSame(logger, FlexLogger.getLogger(this.getClass(), true)); } - @Test - public void testGetLoggerClassOfQBooleanLog4j() { - Whitebox.setInternalState(FlexLogger.class, "loggerType", LoggerType.LOG4J); - Logger logger = FlexLogger.getLogger(this.getClass(), true); - assertSame(logger, FlexLogger.getLogger(this.getClass(), true)); - } - @Test public void testGetLoggerClassOfQBooleanSystemOut() { Whitebox.setInternalState(FlexLogger.class, "loggerType", LoggerType.SYSTEMOUT); @@ -105,13 +84,6 @@ public class FlexLoggerTest { assertSame(logger, FlexLogger.getLogger("str1", true)); } - @Test - public void testGetLoggerStringBooleanLog4j() { - Whitebox.setInternalState(FlexLogger.class, "loggerType", LoggerType.LOG4J); - Logger logger = FlexLogger.getLogger("str1", true); - assertSame(logger, FlexLogger.getLogger("str1", true)); - } - @Test public void testGetLoggerStringBooleanSystemOut() { Whitebox.setInternalState(FlexLogger.class, "loggerType", LoggerType.SYSTEMOUT); diff --git a/common-logging/src/test/java/org/onap/policy/common/logging/flexlogger/Logger4JTest.java b/common-logging/src/test/java/org/onap/policy/common/logging/flexlogger/Logger4JTest.java deleted file mode 100644 index 9ceef99c..00000000 --- a/common-logging/src/test/java/org/onap/policy/common/logging/flexlogger/Logger4JTest.java +++ /dev/null @@ -1,351 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP-Logging - * ================================================================================ - * Copyright (C) 2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2019-2020 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.policy.common.logging.flexlogger; - -import static org.assertj.core.api.Assertions.assertThatCode; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.util.UUID; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; -import org.junit.Test; -import org.mockito.Mockito; -import org.onap.policy.common.logging.eelf.MessageCodes; -import org.powermock.reflect.Whitebox; - -public class Logger4JTest { - - private Logger4J logger4J = new Logger4J("str1", "Logger4JTest"); - - @Test - public void testLogger4JClassOfQ() { - assertThatCode(() -> new Logger4J(this.getClass())).doesNotThrowAnyException(); - } - - @Test - public void testSetAndGetTransId() { - logger4J.setTransId("transactionId"); - assertEquals("transactionId", logger4J.getTransId()); - } - - @Test - public void testDebugObject() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - Mockito.when(logger.isDebugEnabled()).thenReturn(true); - logger4J.setTransId("transactionId"); - logger4J.debug("message"); - Mockito.verify(logger).debug("transactionId|message"); - } - - @Test - public void testErrorObject() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - logger4J.setTransId("transactionId"); - logger4J.error("message"); - Mockito.verify(logger).error("transactionId|Logger4JTest|message"); - } - - @Test - public void testInfoObject() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - logger4J.setTransId("transactionId"); - logger4J.info("message"); - Mockito.verify(logger).info("transactionId|Logger4JTest|message"); - } - - @Test - public void testWarnObject() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - logger4J.setTransId("transactionId"); - logger4J.warn("message"); - Mockito.verify(logger).warn("transactionId|Logger4JTest|message"); - } - - @Test - public void testTraceObject() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - logger4J.setTransId("transactionId"); - logger4J.trace("message"); - Mockito.verify(logger).trace("transactionId|Logger4JTest|message"); - } - - @Test - public void testIsDebugEnabled() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - Mockito.when(logger.isDebugEnabled()).thenReturn(true).thenReturn(false); - assertTrue(logger4J.isDebugEnabled()); - assertFalse(logger4J.isDebugEnabled()); - } - - @Test - public void testIsErrorEnabled() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - Mockito.when(logger.isEnabledFor(Level.ERROR)).thenReturn(true).thenReturn(false); - assertTrue(logger4J.isErrorEnabled()); - assertFalse(logger4J.isErrorEnabled()); - } - - @Test - public void testIsInfoEnabled() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - Mockito.when(logger.isInfoEnabled()).thenReturn(true).thenReturn(false); - assertTrue(logger4J.isInfoEnabled()); - assertFalse(logger4J.isInfoEnabled()); - } - - @Test - public void testIsWarnEnabled() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - Mockito.when(logger.isEnabledFor(Level.WARN)).thenReturn(true).thenReturn(false); - assertTrue(logger4J.isWarnEnabled()); - assertFalse(logger4J.isWarnEnabled()); - } - - @Test - public void testAuditObject() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - logger4J.audit("str1"); - Mockito.verify(logger).info("Logger4JTest|str1"); - } - - @Test - public void testRecordAuditEventStartString() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - logger4J.recordAuditEventEnd("eventId", "rule"); - Mockito.verify(logger).info("Logger4JTest|eventId:rule"); - } - - @Test - public void testRecordAuditEventStartUuid() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - UUID uuid = UUID.randomUUID(); - logger4J.recordAuditEventStart(uuid); - Mockito.verify(logger).info("Logger4JTest|recordAuditEventStart with eventId " + uuid.toString()); - } - - @Test - public void testRecordAuditEventEndStringStringString() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - logger4J.recordAuditEventEnd("eventId", "rule", "policyVersion"); - Mockito.verify(logger).info("Logger4JTest|eventId:rule"); - } - - @Test - public void testRecordAuditEventEndUuidStringString() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - UUID uuid = UUID.randomUUID(); - logger4J.recordAuditEventEnd(uuid, "rule", "policyVersion"); - Mockito.verify(logger).info("Logger4JTest|" + uuid.toString() + ":rule"); - } - - @Test - public void testRecordAuditEventEndStringString() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - logger4J.recordAuditEventEnd("eventId", "rule"); - Mockito.verify(logger).info("Logger4JTest|eventId:rule"); - } - - @Test - public void testRecordAuditEventEndUuidString() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - UUID uuid = UUID.randomUUID(); - logger4J.recordAuditEventEnd(uuid, "rule"); - Mockito.verify(logger).info("Logger4JTest|" + uuid.toString() + ":rule"); - } - - @Test - public void testRecordMetricEventStringString() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - logger4J.recordMetricEvent("eventId", "str1"); - Mockito.verify(logger).info("Logger4JTest|eventId:str1"); - } - - @Test - public void testRecordMetricEventUuidString() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - UUID uuid = UUID.randomUUID(); - logger4J.recordMetricEvent(uuid, "str1"); - Mockito.verify(logger).info("Logger4JTest|" + uuid.toString() + ":str1"); - } - - @Test - public void testMetrics() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - logger4J.metrics("str1"); - Mockito.verify(logger).info("str1"); - } - - @Test - public void testErrorMessageCodesThrowableStringArray() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - logger4J.setTransId("transactionId"); - logger4J.error(MessageCodes.GENERAL_ERROR, new NullPointerException(), "str1", "str2"); - Mockito.verify(logger) - .error("transactionId|Logger4JTest|MessageCodes :" + MessageCodes.GENERAL_ERROR + "[str1, str2]"); - } - - @Test - public void testErrorMessageCodesStringArray() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - logger4J.setTransId("transactionId"); - logger4J.error(MessageCodes.GENERAL_ERROR, "str1", "str2"); - Mockito.verify(logger) - .error("transactionId|Logger4JTest|MessageCode:" + MessageCodes.GENERAL_ERROR + "[str1, str2]"); - } - - @Test - public void testPostMdcInfoForEventString() { - String returnedTransactionId = logger4J.postMdcInfoForEvent("transactionId"); - assertEquals("transactionId", returnedTransactionId); - } - - @Test - public void testPostMdcInfoForEventEmptyString() { - String returnedTransactionId = logger4J.postMdcInfoForEvent(""); - assertNotNull("", returnedTransactionId); - assertNotEquals("", returnedTransactionId); - } - - @Test - public void testWarnMessageCodesStringArray() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - logger4J.warn(MessageCodes.GENERAL_ERROR, "str1", "str2"); - Mockito.verify(logger).warn("Logger4JTest|MessageCodes:" + MessageCodes.GENERAL_ERROR + "[str1, str2]"); - } - - @Test - public void testWarnMessageCodesThrowableStringArray() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - logger4J.setTransId("transactionId"); - logger4J.warn(MessageCodes.GENERAL_ERROR, new NullPointerException(), "str1", "str2"); - Mockito.verify(logger).warn("Logger4JTest|MessageCodes:" + MessageCodes.GENERAL_ERROR + "[str1, str2]"); - } - - @Test - public void testDebugObjectThrowable() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - logger4J.setTransId("transactionId"); - Exception exception = new NullPointerException(); - logger4J.debug("message", exception); - Mockito.verify(logger).debug("message", exception); - } - - @Test - public void testErrorObjectThrowable() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - logger4J.setTransId("transactionId"); - Exception exception = new NullPointerException(); - logger4J.error("message", exception); - Mockito.verify(logger).error("message", exception); - } - - @Test - public void testInfoObjectThrowable() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - logger4J.setTransId("transactionId"); - Exception exception = new NullPointerException(); - logger4J.info("message", exception); - Mockito.verify(logger).info("message", exception); - } - - @Test - public void testWarnObjectThrowable() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - Exception exception = new NullPointerException(); - logger4J.warn("message", exception); - Mockito.verify(logger).warn("message", exception); - } - - @Test - public void testTraceObjectThrowable() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - Exception exception = new NullPointerException(); - logger4J.trace("message", exception); - Mockito.verify(logger).trace("message", exception); - } - - @Test - public void testAuditObjectThrowable() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - Exception exception = new NullPointerException(); - logger4J.audit("message", exception); - Mockito.verify(logger).info("message", exception); - } - - @Test - public void testIsTraceEnabled() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - logger4J.isTraceEnabled(); - Mockito.verify(logger).isTraceEnabled(); - } - - @Test - public void testPostMdcInfoForTriggeredRule() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - logger4J.postMdcInfoForTriggeredRule("transactionId"); - Mockito.verify(logger).info("transactionId"); - } - - @Test - public void testPostMdcInfoForEventObject() { - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(logger4J, "log", logger); - logger4J.postMdcInfoForEvent(1); - Mockito.verify(logger).info(1); - } - -} -- cgit 1.2.3-korg