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 2014/09/18 18:24:53 UTC
[06/17] git commit: LOG4J2-431: fix JUnit tests: account for
platform-dependent line separators
LOG4J2-431: fix JUnit tests: account for platform-dependent line
separators
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/0d668fee
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/0d668fee
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/0d668fee
Branch: refs/heads/master
Commit: 0d668feef19c3475d710ff55a7878e9bb09648eb
Parents: 9871505
Author: rpopma <rp...@apache.org>
Authored: Wed Sep 17 21:21:45 2014 +0900
Committer: rpopma <rp...@apache.org>
Committed: Wed Sep 17 21:21:45 2014 +0900
----------------------------------------------------------------------
.../log4j/core/appender/MemoryMappedFileAppenderLocationTest.java | 3 ++-
.../log4j/core/appender/MemoryMappedFileAppenderRemapTest.java | 3 ++-
.../log4j/core/appender/MemoryMappedFileAppenderSimpleTest.java | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0d668fee/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderLocationTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderLocationTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderLocationTest.java
index 5721a91..8897f11 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderLocationTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderLocationTest.java
@@ -69,7 +69,8 @@ public class MemoryMappedFileAppenderLocationTest {
} finally {
((LoggerContext) LogManager.getContext(false)).stop();
}
- assertEquals("Shrunk to actual used size", 478, f.length());
+ final int LINESEP = System.getProperty("line.separator").length();
+ assertEquals("Shrunk to actual used size", 474 + 2 * LINESEP, f.length());
String line1, line2, line3;
final BufferedReader reader = new BufferedReader(new FileReader(LOGFILE));
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0d668fee/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderRemapTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderRemapTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderRemapTest.java
index bcb9cdc..6a68f87 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderRemapTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderRemapTest.java
@@ -69,7 +69,8 @@ public class MemoryMappedFileAppenderRemapTest {
} finally {
((LoggerContext) LogManager.getContext(false)).stop();
}
- assertEquals("Shrunk to actual used size", 664, f.length());
+ final int LINESEP = System.getProperty("line.separator").length();
+ assertEquals("Shrunk to actual used size", 658 + 3 * LINESEP, f.length());
String line1, line2, line3, line4;
final BufferedReader reader = new BufferedReader(new FileReader(LOGFILE));
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0d668fee/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderSimpleTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderSimpleTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderSimpleTest.java
index bedeb7f..491d7c4 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderSimpleTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderSimpleTest.java
@@ -64,7 +64,8 @@ public class MemoryMappedFileAppenderSimpleTest {
} finally {
((LoggerContext) LogManager.getContext(false)).stop();
}
- assertEquals("Shrunk to actual used size", 190, f.length());
+ final int LINESEP = System.getProperty("line.separator").length();
+ assertEquals("Shrunk to actual used size", 186 + 2 * LINESEP, f.length());
String line1, line2, line3;
final BufferedReader reader = new BufferedReader(new FileReader(LOGFILE));