From 792cf9d1e7db825ba92e2e232f53844e7c1be8a1 Mon Sep 17 00:00:00 2001 From: wusheng Date: Tue, 28 Feb 2017 10:21:56 +0800 Subject: [PATCH] Add test cases for skywalking-logging-impl-log4j2 module(not used right now). --- .../eye/skywalking/api/logging/api/ILog.java | 4 -- .../api/logging/api/NoopLogger.java | 9 ---- .../api/logging/api/LogManagerTest.java | 8 ---- .../api/logging/api/NoopLoggerTest.java | 1 - .../api/logging/impl/log4j2/Log4j2Logger.java | 10 ---- .../logging/impl/log4j2/Log4j2LoggerTest.java | 47 +++++++++++++++++++ .../impl/log4j2/Log4j2ResolverTest.java | 18 +++++++ 7 files changed, 65 insertions(+), 32 deletions(-) create mode 100644 skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/test/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2LoggerTest.java create mode 100644 skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/test/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2ResolverTest.java diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/ILog.java b/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/ILog.java index 449b87d2d..84445dfdb 100644 --- a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/ILog.java +++ b/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/ILog.java @@ -14,12 +14,8 @@ public interface ILog { void warn(String format, Object... arguments); - void warn(String format, Object arguments, Throwable e); - void error(String format, Throwable e); - void error(String format, Object arguments, Throwable e); - boolean isDebugEnable(); boolean isInfoEnable(); diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/NoopLogger.java b/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/NoopLogger.java index 9f28294ba..5dbb887af 100644 --- a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/NoopLogger.java +++ b/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/NoopLogger.java @@ -25,20 +25,11 @@ public enum NoopLogger implements ILog { } - @Override - public void warn(String format, Object arguments, Throwable e) { - - } - @Override public void error(String format, Throwable e) { } - @Override - public void error(String format, Object argument, Throwable e) { - } - @Override public boolean isDebugEnable() { return false; diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/test/java/com/a/eye/skywalking/api/logging/api/LogManagerTest.java b/skywalking-commons/skywalking-logging/skywalking-logging-api/src/test/java/com/a/eye/skywalking/api/logging/api/LogManagerTest.java index 51ce2c81c..812b5660b 100644 --- a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/test/java/com/a/eye/skywalking/api/logging/api/LogManagerTest.java +++ b/skywalking-commons/skywalking-logging/skywalking-logging-api/src/test/java/com/a/eye/skywalking/api/logging/api/LogManagerTest.java @@ -50,18 +50,10 @@ public class LogManagerTest { } - @Override public void warn(String format, Object arguments, Throwable e) { - - } - @Override public void error(String format, Throwable e) { } - @Override public void error(String format, Object arguments, Throwable e) { - - } - @Override public boolean isDebugEnable() { return false; } diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/test/java/com/a/eye/skywalking/api/logging/api/NoopLoggerTest.java b/skywalking-commons/skywalking-logging/skywalking-logging-api/src/test/java/com/a/eye/skywalking/api/logging/api/NoopLoggerTest.java index 7bbd3ab2f..346e9034d 100644 --- a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/test/java/com/a/eye/skywalking/api/logging/api/NoopLoggerTest.java +++ b/skywalking-commons/skywalking-logging/skywalking-logging-api/src/test/java/com/a/eye/skywalking/api/logging/api/NoopLoggerTest.java @@ -24,6 +24,5 @@ public class NoopLoggerTest { INSTANCE.warn("Any string", new Object[0], new NullPointerException()); INSTANCE.error("Any string"); INSTANCE.error("Any string", new NullPointerException()); - INSTANCE.error("Any string", new Object[0], new NullPointerException()); } } diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2Logger.java b/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2Logger.java index 2fb1f5d37..b3ebe43d2 100644 --- a/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2Logger.java +++ b/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2Logger.java @@ -28,21 +28,11 @@ public class Log4j2Logger implements ILog { logger.warn(format, arguments); } - @Override - public void warn(String format, Object arguments, Throwable e) { - logger.warn(format, arguments, e); - } - @Override public void error(String message, Throwable e) { logger.error(message, e); } - @Override - public void error(String message, Object argument, Throwable e) { - logger.error(message, argument, e); - } - @Override public boolean isDebugEnable() { return logger.isDebugEnabled(); diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/test/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2LoggerTest.java b/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/test/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2LoggerTest.java new file mode 100644 index 000000000..792151ac0 --- /dev/null +++ b/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/test/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2LoggerTest.java @@ -0,0 +1,47 @@ +package com.a.eye.skywalking.api.logging.impl.log4j2; + +import org.apache.logging.log4j.Logger; +import org.junit.Test; + +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + +/** + * Created by wusheng on 2017/2/28. + */ +public class Log4j2LoggerTest { + @Test + public void testLogProxy(){ + Logger mockLogger = spy(Logger.class); + Log4j2Logger logger = new Log4j2Logger(mockLogger); + + logger.isDebugEnable(); + verify(mockLogger, times(1)).isDebugEnabled(); + logger.isInfoEnable(); + verify(mockLogger, times(1)).isInfoEnabled(); + logger.isWarnEnable(); + verify(mockLogger, times(1)).isWarnEnabled(); + logger.isErrorEnable(); + verify(mockLogger, times(1)).isErrorEnabled(); + + logger.debug("string"); + verify(mockLogger, times(1)).debug("string"); + logger.debug("string", "arg1", "args"); + verify(mockLogger, times(1)).debug("string", new Object[]{"arg1", "args"}); + + logger.info("string"); + verify(mockLogger, times(1)).info("string"); + logger.info("string", "arg1", "args"); + verify(mockLogger, times(1)).info("string", new Object[]{"arg1", "args"}); + + logger.warn("string", "arg1", "args"); + verify(mockLogger, times(1)).warn("string", new Object[]{"arg1", "args"}); + + logger.error("string"); + verify(mockLogger, times(1)).error("string"); + NullPointerException exception = new NullPointerException(); + logger.error("string", exception); + verify(mockLogger, times(1)).error("string", exception); + } +} diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/test/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2ResolverTest.java b/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/test/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2ResolverTest.java new file mode 100644 index 000000000..ec54f32dc --- /dev/null +++ b/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/test/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2ResolverTest.java @@ -0,0 +1,18 @@ +package com.a.eye.skywalking.api.logging.impl.log4j2; + +import com.a.eye.skywalking.api.logging.api.ILog; +import org.junit.Assert; +import org.junit.Test; + +/** + * Created by wusheng on 2017/2/28. + */ +public class Log4j2ResolverTest { + @Test + public void testGetLogger() { + Log4j2Resolver resolver = new Log4j2Resolver(); + ILog logger = resolver.getLogger(Log4j2ResolverTest.class); + + Assert.assertTrue(logger instanceof Log4j2Logger); + } +}