You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/08/28 15:11:58 UTC
[34/50] logging-log4j2 git commit: Fix unit tests
Fix unit tests
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5c9a387b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5c9a387b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5c9a387b
Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: 5c9a387b03db4bc3dc4c809909422a8ee4f9f774
Parents: b5a232a
Author: Mikael St�ldal <mi...@magine.com>
Authored: Wed Aug 3 13:52:49 2016 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Wed Aug 3 13:52:49 2016 +0200
----------------------------------------------------------------------
.../apache/logging/log4j/scala/LoggerTest.scala | 52 +++-----------------
.../apache/logging/log4j/scala/LoggerTest.scala | 52 +++-----------------
2 files changed, 12 insertions(+), 92 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c9a387b/log4j-api-scala_2.10/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala
----------------------------------------------------------------------
diff --git a/log4j-api-scala_2.10/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala b/log4j-api-scala_2.10/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala
index ba02437..91d67df 100644
--- a/log4j-api-scala_2.10/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala
+++ b/log4j-api-scala_2.10/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala
@@ -16,7 +16,7 @@
*/
package org.apache.logging.log4j.scala
-import org.apache.logging.log4j.message.{DefaultFlowMessageFactory, EntryMessage, Message, ParameterizedMessage, ParameterizedMessageFactory}
+import org.apache.logging.log4j.message.{DefaultFlowMessageFactory, Message, ParameterizedMessage, ParameterizedMessageFactory}
import org.apache.logging.log4j.spi.{AbstractLogger, ExtendedLogger}
import org.apache.logging.log4j.{Level, Marker, MarkerManager}
import org.junit.runner.RunWith
@@ -431,7 +431,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar {
}
- test("traceEntry enabled") {
+ test("traceEntry") {
val f = fixture
when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.ENTRY_MARKER, null.asInstanceOf[AnyRef], null)).thenReturn(true)
val logger = Logger(f.mockLogger)
@@ -439,14 +439,6 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar {
verify(f.mockLogger).traceEntry()
}
- ignore("traceEntry disabled") {
- val f = fixture
- when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.ENTRY_MARKER, null.asInstanceOf[AnyRef], null)).thenReturn(false)
- val logger = Logger(f.mockLogger)
- logger.traceEntry()
- verify(f.mockLogger, never).traceEntry()
- }
-
test("traceEntry enabled with params") {
val f = fixture
when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.ENTRY_MARKER, null.asInstanceOf[AnyRef], null)).thenReturn(true)
@@ -479,7 +471,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar {
verify(f.mockLogger, never).traceEntry(any[Message])
}
- test("traceExit enabled") {
+ test("traceExit") {
val f = fixture
when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(true)
val logger = Logger(f.mockLogger)
@@ -487,15 +479,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar {
verify(f.mockLogger).traceExit()
}
- ignore("traceExit disabled") {
- val f = fixture
- when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(false)
- val logger = Logger(f.mockLogger)
- logger.traceExit()
- verify(f.mockLogger, never).traceExit()
- }
-
- test("traceExit enabled with result") {
+ test("traceExit with result") {
val f = fixture
when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(true)
val logger = Logger(f.mockLogger)
@@ -503,15 +487,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar {
verify(f.mockLogger).traceExit(result)
}
- ignore("traceExit disabled with result") {
- val f = fixture
- when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(false)
- val logger = Logger(f.mockLogger)
- logger.traceExit(result)
- verify(f.mockLogger, never).traceExit(anyString())
- }
-
- test("traceExit enabled with entrymessage") {
+ test("traceExit with entrymessage") {
val f = fixture
when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(true)
val logger = Logger(f.mockLogger)
@@ -519,15 +495,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar {
verify(f.mockLogger).traceExit(entryMsg)
}
- ignore("traceExit disabled with entrymessage") {
- val f = fixture
- when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(false)
- val logger = Logger(f.mockLogger)
- logger.traceExit(entryMsg)
- verify(f.mockLogger, never).traceExit(any[EntryMessage])
- }
-
- test("traceExit enabled with entrymessage and result") {
+ test("traceExit with entrymessage and result") {
val f = fixture
when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(true)
val logger = Logger(f.mockLogger)
@@ -535,14 +503,6 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar {
verify(f.mockLogger).traceExit(entryMsg, result)
}
- ignore("traceExit disabled with entrymessage and result") {
- val f = fixture
- when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(false)
- val logger = Logger(f.mockLogger)
- logger.traceExit(entryMsg, result)
- verify(f.mockLogger, never).traceExit(any[EntryMessage], anyString())
- }
-
test("traceExit enabled with message") {
val f = fixture
when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(true)
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c9a387b/log4j-api-scala_2.11/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala
----------------------------------------------------------------------
diff --git a/log4j-api-scala_2.11/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala b/log4j-api-scala_2.11/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala
index ba02437..91d67df 100644
--- a/log4j-api-scala_2.11/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala
+++ b/log4j-api-scala_2.11/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala
@@ -16,7 +16,7 @@
*/
package org.apache.logging.log4j.scala
-import org.apache.logging.log4j.message.{DefaultFlowMessageFactory, EntryMessage, Message, ParameterizedMessage, ParameterizedMessageFactory}
+import org.apache.logging.log4j.message.{DefaultFlowMessageFactory, Message, ParameterizedMessage, ParameterizedMessageFactory}
import org.apache.logging.log4j.spi.{AbstractLogger, ExtendedLogger}
import org.apache.logging.log4j.{Level, Marker, MarkerManager}
import org.junit.runner.RunWith
@@ -431,7 +431,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar {
}
- test("traceEntry enabled") {
+ test("traceEntry") {
val f = fixture
when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.ENTRY_MARKER, null.asInstanceOf[AnyRef], null)).thenReturn(true)
val logger = Logger(f.mockLogger)
@@ -439,14 +439,6 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar {
verify(f.mockLogger).traceEntry()
}
- ignore("traceEntry disabled") {
- val f = fixture
- when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.ENTRY_MARKER, null.asInstanceOf[AnyRef], null)).thenReturn(false)
- val logger = Logger(f.mockLogger)
- logger.traceEntry()
- verify(f.mockLogger, never).traceEntry()
- }
-
test("traceEntry enabled with params") {
val f = fixture
when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.ENTRY_MARKER, null.asInstanceOf[AnyRef], null)).thenReturn(true)
@@ -479,7 +471,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar {
verify(f.mockLogger, never).traceEntry(any[Message])
}
- test("traceExit enabled") {
+ test("traceExit") {
val f = fixture
when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(true)
val logger = Logger(f.mockLogger)
@@ -487,15 +479,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar {
verify(f.mockLogger).traceExit()
}
- ignore("traceExit disabled") {
- val f = fixture
- when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(false)
- val logger = Logger(f.mockLogger)
- logger.traceExit()
- verify(f.mockLogger, never).traceExit()
- }
-
- test("traceExit enabled with result") {
+ test("traceExit with result") {
val f = fixture
when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(true)
val logger = Logger(f.mockLogger)
@@ -503,15 +487,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar {
verify(f.mockLogger).traceExit(result)
}
- ignore("traceExit disabled with result") {
- val f = fixture
- when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(false)
- val logger = Logger(f.mockLogger)
- logger.traceExit(result)
- verify(f.mockLogger, never).traceExit(anyString())
- }
-
- test("traceExit enabled with entrymessage") {
+ test("traceExit with entrymessage") {
val f = fixture
when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(true)
val logger = Logger(f.mockLogger)
@@ -519,15 +495,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar {
verify(f.mockLogger).traceExit(entryMsg)
}
- ignore("traceExit disabled with entrymessage") {
- val f = fixture
- when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(false)
- val logger = Logger(f.mockLogger)
- logger.traceExit(entryMsg)
- verify(f.mockLogger, never).traceExit(any[EntryMessage])
- }
-
- test("traceExit enabled with entrymessage and result") {
+ test("traceExit with entrymessage and result") {
val f = fixture
when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(true)
val logger = Logger(f.mockLogger)
@@ -535,14 +503,6 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar {
verify(f.mockLogger).traceExit(entryMsg, result)
}
- ignore("traceExit disabled with entrymessage and result") {
- val f = fixture
- when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(false)
- val logger = Logger(f.mockLogger)
- logger.traceExit(entryMsg, result)
- verify(f.mockLogger, never).traceExit(any[EntryMessage], anyString())
- }
-
test("traceExit enabled with message") {
val f = fixture
when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(true)