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 2014/10/19 21:39:58 UTC
git commit: Revert changes to unit tests that cause compilation
errors in Java 6
Repository: logging-log4j2
Updated Branches:
refs/heads/master fe6943fa0 -> 4a8a8245b
Revert changes to unit tests that cause compilation errors in Java 6
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4a8a8245
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4a8a8245
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4a8a8245
Branch: refs/heads/master
Commit: 4a8a8245ba6f0a8b8993919aebe2b4c7c68d62ae
Parents: fe6943f
Author: rgoers <ra...@dslextreme.com>
Authored: Sun Oct 19 12:39:53 2014 -0700
Committer: rgoers <ra...@dslextreme.com>
Committed: Sun Oct 19 12:39:53 2014 -0700
----------------------------------------------------------------------
.../src/test/java/org/apache/logging/slf4j/LoggerTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a8a8245/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java
----------------------------------------------------------------------
diff --git a/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java b/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java
index e39c47c..b309edb 100644
--- a/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java
+++ b/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java
@@ -142,7 +142,7 @@ public class LoggerTest {
final List<String> msgs = list.strList;
assertThat(msgs, hasSize(1));
final String expected = "java.lang.Throwable: Testing";
- assertThat(msgs, hasItem(containsString(expected)));
+ assertTrue("Incorrect message data", msgs.get(0).contains(expected));
}
@SuppressWarnings("unchecked")
@@ -153,7 +153,7 @@ public class LoggerTest {
ThreadContext.clearMap();
logger.debug("Debug message");
assertThat(list.strList, hasSize(2));
- assertThat(list.strList, hasItems(startsWith("2010"), not(startsWith("2010"))));
+ assertTrue("Incorrect year", list.strList.get(0).startsWith("2010"));
}
}