Author: ggregory
Date: Tue May 13 20:26:31 2014
New Revision: 1594370
URL: http://svn.apache.org/r1594370
Log:
Rename org.apache.logging.log4j.core.util.Constants.LINE_SEP to LINE_SEPARATOR
Modified:
logging/log4j/log4j2/trunk/log4j-1.2-api/src/main/java/org/apache/log4j/Layout.java
logging/log4j/log4j2/trunk/log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LineSeparatorPatternConverter.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Constants.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/HostNameTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptionsTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketReconnectTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverterTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/StyleConverterTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/test/layout/BasicLayout.java
logging/log4j/log4j2/trunk/log4j-jcl/src/test/java/org/apache/logging/log4j/jcl/LoggerTest.java
logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java
logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java
Modified:
logging/log4j/log4j2/trunk/log4j-1.2-api/src/main/java/org/apache/log4j/Layout.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-1.2-api/src/main/java/org/apache/log4j/Layout.java?rev=1594370&r1=1594369&r2=1594370&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-1.2-api/src/main/java/org/apache/log4j/Layout.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-1.2-api/src/main/java/org/apache/log4j/Layout.java
Tue May 13 20:26:31 2014
@@ -25,7 +25,7 @@ import org.apache.logging.log4j.core.uti
public abstract class Layout {
/** Note that the line.separator property can be looked up even by
applets. */
- public static final int LINE_SEP_LEN = Constants.LINE_SEP.length();
+ public static final int LINE_SEP_LEN = Constants.LINE_SEPARATOR.length();
/**
* Implement this method to create your own layout format.
Modified:
logging/log4j/log4j2/trunk/log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java?rev=1594370&r1=1594369&r2=1594370&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java
Tue May 13 20:26:31 2014
@@ -173,7 +173,7 @@ public class CategoryTest {
final String msg = msgs.get(0);
appender.clear();
final String threadName = Thread.currentThread().getName();
- final String expected = "ERROR o.a.l.CategoryTest [" + threadName + "]
Test Message" + Constants.LINE_SEP;
+ final String expected = "ERROR o.a.l.CategoryTest [" + threadName + "]
Test Message" + Constants.LINE_SEPARATOR;
assertTrue("Incorrect message \"" + msg + '"' + " expected \"" +
expected + '"', msg.endsWith(expected));
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java?rev=1594370&r1=1594369&r2=1594370&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java
Tue May 13 20:26:31 2014
@@ -80,7 +80,7 @@ public final class ThrowableFormatOption
*/
protected ThrowableFormatOptions(final int lines, final String separator,
final List<String> packages) {
this.lines = lines;
- this.separator = separator == null ? Constants.LINE_SEP : separator;
+ this.separator = separator == null ? Constants.LINE_SEPARATOR :
separator;
this.packages = packages;
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java?rev=1594370&r1=1594369&r2=1594370&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java
Tue May 13 20:26:31 2014
@@ -50,7 +50,7 @@ public final class HTMLLayout extends Ab
private static final String TRACE_PREFIX = "<br
/> ";
- private static final String REGEXP = Constants.LINE_SEP.equals("\n") ?
"\n" : Constants.LINE_SEP + "|\n";
+ private static final String REGEXP = Constants.LINE_SEPARATOR.equals("\n")
? "\n" : Constants.LINE_SEPARATOR + "|\n";
private static final String DEFAULT_TITLE = "Log4j Log Messages";
@@ -119,16 +119,16 @@ public final class HTMLLayout extends Ab
public String toSerializable(final LogEvent event) {
final StringBuilder sbuf = new StringBuilder(BUF_SIZE);
-
sbuf.append(Constants.LINE_SEP).append("<tr>").append(Constants.LINE_SEP);
+
sbuf.append(Constants.LINE_SEPARATOR).append("<tr>").append(Constants.LINE_SEPARATOR);
sbuf.append("<td>");
sbuf.append(event.getTimeMillis() - jvmStartTime);
- sbuf.append("</td>").append(Constants.LINE_SEP);
+ sbuf.append("</td>").append(Constants.LINE_SEPARATOR);
final String escapedThread =
Transform.escapeHtmlTags(event.getThreadName());
sbuf.append("<td title=\"").append(escapedThread).append(" thread\">");
sbuf.append(escapedThread);
- sbuf.append("</td>").append(Constants.LINE_SEP);
+ sbuf.append("</td>").append(Constants.LINE_SEPARATOR);
sbuf.append("<td title=\"Level\">");
if (event.getLevel().equals(Level.DEBUG)) {
@@ -142,7 +142,7 @@ public final class HTMLLayout extends Ab
} else {
sbuf.append(Transform.escapeHtmlTags(String.valueOf(event.getLevel())));
}
- sbuf.append("</td>").append(Constants.LINE_SEP);
+ sbuf.append("</td>").append(Constants.LINE_SEPARATOR);
String escapedLogger = Transform.escapeHtmlTags(event.getLoggerName());
if (escapedLogger.isEmpty()) {
@@ -150,7 +150,7 @@ public final class HTMLLayout extends Ab
}
sbuf.append("<td title=\"").append(escapedLogger).append(" logger\">");
sbuf.append(escapedLogger);
- sbuf.append("</td>").append(Constants.LINE_SEP);
+ sbuf.append("</td>").append(Constants.LINE_SEPARATOR);
if (locationInfo) {
final StackTraceElement element = event.getSource();
@@ -158,20 +158,20 @@ public final class HTMLLayout extends Ab
sbuf.append(Transform.escapeHtmlTags(element.getFileName()));
sbuf.append(':');
sbuf.append(element.getLineNumber());
- sbuf.append("</td>").append(Constants.LINE_SEP);
+ sbuf.append("</td>").append(Constants.LINE_SEPARATOR);
}
sbuf.append("<td title=\"Message\">");
sbuf.append(Transform.escapeHtmlTags(event.getMessage().getFormattedMessage()).replaceAll(REGEXP,
"<br />"));
- sbuf.append("</td>").append(Constants.LINE_SEP);
- sbuf.append("</tr>").append(Constants.LINE_SEP);
+ sbuf.append("</td>").append(Constants.LINE_SEPARATOR);
+ sbuf.append("</tr>").append(Constants.LINE_SEPARATOR);
if (event.getContextStack().getDepth() > 0) {
sbuf.append("<tr><td bgcolor=\"#EEEEEE\" style=\"font-size :
").append(fontSize);
sbuf.append(";\" colspan=\"6\" ");
sbuf.append("title=\"Nested Diagnostic Context\">");
sbuf.append("NDC:
").append(Transform.escapeHtmlTags(event.getContextStack().toString()));
- sbuf.append("</td></tr>").append(Constants.LINE_SEP);
+ sbuf.append("</td></tr>").append(Constants.LINE_SEPARATOR);
}
if (event.getContextMap().size() > 0) {
@@ -179,7 +179,7 @@ public final class HTMLLayout extends Ab
sbuf.append(";\" colspan=\"6\" ");
sbuf.append("title=\"Mapped Diagnostic Context\">");
sbuf.append("MDC:
").append(Transform.escapeHtmlTags(event.getContextMap().toString()));
- sbuf.append("</td></tr>").append(Constants.LINE_SEP);
+ sbuf.append("</td></tr>").append(Constants.LINE_SEPARATOR);
}
final Throwable throwable = event.getThrown();
@@ -187,7 +187,7 @@ public final class HTMLLayout extends Ab
sbuf.append("<tr><td bgcolor=\"#993300\" style=\"color:White;
font-size : ").append(fontSize);
sbuf.append(";\" colspan=\"6\">");
appendThrowableAsHTML(throwable, sbuf);
- sbuf.append("</td></tr>").append(Constants.LINE_SEP);
+ sbuf.append("</td></tr>").append(Constants.LINE_SEPARATOR);
}
return sbuf.toString();
@@ -242,7 +242,7 @@ public final class HTMLLayout extends Ab
first = false;
}
sbuf.append(Transform.escapeHtmlTags(line));
- sbuf.append(Constants.LINE_SEP);
+ sbuf.append(Constants.LINE_SEPARATOR);
}
}
@@ -255,36 +255,36 @@ public final class HTMLLayout extends Ab
final StringBuilder sbuf = new StringBuilder();
sbuf.append("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01
Transitional//EN\" ");
sbuf.append("\"http://www.w3.org/TR/html4/loose.dtd\";>");
- sbuf.append(Constants.LINE_SEP);
- sbuf.append("<html>").append(Constants.LINE_SEP);
- sbuf.append("<head>").append(Constants.LINE_SEP);
- sbuf.append("<meta
charset=\"").append(getCharset()).append("\"/>").append(Constants.LINE_SEP);
-
sbuf.append("<title>").append(title).append("</title>").append(Constants.LINE_SEP);
- sbuf.append("<style type=\"text/css\">").append(Constants.LINE_SEP);
- sbuf.append("<!--").append(Constants.LINE_SEP);
+ sbuf.append(Constants.LINE_SEPARATOR);
+ sbuf.append("<html>").append(Constants.LINE_SEPARATOR);
+ sbuf.append("<head>").append(Constants.LINE_SEPARATOR);
+ sbuf.append("<meta
charset=\"").append(getCharset()).append("\"/>").append(Constants.LINE_SEPARATOR);
+
sbuf.append("<title>").append(title).append("</title>").append(Constants.LINE_SEPARATOR);
+ sbuf.append("<style
type=\"text/css\">").append(Constants.LINE_SEPARATOR);
+ sbuf.append("<!--").append(Constants.LINE_SEPARATOR);
sbuf.append("body, table {font-family:").append(font).append(";
font-size: ");
- sbuf.append(headerSize).append(";}").append(Constants.LINE_SEP);
- sbuf.append("th {background: #336699; color: #FFFFFF; text-align:
left;}").append(Constants.LINE_SEP);
- sbuf.append("-->").append(Constants.LINE_SEP);
- sbuf.append("</style>").append(Constants.LINE_SEP);
- sbuf.append("</head>").append(Constants.LINE_SEP);
- sbuf.append("<body bgcolor=\"#FFFFFF\" topmargin=\"6\"
leftmargin=\"6\">").append(Constants.LINE_SEP);
- sbuf.append("<hr size=\"1\" noshade>").append(Constants.LINE_SEP);
- sbuf.append("Log session start time " + new java.util.Date() +
"<br>").append(Constants.LINE_SEP);
- sbuf.append("<br>").append(Constants.LINE_SEP);
+ sbuf.append(headerSize).append(";}").append(Constants.LINE_SEPARATOR);
+ sbuf.append("th {background: #336699; color: #FFFFFF; text-align:
left;}").append(Constants.LINE_SEPARATOR);
+ sbuf.append("-->").append(Constants.LINE_SEPARATOR);
+ sbuf.append("</style>").append(Constants.LINE_SEPARATOR);
+ sbuf.append("</head>").append(Constants.LINE_SEPARATOR);
+ sbuf.append("<body bgcolor=\"#FFFFFF\" topmargin=\"6\"
leftmargin=\"6\">").append(Constants.LINE_SEPARATOR);
+ sbuf.append("<hr size=\"1\"
noshade>").append(Constants.LINE_SEPARATOR);
+ sbuf.append("Log session start time " + new java.util.Date() +
"<br>").append(Constants.LINE_SEPARATOR);
+ sbuf.append("<br>").append(Constants.LINE_SEPARATOR);
sbuf.append(
"<table cellspacing=\"0\" cellpadding=\"4\" border=\"1\"
bordercolor=\"#224466\" width=\"100%\">");
- sbuf.append(Constants.LINE_SEP);
- sbuf.append("<tr>").append(Constants.LINE_SEP);
- sbuf.append("<th>Time</th>").append(Constants.LINE_SEP);
- sbuf.append("<th>Thread</th>").append(Constants.LINE_SEP);
- sbuf.append("<th>Level</th>").append(Constants.LINE_SEP);
- sbuf.append("<th>Logger</th>").append(Constants.LINE_SEP);
+ sbuf.append(Constants.LINE_SEPARATOR);
+ sbuf.append("<tr>").append(Constants.LINE_SEPARATOR);
+ sbuf.append("<th>Time</th>").append(Constants.LINE_SEPARATOR);
+ sbuf.append("<th>Thread</th>").append(Constants.LINE_SEPARATOR);
+ sbuf.append("<th>Level</th>").append(Constants.LINE_SEPARATOR);
+ sbuf.append("<th>Logger</th>").append(Constants.LINE_SEPARATOR);
if (locationInfo) {
- sbuf.append("<th>File:Line</th>").append(Constants.LINE_SEP);
+ sbuf.append("<th>File:Line</th>").append(Constants.LINE_SEPARATOR);
}
- sbuf.append("<th>Message</th>").append(Constants.LINE_SEP);
- sbuf.append("</tr>").append(Constants.LINE_SEP);
+ sbuf.append("<th>Message</th>").append(Constants.LINE_SEPARATOR);
+ sbuf.append("</tr>").append(Constants.LINE_SEPARATOR);
return sbuf.toString().getBytes(getCharset());
}
@@ -295,8 +295,8 @@ public final class HTMLLayout extends Ab
@Override
public byte[] getFooter() {
final StringBuilder sbuf = new StringBuilder();
- sbuf.append("</table>").append(Constants.LINE_SEP);
- sbuf.append("<br>").append(Constants.LINE_SEP);
+ sbuf.append("</table>").append(Constants.LINE_SEPARATOR);
+ sbuf.append("<br>").append(Constants.LINE_SEPARATOR);
sbuf.append("</body></html>");
return sbuf.toString().getBytes(getCharset());
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java?rev=1594370&r1=1594369&r2=1594370&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
Tue May 13 20:26:31 2014
@@ -74,9 +74,9 @@ public final class ExtendedThrowablePatt
if (len > 0 && !Character.isWhitespace(toAppendTo.charAt(len -
1))) {
toAppendTo.append(' ');
}
- if (!options.allLines() ||
!Constants.LINE_SEP.equals(options.getSeparator())) {
+ if (!options.allLines() ||
!Constants.LINE_SEPARATOR.equals(options.getSeparator())) {
final StringBuilder sb = new StringBuilder();
- final String[] array = trace.split(Constants.LINE_SEP);
+ final String[] array = trace.split(Constants.LINE_SEPARATOR);
final int limit = options.minLines(array.length) - 1;
for (int i = 0; i <= limit; ++i) {
sb.append(array[i]);
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LineSeparatorPatternConverter.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LineSeparatorPatternConverter.java?rev=1594370&r1=1594369&r2=1594370&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LineSeparatorPatternConverter.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LineSeparatorPatternConverter.java
Tue May 13 20:26:31 2014
@@ -43,7 +43,7 @@ public final class LineSeparatorPatternC
*/
private LineSeparatorPatternConverter() {
super("Line Sep", "lineSep");
- lineSep = Constants.LINE_SEP;
+ lineSep = Constants.LINE_SEPARATOR;
}
/**
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java?rev=1594370&r1=1594369&r2=1594370&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java
Tue May 13 20:26:31 2014
@@ -74,9 +74,9 @@ public final class RootThrowablePatternC
if (len > 0 && !Character.isWhitespace(toAppendTo.charAt(len -
1))) {
toAppendTo.append(' ');
}
- if (!options.allLines() ||
!Constants.LINE_SEP.equals(options.getSeparator())) {
+ if (!options.allLines() ||
!Constants.LINE_SEPARATOR.equals(options.getSeparator())) {
final StringBuilder sb = new StringBuilder();
- final String[] array = trace.split(Constants.LINE_SEP);
+ final String[] array = trace.split(Constants.LINE_SEPARATOR);
final int limit = options.minLines(array.length) - 1;
for (int i = 0; i <= limit; ++i) {
sb.append(array[i]);
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java?rev=1594370&r1=1594369&r2=1594370&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java
Tue May 13 20:26:31 2014
@@ -141,9 +141,9 @@ public class ThrowablePatternConverter e
if (len > 0 && !Character.isWhitespace(buffer.charAt(len - 1))) {
buffer.append(' ');
}
- if (!options.allLines() ||
!Constants.LINE_SEP.equals(options.getSeparator())) {
+ if (!options.allLines() ||
!Constants.LINE_SEPARATOR.equals(options.getSeparator())) {
final StringBuilder sb = new StringBuilder();
- final String[] array = w.toString().split(Constants.LINE_SEP);
+ final String[] array =
w.toString().split(Constants.LINE_SEPARATOR);
final int limit = options.minLines(array.length) - 1;
for (int i = 0; i <= limit; ++i) {
sb.append(array[i]);
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Constants.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Constants.java?rev=1594370&r1=1594369&r2=1594370&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Constants.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Constants.java
Tue May 13 20:26:31 2014
@@ -43,7 +43,7 @@ public final class Constants {
/**
* Line separator.
*/
- public static final String LINE_SEP =
PropertiesUtil.getProperties().getStringProperty("line.separator", "\n");
+ public static final String LINE_SEPARATOR =
PropertiesUtil.getProperties().getStringProperty("line.separator", "\n");
/**
* Number of milliseconds in a second.
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/HostNameTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/HostNameTest.java?rev=1594370&r1=1594369&r2=1594370&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/HostNameTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/HostNameTest.java
Tue May 13 20:26:31 2014
@@ -84,7 +84,7 @@ public class HostNameTest {
testLogger.debug("Hello, {}", "World");
final List<String> msgs = host.getMessages();
assertTrue("Incorrect number of events. Expected 1, actual " +
msgs.size(), msgs.size() == 1);
- String expected = NetUtils.getLocalHostname() + Constants.LINE_SEP;
+ String expected = NetUtils.getLocalHostname() +
Constants.LINE_SEPARATOR;
assertTrue("Incorrect hostname - expected " + expected + " actual - "
+ msgs.get(0),
msgs.get(0).endsWith(expected));
assertNotNull("No Host FileAppender file name",
hostFile.getFileName());
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java?rev=1594370&r1=1594369&r2=1594370&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java
Tue May 13 20:26:31 2014
@@ -66,7 +66,7 @@ public class ConsoleAppenderTest {
System.setOut(ps);
final String msg = baos.toString();
assertNotNull("No message", msg);
- assertTrue("Incorrect message: " + msg , msg.endsWith("Test" +
Constants.LINE_SEP));
+ assertTrue("Incorrect message: " + msg , msg.endsWith("Test" +
Constants.LINE_SEPARATOR));
app.stop();
assertFalse("Appender did not stop", app.isStarted());
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java?rev=1594370&r1=1594369&r2=1594370&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java
Tue May 13 20:26:31 2014
@@ -46,7 +46,7 @@ public class OutputStreamAppenderTest {
app.append(event);
final String msg = app.toString();
assertNotNull("No message", msg);
- assertTrue("Incorrect message: " + msg , msg.endsWith("Test" +
Constants.LINE_SEP));
+ assertTrue("Incorrect message: " + msg , msg.endsWith("Test" +
Constants.LINE_SEPARATOR));
app.stop();
assertFalse("Appender did not stop", app.isStarted());
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptionsTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptionsTest.java?rev=1594370&r1=1594369&r2=1594370&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptionsTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptionsTest.java
Tue May 13 20:26:31 2014
@@ -56,7 +56,7 @@ public final class ThrowableFormatOption
*/
@Test
public void testNull() {
- test(null, Integer.MAX_VALUE, Constants.LINE_SEP, null);
+ test(null, Integer.MAX_VALUE, Constants.LINE_SEPARATOR, null);
}
/**
@@ -64,7 +64,7 @@ public final class ThrowableFormatOption
*/
@Test
public void testEmpty() {
- test(new String[]{}, Integer.MAX_VALUE, Constants.LINE_SEP, null);
+ test(new String[]{}, Integer.MAX_VALUE, Constants.LINE_SEPARATOR,
null);
}
/**
@@ -72,7 +72,7 @@ public final class ThrowableFormatOption
*/
@Test
public void testOneNullElement() {
- test(new String[]{null}, Integer.MAX_VALUE, Constants.LINE_SEP, null);
+ test(new String[]{null}, Integer.MAX_VALUE, Constants.LINE_SEPARATOR,
null);
}
/**
@@ -80,7 +80,7 @@ public final class ThrowableFormatOption
*/
@Test
public void testOneEmptyElement() {
- test(new String[]{""}, Integer.MAX_VALUE, Constants.LINE_SEP, null);
+ test(new String[]{""}, Integer.MAX_VALUE, Constants.LINE_SEPARATOR,
null);
}
/**
@@ -88,7 +88,7 @@ public final class ThrowableFormatOption
*/
@Test
public void testFull() {
- test(new String[]{"full"}, Integer.MAX_VALUE, Constants.LINE_SEP,
null);
+ test(new String[]{"full"}, Integer.MAX_VALUE,
Constants.LINE_SEPARATOR, null);
}
/**
@@ -96,7 +96,7 @@ public final class ThrowableFormatOption
*/
@Test
public void testNone() {
- test(new String[]{"none"}, 0, Constants.LINE_SEP, null);
+ test(new String[]{"none"}, 0, Constants.LINE_SEPARATOR, null);
}
/**
@@ -104,7 +104,7 @@ public final class ThrowableFormatOption
*/
@Test
public void testShort() {
- test(new String[]{"short"}, 2, Constants.LINE_SEP, null);
+ test(new String[]{"short"}, 2, Constants.LINE_SEPARATOR, null);
}
/**
@@ -112,7 +112,7 @@ public final class ThrowableFormatOption
*/
@Test
public void testDepth() {
- test(new String[]{"10"}, 10, Constants.LINE_SEP, null);
+ test(new String[]{"10"}, 10, Constants.LINE_SEPARATOR, null);
}
/**
@@ -136,7 +136,7 @@ public final class ThrowableFormatOption
*/
@Test
public void testSeparatorAsDefaultLineSeparator() {
- test(new String[]{"separator(" + Constants.LINE_SEP + ')'},
Integer.MAX_VALUE, Constants.LINE_SEP, null);
+ test(new String[]{"separator(" + Constants.LINE_SEPARATOR + ')'},
Integer.MAX_VALUE, Constants.LINE_SEPARATOR, null);
}
/**
@@ -184,7 +184,7 @@ public final class ThrowableFormatOption
*/
@Test
public void testFilters() {
- test(new String[]{"filters(packages)"}, Integer.MAX_VALUE,
Constants.LINE_SEP, Arrays.asList("packages"));
+ test(new String[]{"filters(packages)"}, Integer.MAX_VALUE,
Constants.LINE_SEPARATOR, Arrays.asList("packages"));
}
/**
@@ -192,7 +192,7 @@ public final class ThrowableFormatOption
*/
@Test
public void testFiltersAsEmpty() {
- test(new String[]{"filters()"}, Integer.MAX_VALUE, Constants.LINE_SEP,
null);
+ test(new String[]{"filters()"}, Integer.MAX_VALUE,
Constants.LINE_SEPARATOR, null);
}
/**
@@ -200,7 +200,7 @@ public final class ThrowableFormatOption
*/
@Test
public void testFiltersAsMultiplePackages() {
- test(new String[]{"filters(package1,package2)"}, Integer.MAX_VALUE,
Constants.LINE_SEP, Arrays.asList("package1","package2"));
+ test(new String[]{"filters(package1,package2)"}, Integer.MAX_VALUE,
Constants.LINE_SEPARATOR, Arrays.asList("package1","package2"));
}
/**
@@ -208,7 +208,7 @@ public final class ThrowableFormatOption
*/
@Test
public void testFullAndFilters() {
- test(new String[]{"full","filters(packages)"}, Integer.MAX_VALUE,
Constants.LINE_SEP, Arrays.asList("packages"));
+ test(new String[]{"full","filters(packages)"}, Integer.MAX_VALUE,
Constants.LINE_SEPARATOR, Arrays.asList("packages"));
}
/**
@@ -216,7 +216,7 @@ public final class ThrowableFormatOption
*/
@Test
public void testNoneAndFilters() {
- test(new String[]{"none","filters(packages)"}, 0, Constants.LINE_SEP,
Arrays.asList("packages"));
+ test(new String[]{"none","filters(packages)"}, 0,
Constants.LINE_SEPARATOR, Arrays.asList("packages"));
}
/**
@@ -224,7 +224,7 @@ public final class ThrowableFormatOption
*/
@Test
public void testShortAndFilters() {
- test(new String[]{"short","filters(packages)"}, 2, Constants.LINE_SEP,
Arrays.asList("packages"));
+ test(new String[]{"short","filters(packages)"}, 2,
Constants.LINE_SEPARATOR, Arrays.asList("packages"));
}
/**
@@ -232,7 +232,7 @@ public final class ThrowableFormatOption
*/
@Test
public void testDepthAndFilters() {
- test(new String[]{"10","filters(packages)"}, 10, Constants.LINE_SEP,
Arrays.asList("packages"));
+ test(new String[]{"10","filters(packages)"}, 10,
Constants.LINE_SEPARATOR, Arrays.asList("packages"));
}
/**
@@ -272,7 +272,7 @@ public final class ThrowableFormatOption
*/
@Test
public void testSingleOptionFullAndFilters() {
- test(new String[]{"full,filters(packages)"}, Integer.MAX_VALUE,
Constants.LINE_SEP, Arrays.asList("packages"));
+ test(new String[]{"full,filters(packages)"}, Integer.MAX_VALUE,
Constants.LINE_SEPARATOR, Arrays.asList("packages"));
}
/**
@@ -280,7 +280,7 @@ public final class ThrowableFormatOption
*/
@Test
public void testSingleOptionNoneAndFilters() {
- test(new String[]{"none,filters(packages)"}, 0, Constants.LINE_SEP,
Arrays.asList("packages"));
+ test(new String[]{"none,filters(packages)"}, 0,
Constants.LINE_SEPARATOR, Arrays.asList("packages"));
}
/**
@@ -288,7 +288,7 @@ public final class ThrowableFormatOption
*/
@Test
public void testSingleOptionShortAndFilters() {
- test(new String[]{"short,filters(packages)"}, 2, Constants.LINE_SEP,
Arrays.asList("packages"));
+ test(new String[]{"short,filters(packages)"}, 2,
Constants.LINE_SEPARATOR, Arrays.asList("packages"));
}
/**
@@ -296,7 +296,7 @@ public final class ThrowableFormatOption
*/
@Test
public void testSingleOptionDepthAndFilters() {
- test(new String[]{"10,filters(packages)"}, 10, Constants.LINE_SEP,
Arrays.asList("packages"));
+ test(new String[]{"10,filters(packages)"}, 10,
Constants.LINE_SEPARATOR, Arrays.asList("packages"));
}
/**
@@ -304,7 +304,7 @@ public final class ThrowableFormatOption
*/
@Test
public void testSingleOptionFullAndMultipleFilters() {
- test(new String[]{"full,filters(package1,package2)"},
Integer.MAX_VALUE, Constants.LINE_SEP, Arrays.asList("package1","package2"));
+ test(new String[]{"full,filters(package1,package2)"},
Integer.MAX_VALUE, Constants.LINE_SEPARATOR,
Arrays.asList("package1","package2"));
}
/**
@@ -312,7 +312,7 @@ public final class ThrowableFormatOption
*/
@Test
public void testSingleOptionNoneAndMultipleFilters() {
- test(new String[]{"none,filters(package1,package2)"}, 0,
Constants.LINE_SEP, Arrays.asList("package1","package2"));
+ test(new String[]{"none,filters(package1,package2)"}, 0,
Constants.LINE_SEPARATOR, Arrays.asList("package1","package2"));
}
/**
@@ -320,7 +320,7 @@ public final class ThrowableFormatOption
*/
@Test
public void testSingleOptionShortAndMultipleFilters() {
- test(new String[]{"short,filters(package1,package2)"}, 2,
Constants.LINE_SEP, Arrays.asList("package1","package2"));
+ test(new String[]{"short,filters(package1,package2)"}, 2,
Constants.LINE_SEPARATOR, Arrays.asList("package1","package2"));
}
/**
@@ -328,6 +328,6 @@ public final class ThrowableFormatOption
*/
@Test
public void testSingleOptionDepthAndMultipleFilters() {
- test(new String[]{"10,filters(package1,package2)"}, 10,
Constants.LINE_SEP, Arrays.asList("package1","package2"));
+ test(new String[]{"10,filters(package1,package2)"}, 10,
Constants.LINE_SEPARATOR, Arrays.asList("package1","package2"));
}
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketReconnectTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketReconnectTest.java?rev=1594370&r1=1594369&r2=1594370&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketReconnectTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketReconnectTest.java
Tue May 13 20:26:31 2014
@@ -40,11 +40,11 @@ public class SocketReconnectTest {
private static final String CONFIG = "log4j-socket.xml";
- private static final String SHUTDOWN = "Shutdown" + Constants.LINE_SEP +
- "................................................................" +
Constants.LINE_SEP +
- "................................................................" +
Constants.LINE_SEP +
- "................................................................" +
Constants.LINE_SEP +
- "................................................................" +
Constants.LINE_SEP;
+ private static final String SHUTDOWN = "Shutdown" +
Constants.LINE_SEPARATOR +
+ "................................................................" +
Constants.LINE_SEPARATOR +
+ "................................................................" +
Constants.LINE_SEPARATOR +
+ "................................................................" +
Constants.LINE_SEPARATOR +
+ "................................................................" +
Constants.LINE_SEPARATOR;
@BeforeClass
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java?rev=1594370&r1=1594369&r2=1594370&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java
Tue May 13 20:26:31 2014
@@ -102,7 +102,7 @@ public class PatternParserTest {
formatter.format(event, buf);
}
final String str = buf.toString();
- final String expected = "INFO [PatternParserTest :96 ] -
Hello, world" + Constants.LINE_SEP;
+ final String expected = "INFO [PatternParserTest :96 ] -
Hello, world" + Constants.LINE_SEPARATOR;
assertTrue("Expected to end with: " + expected + ". Actual: " + str,
str.endsWith(expected));
}
@@ -129,7 +129,7 @@ public class PatternParserTest {
formatter.format(event, buf);
}
final String str = buf.toString();
- final String expectedEnd = String.format("] %-5s: Hello,
world%s\u001B[m", level, Constants.LINE_SEP);
+ final String expectedEnd = String.format("] %-5s: Hello,
world%s\u001B[m", level, Constants.LINE_SEPARATOR);
assertTrue("Expected to start with: " + expectedStart + ". Actual: " +
str, str.startsWith(expectedStart));
assertTrue("Expected to end with: \"" + expectedEnd + "\". Actual: \""
+ str, str.endsWith(expectedEnd));
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverterTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverterTest.java?rev=1594370&r1=1594369&r2=1594370&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverterTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverterTest.java
Tue May 13 20:26:31 2014
@@ -47,6 +47,6 @@ public class RegexReplacementConverterTe
options);
converter.format(event, sb);
assertEquals("org/apache/logging/log4j/core/pattern/RegexReplacementConverterTest
This is a test" +
- Constants.LINE_SEP, sb.toString());
+ Constants.LINE_SEPARATOR, sb.toString());
}
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java?rev=1594370&r1=1594369&r2=1594370&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java
Tue May 13 20:26:31 2014
@@ -46,7 +46,7 @@ public class RegexReplacementTest {
private static ListAppender app2;
private static LoggerContext ctx;
- private static final String EXPECTED = "/RegexReplacementTest" +
Constants.LINE_SEP;
+ private static final String EXPECTED = "/RegexReplacementTest" +
Constants.LINE_SEPARATOR;
@BeforeClass
public static void setupClass() {
@@ -87,7 +87,7 @@ public class RegexReplacementTest {
msgs = app.getMessages();
assertNotNull(msgs);
assertTrue("Incorrect number of messages. Should be 1 is " +
msgs.size(), msgs.size() == 1);
- assertEquals("LoggerTest This is a test for Apache" +
Constants.LINE_SEP , msgs.get(0));
+ assertEquals("LoggerTest This is a test for Apache" +
Constants.LINE_SEPARATOR , msgs.get(0));
app.clear();
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/StyleConverterTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/StyleConverterTest.java?rev=1594370&r1=1594369&r2=1594370&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/StyleConverterTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/StyleConverterTest.java
Tue May 13 20:26:31 2014
@@ -37,7 +37,7 @@ public class StyleConverterTest {
private static final String EXPECTED =
"\u001B[1;31mERROR\u001B[m \u001B[1;36mLoggerTest\u001B[m
o.a.l.l.c.p.StyleConverterTest
org.apache.logging.log4j.core.pattern.StyleConverterTest"
- + Constants.LINE_SEP;
+ + Constants.LINE_SEPARATOR;
@Rule
public InitialLoggerContext init = new
InitialLoggerContext("log4j-style.xml");
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/test/layout/BasicLayout.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/test/layout/BasicLayout.java?rev=1594370&r1=1594369&r2=1594370&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/test/layout/BasicLayout.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/test/layout/BasicLayout.java
Tue May 13 20:26:31 2014
@@ -33,7 +33,7 @@ import org.apache.logging.log4j.core.uti
@Plugin(name = "BasicLayout", category = "Core", elementType = "layout",
printObject = true)
public class BasicLayout extends AbstractStringLayout {
- private static final String HEADER = "Header" + Constants.LINE_SEP;
+ private static final String HEADER = "Header" + Constants.LINE_SEPARATOR;
@Override
public byte[] getHeader() {
@@ -46,7 +46,7 @@ public class BasicLayout extends Abstrac
@Override
public String toSerializable(final LogEvent event) {
- return event.getMessage().getFormattedMessage() + Constants.LINE_SEP;
+ return event.getMessage().getFormattedMessage() +
Constants.LINE_SEPARATOR;
}
@Override
Modified:
logging/log4j/log4j2/trunk/log4j-jcl/src/test/java/org/apache/logging/log4j/jcl/LoggerTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-jcl/src/test/java/org/apache/logging/log4j/jcl/LoggerTest.java?rev=1594370&r1=1594369&r2=1594370&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-jcl/src/test/java/org/apache/logging/log4j/jcl/LoggerTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-jcl/src/test/java/org/apache/logging/log4j/jcl/LoggerTest.java
Tue May 13 20:26:31 2014
@@ -63,13 +63,13 @@ public class LoggerTest {
@Test
public void testLog() {
logger.debug("Test message");
- verify("List", "o.a.l.l.j.LoggerTest Test message MDC{}" +
Constants.LINE_SEP);
+ verify("List", "o.a.l.l.j.LoggerTest Test message MDC{}" +
Constants.LINE_SEPARATOR);
logger.debug("Exception: " , new NullPointerException("Test"));
- verify("List", "o.a.l.l.j.LoggerTest Exception: MDC{}" +
Constants.LINE_SEP);
+ verify("List", "o.a.l.l.j.LoggerTest Exception: MDC{}" +
Constants.LINE_SEPARATOR);
logger.info("Info Message");
- verify("List", "o.a.l.l.j.LoggerTest Info Message MDC{}" +
Constants.LINE_SEP);
+ verify("List", "o.a.l.l.j.LoggerTest Info Message MDC{}" +
Constants.LINE_SEPARATOR);
logger.info("Info Message {}");
- verify("List", "o.a.l.l.j.LoggerTest Info Message {} MDC{}" +
Constants.LINE_SEP);
+ verify("List", "o.a.l.l.j.LoggerTest Info Message {} MDC{}" +
Constants.LINE_SEPARATOR);
}
private void verify(final String name, final String expected) {
Modified:
logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java?rev=1594370&r1=1594369&r2=1594370&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java
Tue May 13 20:26:31 2014
@@ -72,23 +72,23 @@ public class LoggerTest {
@Test
public void basicFlow() {
xlogger.entry();
- verify("List", "o.a.l.s.LoggerTest entry MDC{}" + Constants.LINE_SEP);
+ verify("List", "o.a.l.s.LoggerTest entry MDC{}" +
Constants.LINE_SEPARATOR);
xlogger.exit();
- verify("List", "o.a.l.s.LoggerTest exit MDC{}" + Constants.LINE_SEP);
+ verify("List", "o.a.l.s.LoggerTest exit MDC{}" +
Constants.LINE_SEPARATOR);
}
@Test
public void simpleFlow() {
xlogger.entry(CONFIG);
- verify("List", "o.a.l.s.LoggerTest entry with (log4j-test1.xml) MDC{}"
+ Constants.LINE_SEP);
+ verify("List", "o.a.l.s.LoggerTest entry with (log4j-test1.xml) MDC{}"
+ Constants.LINE_SEPARATOR);
xlogger.exit(0);
- verify("List", "o.a.l.s.LoggerTest exit with (0) MDC{}" +
Constants.LINE_SEP);
+ verify("List", "o.a.l.s.LoggerTest exit with (0) MDC{}" +
Constants.LINE_SEPARATOR);
}
@Test
public void throwing() {
xlogger.throwing(new IllegalArgumentException("Test Exception"));
- verify("List", "o.a.l.s.LoggerTest throwing MDC{}" +
Constants.LINE_SEP);
+ verify("List", "o.a.l.s.LoggerTest throwing MDC{}" +
Constants.LINE_SEPARATOR);
}
@Test
@@ -97,32 +97,32 @@ public class LoggerTest {
throw new NullPointerException();
} catch (final Exception e) {
xlogger.catching(e);
- verify("List", "o.a.l.s.LoggerTest catching MDC{}" +
Constants.LINE_SEP);
+ verify("List", "o.a.l.s.LoggerTest catching MDC{}" +
Constants.LINE_SEPARATOR);
}
}
@Test
public void debug() {
logger.debug("Debug message");
- verify("List", "o.a.l.s.LoggerTest Debug message MDC{}" +
Constants.LINE_SEP);
+ verify("List", "o.a.l.s.LoggerTest Debug message MDC{}" +
Constants.LINE_SEPARATOR);
}
@Test
public void debugNoParms() {
logger.debug("Debug message {}");
- verify("List", "o.a.l.s.LoggerTest Debug message {} MDC{}" +
Constants.LINE_SEP);
+ verify("List", "o.a.l.s.LoggerTest Debug message {} MDC{}" +
Constants.LINE_SEPARATOR);
logger.debug("Debug message {}", (Object[]) null);
- verify("List", "o.a.l.s.LoggerTest Debug message {} MDC{}" +
Constants.LINE_SEP);
+ verify("List", "o.a.l.s.LoggerTest Debug message {} MDC{}" +
Constants.LINE_SEPARATOR);
((LocationAwareLogger)logger).log(null, Log4jLogger.class.getName(),
LocationAwareLogger.DEBUG_INT,
"Debug message {}", null, null);
- verify("List", "o.a.l.s.LoggerTest Debug message {} MDC{}" +
Constants.LINE_SEP);
+ verify("List", "o.a.l.s.LoggerTest Debug message {} MDC{}" +
Constants.LINE_SEPARATOR);
}
@Test
public void debugWithParms() {
logger.debug("Hello, {}", "World");
- verify("List", "o.a.l.s.LoggerTest Hello, World MDC{}" +
Constants.LINE_SEP);
+ verify("List", "o.a.l.s.LoggerTest Hello, World MDC{}" +
Constants.LINE_SEPARATOR);
}
@Test
@@ -130,10 +130,10 @@ public class LoggerTest {
MDC.put("TestYear", "2010");
logger.debug("Debug message");
- verify("List", "o.a.l.s.LoggerTest Debug message MDC{TestYear=2010}" +
Constants.LINE_SEP);
+ verify("List", "o.a.l.s.LoggerTest Debug message MDC{TestYear=2010}" +
Constants.LINE_SEPARATOR);
MDC.clear();
logger.debug("Debug message");
- verify("List", "o.a.l.s.LoggerTest Debug message MDC{}" +
Constants.LINE_SEP);
+ verify("List", "o.a.l.s.LoggerTest Debug message MDC{}" +
Constants.LINE_SEPARATOR);
}
@Test
@@ -146,9 +146,9 @@ public class LoggerTest {
@Test
public void doubleSubst() {
logger.debug("Hello, {}", "Log4j {}");
- verify("List", "o.a.l.s.LoggerTest Hello, Log4j {} MDC{}" +
Constants.LINE_SEP);
+ verify("List", "o.a.l.s.LoggerTest Hello, Log4j {} MDC{}" +
Constants.LINE_SEPARATOR);
xlogger.debug("Hello, {}", "Log4j {}");
- verify("List", "o.a.l.s.LoggerTest Hello, Log4j Log4j {} MDC{}" +
Constants.LINE_SEP);
+ verify("List", "o.a.l.s.LoggerTest Hello, Log4j Log4j {} MDC{}" +
Constants.LINE_SEPARATOR);
}
@Test
@@ -165,7 +165,7 @@ public class LoggerTest {
data.put("Amount", "200.00");
EventLogger.logEvent(data);
MDC.clear();
- verify("EventLogger", "o.a.l.s.LoggerTest Transfer [Audit@18060
Amount=\"200.00\" FromAccount=\"123457\" ToAccount=\"123456\"] Transfer
Complete" + Constants.LINE_SEP);
+ verify("EventLogger", "o.a.l.s.LoggerTest Transfer [Audit@18060
Amount=\"200.00\" FromAccount=\"123457\" ToAccount=\"123456\"] Transfer
Complete" + Constants.LINE_SEPARATOR);
}
private void verify(final String name, final String expected) {
Modified:
logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java?rev=1594370&r1=1594369&r2=1594370&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java
Tue May 13 20:26:31 2014
@@ -69,7 +69,7 @@ public class OptionalTest {
public void testEventLogger() {
logger.info(marker, "This is a test");
MDC.clear();
- verify("EventLogger", "o.a.l.s.OptionalTest This is a test" +
Constants.LINE_SEP);
+ verify("EventLogger", "o.a.l.s.OptionalTest This is a test" +
Constants.LINE_SEPARATOR);
}
private void verify(final String name, final String expected) {
