You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2016/02/29 01:58:15 UTC
logging-log4j2 git commit: Use System.lineSeparator() instead of
system property.
Repository: logging-log4j2
Updated Branches:
refs/heads/master b0edd8c91 -> a14d740e4
Use System.lineSeparator() instead of system property.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a14d740e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a14d740e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a14d740e
Branch: refs/heads/master
Commit: a14d740e404c31c64676dfe52f85353e46092dd6
Parents: b0edd8c
Author: Matt Sicker <bo...@gmail.com>
Authored: Sun Feb 28 18:58:11 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Sun Feb 28 18:58:11 2016 -0600
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/TimestampMessageTest.java | 7 +++----
.../core/appender/MemoryMappedFileAppenderLocationTest.java | 2 +-
.../core/appender/MemoryMappedFileAppenderRemapTest.java | 2 +-
.../core/appender/MemoryMappedFileAppenderSimpleTest.java | 2 +-
.../apache/logging/log4j/core/async/perftest/PerfTest.java | 2 +-
.../log4j/core/async/perftest/PerfTestResultFormatter.java | 4 ++--
.../java/org/apache/logging/log4j/io/AbstractStreamTest.java | 2 +-
7 files changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a14d740e/log4j-core/src/test/java/org/apache/logging/log4j/core/TimestampMessageTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/TimestampMessageTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/TimestampMessageTest.java
index 5805edb..d76e613 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/TimestampMessageTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/TimestampMessageTest.java
@@ -16,9 +16,6 @@
*/
package org.apache.logging.log4j.core;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
import java.util.List;
import org.apache.logging.log4j.Logger;
@@ -37,6 +34,8 @@ import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
+import static org.junit.Assert.*;
+
/**
* Confirms that if you log a {@link TimestampMessage} then there are no unnecessary calls to {@link Clock}.
* <p>
@@ -72,7 +71,7 @@ public class TimestampMessageTest {
final List<String> msgs = app.getMessages();
assertNotNull(msgs);
assertEquals(1, msgs.size());
- final String NL = System.getProperty("line.separator");
+ final String NL = System.lineSeparator();
assertEquals("123456789000 Message with embedded timestamp" + NL, msgs.get(0));
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a14d740e/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 f767c5e..113abab 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
@@ -71,7 +71,7 @@ public class MemoryMappedFileAppenderLocationTest {
} finally {
CoreLoggerContexts.stopLoggerContext(false);
}
- final int LINESEP = System.getProperty("line.separator").length();
+ final int LINESEP = System.lineSeparator().length();
assertEquals("Shrunk to actual used size", 474 + 2 * LINESEP, f.length());
String line1, line2, line3;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a14d740e/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 54f5103..3c6d301 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
@@ -71,7 +71,7 @@ public class MemoryMappedFileAppenderRemapTest {
} finally {
CoreLoggerContexts.stopLoggerContext(false);
}
- final int LINESEP = System.getProperty("line.separator").length();
+ final int LINESEP = System.lineSeparator().length();
assertEquals("Shrunk to actual used size", 658 + 3 * LINESEP, f.length());
String line1, line2, line3, line4;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a14d740e/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 9d310c9..277e046 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
@@ -66,7 +66,7 @@ public class MemoryMappedFileAppenderSimpleTest {
} finally {
CoreLoggerContexts.stopLoggerContext(false);
}
- final int LINESEP = System.getProperty("line.separator").length();
+ final int LINESEP = System.lineSeparator().length();
assertEquals("Shrunk to actual used size", 186 + 2 * LINESEP, f.length());
String line1, line2, line3;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a14d740e/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTest.java
index fed2957..937e6ec 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTest.java
@@ -132,7 +132,7 @@ public class PerfTest {
* Log some extra bytes to fill the memory mapped buffer to force it to remap.
*/
private void forceRemap(final int linesPerIteration, final int iterations, final IPerfTestRunner runner) {
- final int LINESEP = System.getProperty("line.separator").getBytes(Charset.defaultCharset()).length;
+ final int LINESEP = System.lineSeparator().getBytes(Charset.defaultCharset()).length;
final int bytesPerLine = 0 + IPerfTestRunner.THROUGHPUT_MSG.getBytes().length;
final int bytesWritten = bytesPerLine * linesPerIteration * iterations;
final int threshold = 1073741824; // magic number: defined in perf9MMapLocation.xml
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a14d740e/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestResultFormatter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestResultFormatter.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestResultFormatter.java
index 9ab4ae9..43069c6 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestResultFormatter.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestResultFormatter.java
@@ -33,7 +33,7 @@ import java.util.TreeMap;
* format it for pasting into Excel.
*/
class PerfTestResultFormatter {
- static final String LF = System.getProperty("line.separator");
+ static final String LF = System.lineSeparator();
static final NumberFormat NUM = new DecimalFormat("#,##0");
static class Stats {
@@ -179,4 +179,4 @@ class PerfTestResultFormatter {
System.out.println();
System.out.println(fmt.throughputTable());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a14d740e/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/AbstractStreamTest.java
----------------------------------------------------------------------
diff --git a/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/AbstractStreamTest.java b/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/AbstractStreamTest.java
index 05502f5..d73fd02 100644
--- a/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/AbstractStreamTest.java
+++ b/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/AbstractStreamTest.java
@@ -34,7 +34,7 @@ public abstract class AbstractStreamTest {
return ctx.getLogger("UnitTestLogger");
}
- protected final static String NEWLINE = System.getProperty("line.separator");
+ protected final static String NEWLINE = System.lineSeparator();
protected final static Level LEVEL = Level.ERROR;
protected final static String FIRST = "first";