You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2019/12/10 15:36:44 UTC
[logging-log4j2] branch master updated: Fix unit tests
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/master by this push:
new 5e063cf Fix unit tests
5e063cf is described below
commit 5e063cf4a6c5ad252decab94aa2aa044355afa90
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Tue Dec 10 08:36:24 2019 -0700
Fix unit tests
---
.../resources/{log4j1-maprewrite.xml => log4j1-mapRewrite.xml} | 0
log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java | 8 +++++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/log4j-1.2-api/src/test/resources/log4j1-maprewrite.xml b/log4j-1.2-api/src/test/resources/log4j1-mapRewrite.xml
similarity index 100%
rename from log4j-1.2-api/src/test/resources/log4j1-maprewrite.xml
rename to log4j-1.2-api/src/test/resources/log4j1-mapRewrite.xml
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
index 00eb90e..53afb51 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
@@ -63,11 +63,13 @@ public class LoggerTest {
logger.atError().withMarker(marker).log("Hello {}", "John");
logger.atWarn().withThrowable(new Throwable("This is a test")).log((Message) new SimpleMessage("Log4j rocks!"));
assertEquals(3, results.size());
- assertThat("Incorrect message 1", results.get(0), equalTo(" DEBUG org.apache.logging.log4j.LoggerTest.builder(LoggerTest.java:62) Hello"));
+ assertThat("Incorrect message 1", results.get(0),
+ equalTo(" DEBUG org.apache.logging.log4j.LoggerTest.builder(LoggerTest.java:62) Hello"));
assertThat("Incorrect message 2", results.get(1), equalTo("test ERROR Hello John"));
assertThat("Incorrect message 3", results.get(2),
- startsWith(" WARN Log4j rocks! java.lang.Throwable: This is a test" + System.lineSeparator()
- + "\tat org.apache.logging.log4j.LoggerTest.builder(LoggerTest.java:64)"));
+ startsWith(" WARN Log4j rocks! java.lang.Throwable: This is a test"));
+ assertThat("Throwable incorrect in message 3", results.get(2),
+ containsString("at org.apache.logging.log4j.LoggerTest.builder(LoggerTest.java:64)"));
}
@Test