From 7968b32c3f18cf8e98d87229f100c622323cd78e Mon Sep 17 00:00:00 2001 From: Joseph Chou Date: Wed, 22 Apr 2020 14:06:23 -0400 Subject: Logging enhancement work Update log tool to provide placeholder feature Change-Id: I3f2b10d009a1d51f30a6080c07459eb0ac07189f Issue-ID: POLICY-2478 Signed-off-by: Joseph Chou --- .../policy/common/logging/eelf/PolicyLoggerTest.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'common-logging/src/test/java/org/onap/policy/common/logging/eelf/PolicyLoggerTest.java') diff --git a/common-logging/src/test/java/org/onap/policy/common/logging/eelf/PolicyLoggerTest.java b/common-logging/src/test/java/org/onap/policy/common/logging/eelf/PolicyLoggerTest.java index b318c18d..adb7d366 100644 --- a/common-logging/src/test/java/org/onap/policy/common/logging/eelf/PolicyLoggerTest.java +++ b/common-logging/src/test/java/org/onap/policy/common/logging/eelf/PolicyLoggerTest.java @@ -36,6 +36,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; import static org.onap.policy.common.logging.eelf.OnapConfigProperties.PARTNER_NAME; import static org.onap.policy.common.logging.eelf.OnapConfigProperties.RESPONSE_CODE; import static org.onap.policy.common.logging.eelf.OnapConfigProperties.RESPONSE_DESCRIPTION; @@ -200,6 +202,9 @@ public class PolicyLoggerTest { EELFLogger mockLogger = Mockito.mock(EELFLogger.class); Whitebox.setInternalState(PolicyLogger.class, "debugLogger", mockLogger); PolicyLogger.info("str1", "str2"); + Mockito.verify(mockLogger, never()).info(Mockito.anyString(), Mockito.anyString()); + Mockito.when(mockLogger.isInfoEnabled()).thenReturn(true); + PolicyLogger.info("str1", "str2"); Mockito.verify(mockLogger).info(MessageCodes.GENERAL_INFO, "str2"); } @@ -243,6 +248,9 @@ public class PolicyLoggerTest { EELFLogger mockLogger = Mockito.mock(EELFLogger.class); Whitebox.setInternalState(PolicyLogger.class, "debugLogger", mockLogger); PolicyLogger.warn("str1", "str2"); + Mockito.verify(mockLogger, never()).info(Mockito.anyString(), Mockito.anyString()); + Mockito.when(mockLogger.isWarnEnabled()).thenReturn(true); + PolicyLogger.warn("str1", "str2"); Mockito.verify(mockLogger).warn(MessageCodes.GENERAL_INFO, "str2"); } @@ -286,6 +294,9 @@ public class PolicyLoggerTest { EELFLogger mockLogger = Mockito.mock(EELFLogger.class); Whitebox.setInternalState(PolicyLogger.class, "errorLogger", mockLogger); PolicyLogger.error("str1", "str2"); + Mockito.verify(mockLogger, never()).info(Mockito.anyString(), Mockito.anyString()); + Mockito.when(mockLogger.isErrorEnabled()).thenReturn(true); + PolicyLogger.error("str1", "str2"); Mockito.verify(mockLogger).error(MessageCodes.GENERAL_ERROR, "str2"); assertEquals("500", MDC.get("ErrorCode")); assertEquals("This is a general error message during the process. Please check the error message for detail " @@ -356,6 +367,9 @@ public class PolicyLoggerTest { EELFLogger mockLogger = Mockito.mock(EELFLogger.class); Whitebox.setInternalState(PolicyLogger.class, "debugLogger", mockLogger); PolicyLogger.debug("str1", "str2"); + Mockito.verify(mockLogger, never()).info(Mockito.anyString(), Mockito.anyString()); + Mockito.when(mockLogger.isDebugEnabled()).thenReturn(true); + PolicyLogger.debug("str1", "str2"); Mockito.verify(mockLogger).debug(MessageCodes.GENERAL_INFO, "str2"); } @@ -380,6 +394,9 @@ public class PolicyLoggerTest { EELFLogger mockLogger = Mockito.mock(EELFLogger.class); Whitebox.setInternalState(PolicyLogger.class, "auditLogger", mockLogger); PolicyLogger.audit("PolicyLoggerTest", 1); + Mockito.verify(mockLogger, never()).info(Mockito.anyString(), Mockito.anyString()); + Mockito.when(mockLogger.isInfoEnabled()).thenReturn(true); + PolicyLogger.audit("PolicyLoggerTest", 1); assertEquals("PolicyLoggerTest", MDC.get("ClassName")); assertEquals("COMPLETE", MDC.get("StatusCode")); Mockito.verify(mockLogger).info("1"); @@ -591,6 +608,9 @@ public class PolicyLoggerTest { EELFLogger mockLogger = Mockito.mock(EELFLogger.class); Whitebox.setInternalState(PolicyLogger.class, "metricsLogger", mockLogger); PolicyLogger.metrics("PolicyLoggerTest", 1); + Mockito.verify(mockLogger, never()).info(Mockito.anyString(), Mockito.anyString()); + Mockito.when(mockLogger.isInfoEnabled()).thenReturn(true); + PolicyLogger.metrics("PolicyLoggerTest", 1); Mockito.verify(mockLogger).info(Mockito.eq(MessageCodes.RULE_METRICS_INFO), Mockito.anyString(), Mockito.eq("1")); } -- cgit 1.2.3-korg