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 2014/09/03 03:37:30 UTC
[09/29] Sort methods in AB order.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30ef44b5/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerInputStreamTest.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerInputStreamTest.java b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerInputStreamTest.java
index 09e5269..4c0741d 100644
--- a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerInputStreamTest.java
+++ b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerInputStreamTest.java
@@ -32,30 +32,35 @@ public class LoggerInputStreamTest extends AbstractStreamTest {
protected ByteArrayOutputStream read;
protected InputStream in;
+ protected InputStream createInputStream() {
+ return new LoggerInputStream(wrapped, getLogger(), LEVEL);
+ }
+
@Before
public void createStream() {
wrapped = new ByteArrayInputStream((FIRST + "\r\n" + LAST).getBytes());
read = new ByteArrayOutputStream();
in = createInputStream();
}
-
- protected InputStream createInputStream() {
- return new LoggerInputStream(wrapped, getLogger(), LEVEL);
- }
@Test
- public void testRead_int() throws Exception {
- for (int i = 0; i < FIRST.length(); i++) {
- read.write(in.read());
- }
- if (!(in instanceof BufferedInputStream)) {
- assertMessages();
- }
- assertEquals("carriage return", '\r', in.read());
- if (!(in instanceof BufferedInputStream)) {
- assertMessages();
- }
- assertEquals("newline", '\n', in.read());
+ public void testClose_HasRemainingData() throws IOException {
+ final byte[] bytes = new byte[1024];
+ in.read(bytes);
+ assertMessages(FIRST);
+ in.close();
+ assertMessages(FIRST, LAST);
+ }
+
+ @Test
+ public void testClose_NoRemainingData() throws IOException {
+ wrapped = new ByteArrayInputStream((FIRST + '\n').getBytes());
+ in = new LoggerInputStream(wrapped, getLogger(), LEVEL);
+
+ final byte[] bytes = new byte[1024];
+ in.read(bytes);
+ assertMessages(FIRST);
+ in.close();
assertMessages(FIRST);
}
@@ -93,6 +98,22 @@ public class LoggerInputStreamTest extends AbstractStreamTest {
}
@Test
+ public void testRead_int() throws Exception {
+ for (int i = 0; i < FIRST.length(); i++) {
+ read.write(in.read());
+ }
+ if (!(in instanceof BufferedInputStream)) {
+ assertMessages();
+ }
+ assertEquals("carriage return", '\r', in.read());
+ if (!(in instanceof BufferedInputStream)) {
+ assertMessages();
+ }
+ assertEquals("newline", '\n', in.read());
+ assertMessages(FIRST);
+ }
+
+ @Test
public void testRead_MultipleLines() throws IOException {
wrapped = new ByteArrayInputStream((FIRST + "\n" + LAST + '\n').getBytes());
in = new LoggerInputStream(wrapped, getLogger(), LEVEL);
@@ -103,25 +124,4 @@ public class LoggerInputStreamTest extends AbstractStreamTest {
assertMessages(FIRST, LAST);
assertEquals(FIRST + '\n' + LAST + '\n', read.toString());
}
-
- @Test
- public void testClose_NoRemainingData() throws IOException {
- wrapped = new ByteArrayInputStream((FIRST + '\n').getBytes());
- in = new LoggerInputStream(wrapped, getLogger(), LEVEL);
-
- final byte[] bytes = new byte[1024];
- in.read(bytes);
- assertMessages(FIRST);
- in.close();
- assertMessages(FIRST);
- }
-
- @Test
- public void testClose_HasRemainingData() throws IOException {
- final byte[] bytes = new byte[1024];
- in.read(bytes);
- assertMessages(FIRST);
- in.close();
- assertMessages(FIRST, LAST);
- }
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30ef44b5/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerOutputStreamTest.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerOutputStreamTest.java b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerOutputStreamTest.java
index 4b9aa36..8a3d238 100644
--- a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerOutputStreamTest.java
+++ b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerOutputStreamTest.java
@@ -33,25 +33,43 @@ public class LoggerOutputStreamTest extends AbstractStreamTest {
protected ByteArrayOutputStream wrapped;
protected OutputStream out;
+ protected OutputStream createOutputStream() {
+ return new LoggerOutputStream(wrapped, getLogger(), Level.ERROR);
+ }
+
@Before
public void createStream() {
wrapped = new ByteArrayOutputStream();
out = createOutputStream();
}
- protected OutputStream createOutputStream() {
- return new LoggerOutputStream(wrapped, getLogger(), Level.ERROR);
+ @Test
+ public void testClose_HasRemainingData() throws IOException {
+ out.write(FIRST.getBytes());
+ assertMessages();
+ out.close();
+ assertMessages(FIRST);
+ assertEquals(FIRST, wrapped.toString());
}
@Test
- public void testWrite_Int() throws Exception {
- for (final byte b : "int".getBytes()) {
- out.write(b);
- assertMessages();
- }
- out.write('\n');
- assertMessages("int");
- assertEquals("int" + '\n', wrapped.toString());
+ public void testClose_NoRemainingData() throws IOException {
+ out.close();
+ assertMessages();
+ assertEquals("", wrapped.toString());
+ }
+
+ @Test
+ public void testFlush() throws IOException {
+ final OutputStream out = EasyMock.createMock("out", OutputStream.class);
+ out.flush(); // expect the flush to come through to the mocked OutputStream
+ out.close();
+ replay(out);
+
+ final LoggerOutputStream los = new LoggerOutputStream(out, getLogger(), LEVEL);
+ los.flush();
+ los.close();
+ verify(out);
}
@Test
@@ -88,38 +106,20 @@ public class LoggerOutputStreamTest extends AbstractStreamTest {
}
@Test
+ public void testWrite_Int() throws Exception {
+ for (final byte b : "int".getBytes()) {
+ out.write(b);
+ assertMessages();
+ }
+ out.write('\n');
+ assertMessages("int");
+ assertEquals("int" + '\n', wrapped.toString());
+ }
+
+ @Test
public void testWrite_MultipleLines() throws IOException {
out.write((FIRST + '\n' + LAST + '\n').getBytes());
assertMessages(FIRST, LAST);
assertEquals(FIRST + '\n' + LAST + '\n', wrapped.toString());
}
-
- @Test
- public void testFlush() throws IOException {
- final OutputStream out = EasyMock.createMock("out", OutputStream.class);
- out.flush(); // expect the flush to come through to the mocked OutputStream
- out.close();
- replay(out);
-
- final LoggerOutputStream los = new LoggerOutputStream(out, getLogger(), LEVEL);
- los.flush();
- los.close();
- verify(out);
- }
-
- @Test
- public void testClose_NoRemainingData() throws IOException {
- out.close();
- assertMessages();
- assertEquals("", wrapped.toString());
- }
-
- @Test
- public void testClose_HasRemainingData() throws IOException {
- out.write(FIRST.getBytes());
- assertMessages();
- out.close();
- assertMessages(FIRST);
- assertEquals(FIRST, wrapped.toString());
- }
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30ef44b5/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerPrintStreamCallerInfoTest.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerPrintStreamCallerInfoTest.java b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerPrintStreamCallerInfoTest.java
index ebd57cf..e2c7f2b 100644
--- a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerPrintStreamCallerInfoTest.java
+++ b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerPrintStreamCallerInfoTest.java
@@ -26,29 +26,12 @@ public class LoggerPrintStreamCallerInfoTest extends LoggerStreamsCallerInfoTest
private LoggerPrintStream logOut;
- @Before
- public void setupStreams() {
- logOut = new LoggerPrintStream(getLogger(), Level.WARN);
- }
-
@Test
- public void write_int() throws Exception {
- logOut.write('a');
- assertMessages("write int", 0, "write_int");
- logOut.write('\n');
- assertMessages("write newline", 1, "write_int");
- }
-
- @Test
- public void write_bytes() throws Exception {
- logOut.write("b\n".getBytes());
- assertMessages("write", 1, "write_bytes");
- }
-
- @Test
- public void write_bytes_offset() throws Exception {
- logOut.write("c\n".getBytes(), 0, 2);
- assertMessages("write", 1, "write_bytes_offset");
+ public void close() throws Exception {
+ logOut.print("a\nb");
+ assertMessages("before close size", 1, "close");
+ logOut.close();
+ assertMessages("after close size", 2, "close");
}
@Test
@@ -116,6 +99,18 @@ public class LoggerPrintStreamCallerInfoTest extends LoggerStreamsCallerInfoTest
}
@Test
+ public void print_printf() throws Exception {
+ logOut.printf("a\n");
+ assertMessages("println", 1, "print_printf");
+ }
+
+ @Test
+ public void print_printf_locale() throws Exception {
+ logOut.printf(Locale.getDefault(), "a\n");
+ assertMessages("println", 1, "print_printf_locale");
+ }
+
+ @Test
public void print_string() throws Exception {
logOut.print("a");
assertMessages("print", 0, "print_string");
@@ -123,23 +118,28 @@ public class LoggerPrintStreamCallerInfoTest extends LoggerStreamsCallerInfoTest
assertMessages("println", 1, "print_string");
}
+ @Before
+ public void setupStreams() {
+ logOut = new LoggerPrintStream(getLogger(), Level.WARN);
+ }
+
@Test
- public void print_printf() throws Exception {
- logOut.printf("a\n");
- assertMessages("println", 1, "print_printf");
+ public void write_bytes() throws Exception {
+ logOut.write("b\n".getBytes());
+ assertMessages("write", 1, "write_bytes");
}
@Test
- public void print_printf_locale() throws Exception {
- logOut.printf(Locale.getDefault(), "a\n");
- assertMessages("println", 1, "print_printf_locale");
+ public void write_bytes_offset() throws Exception {
+ logOut.write("c\n".getBytes(), 0, 2);
+ assertMessages("write", 1, "write_bytes_offset");
}
@Test
- public void close() throws Exception {
- logOut.print("a\nb");
- assertMessages("before close size", 1, "close");
- logOut.close();
- assertMessages("after close size", 2, "close");
+ public void write_int() throws Exception {
+ logOut.write('a');
+ assertMessages("write int", 0, "write_int");
+ logOut.write('\n');
+ assertMessages("write newline", 1, "write_int");
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30ef44b5/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerPrintStreamTest.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerPrintStreamTest.java b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerPrintStreamTest.java
index 1f5e324..864d300 100644
--- a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerPrintStreamTest.java
+++ b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerPrintStreamTest.java
@@ -32,6 +32,15 @@ public class LoggerPrintStreamTest extends LoggerOutputStreamTest {
}
@Test
+ public void testFormat() throws Exception {
+ assertSame(print, print.format("[%s]", FIRST));
+ assertMessages();
+ print.println();
+ assertMessages("[" + FIRST + "]");
+ assertEquals("[" + FIRST + "]" + NEWLINE, wrapped.toString());
+ }
+
+ @Test
public void testPrint_boolean() throws Exception {
print.print(true);
assertMessages();
@@ -52,6 +61,15 @@ public class LoggerPrintStreamTest extends LoggerOutputStreamTest {
}
@Test
+ public void testPrint_CharacterArray() throws Exception {
+ print.print(FIRST.toCharArray());
+ assertMessages();
+ print.println();
+ assertMessages(FIRST);
+ assertEquals(FIRST + NEWLINE, wrapped.toString());
+ }
+
+ @Test
public void testPrint_int() throws Exception {
print.print(12);
assertMessages();
@@ -70,8 +88,8 @@ public class LoggerPrintStreamTest extends LoggerOutputStreamTest {
}
@Test
- public void testPrint_CharacterArray() throws Exception {
- print.print(FIRST.toCharArray());
+ public void testPrint_Object() throws Exception {
+ print.print((Object) FIRST);
assertMessages();
print.println();
assertMessages(FIRST);
@@ -88,15 +106,6 @@ public class LoggerPrintStreamTest extends LoggerOutputStreamTest {
}
@Test
- public void testPrint_Object() throws Exception {
- print.print((Object) FIRST);
- assertMessages();
- print.println();
- assertMessages(FIRST);
- assertEquals(FIRST + NEWLINE, wrapped.toString());
- }
-
- @Test
public void testPrintf() throws Exception {
assertSame(print, print.printf("<<<%s>>>", FIRST));
assertMessages();
@@ -104,13 +113,4 @@ public class LoggerPrintStreamTest extends LoggerOutputStreamTest {
assertMessages("<<<" + FIRST + ">>>");
assertEquals("<<<" + FIRST + ">>>" + NEWLINE, wrapped.toString());
}
-
- @Test
- public void testFormat() throws Exception {
- assertSame(print, print.format("[%s]", FIRST));
- assertMessages();
- print.println();
- assertMessages("[" + FIRST + "]");
- assertEquals("[" + FIRST + "]" + NEWLINE, wrapped.toString());
- }
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30ef44b5/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerPrintWriterCallerInfoTest.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerPrintWriterCallerInfoTest.java b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerPrintWriterCallerInfoTest.java
index 2b825ec..f3133e2 100644
--- a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerPrintWriterCallerInfoTest.java
+++ b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerPrintWriterCallerInfoTest.java
@@ -26,29 +26,12 @@ public class LoggerPrintWriterCallerInfoTest extends LoggerStreamsCallerInfoTest
private LoggerPrintWriter logOut;
- @Before
- public void setupStreams() {
- logOut = new LoggerPrintWriter(getLogger(), Level.WARN);
- }
-
@Test
- public void write_int() throws Exception {
- logOut.write('a');
- assertMessages("write int", 0, "write_int");
- logOut.write('\n');
- assertMessages("write newline", 1, "write_int");
- }
-
- @Test
- public void write_bytes() throws Exception {
- logOut.write("b\n".toCharArray());
- assertMessages("write", 1, "write_bytes");
- }
-
- @Test
- public void write_bytes_offset() throws Exception {
- logOut.write("c\n".toCharArray(), 0, 2);
- assertMessages("write", 1, "write_bytes_offset");
+ public void close() throws Exception {
+ logOut.print("a\nb");
+ assertMessages("before close size", 1, "close");
+ logOut.close();
+ assertMessages("after close size", 2, "close");
}
@Test
@@ -116,6 +99,18 @@ public class LoggerPrintWriterCallerInfoTest extends LoggerStreamsCallerInfoTest
}
@Test
+ public void print_printf() throws Exception {
+ logOut.printf("a\n");
+ assertMessages("println", 1, "print_printf");
+ }
+
+ @Test
+ public void print_printf_locale() throws Exception {
+ logOut.printf(Locale.getDefault(), "a\n");
+ assertMessages("println", 1, "print_printf_locale");
+ }
+
+ @Test
public void print_string() throws Exception {
logOut.print("a");
assertMessages("print", 0, "print_string");
@@ -123,23 +118,28 @@ public class LoggerPrintWriterCallerInfoTest extends LoggerStreamsCallerInfoTest
assertMessages("println", 1, "print_string");
}
+ @Before
+ public void setupStreams() {
+ logOut = new LoggerPrintWriter(getLogger(), Level.WARN);
+ }
+
@Test
- public void print_printf() throws Exception {
- logOut.printf("a\n");
- assertMessages("println", 1, "print_printf");
+ public void write_bytes() throws Exception {
+ logOut.write("b\n".toCharArray());
+ assertMessages("write", 1, "write_bytes");
}
@Test
- public void print_printf_locale() throws Exception {
- logOut.printf(Locale.getDefault(), "a\n");
- assertMessages("println", 1, "print_printf_locale");
+ public void write_bytes_offset() throws Exception {
+ logOut.write("c\n".toCharArray(), 0, 2);
+ assertMessages("write", 1, "write_bytes_offset");
}
@Test
- public void close() throws Exception {
- logOut.print("a\nb");
- assertMessages("before close size", 1, "close");
- logOut.close();
- assertMessages("after close size", 2, "close");
+ public void write_int() throws Exception {
+ logOut.write('a');
+ assertMessages("write int", 0, "write_int");
+ logOut.write('\n');
+ assertMessages("write newline", 1, "write_int");
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30ef44b5/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerPrintWriterTest.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerPrintWriterTest.java b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerPrintWriterTest.java
index 7bc799c..212efd5 100644
--- a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerPrintWriterTest.java
+++ b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerPrintWriterTest.java
@@ -39,6 +39,15 @@ public class LoggerPrintWriterTest extends AbstractLoggerWriterTest {
}
@Test
+ public void testFormat() throws Exception {
+ assertSame(print, print.format("[%s]", FIRST));
+ assertMessages();
+ print.println();
+ assertMessages("[" + FIRST + "]");
+ assertEquals("[" + FIRST + "]" + NEWLINE, wrapped.toString());
+ }
+
+ @Test
public void testPrint_boolean() throws Exception {
print.print(true);
assertMessages();
@@ -59,6 +68,15 @@ public class LoggerPrintWriterTest extends AbstractLoggerWriterTest {
}
@Test
+ public void testPrint_CharacterArray() throws Exception {
+ print.print(FIRST.toCharArray());
+ assertMessages();
+ print.println();
+ assertMessages(FIRST);
+ assertEquals(FIRST + NEWLINE, wrapped.toString());
+ }
+
+ @Test
public void testPrint_int() throws Exception {
print.print(12);
assertMessages();
@@ -77,8 +95,8 @@ public class LoggerPrintWriterTest extends AbstractLoggerWriterTest {
}
@Test
- public void testPrint_CharacterArray() throws Exception {
- print.print(FIRST.toCharArray());
+ public void testPrint_Object() throws Exception {
+ print.print((Object) FIRST);
assertMessages();
print.println();
assertMessages(FIRST);
@@ -95,15 +113,6 @@ public class LoggerPrintWriterTest extends AbstractLoggerWriterTest {
}
@Test
- public void testPrint_Object() throws Exception {
- print.print((Object) FIRST);
- assertMessages();
- print.println();
- assertMessages(FIRST);
- assertEquals(FIRST + NEWLINE, wrapped.toString());
- }
-
- @Test
public void testPrintf() throws Exception {
assertSame(print, print.printf("<<<%s>>>", FIRST));
assertMessages();
@@ -111,13 +120,4 @@ public class LoggerPrintWriterTest extends AbstractLoggerWriterTest {
assertMessages("<<<" + FIRST + ">>>");
assertEquals("<<<" + FIRST + ">>>" + NEWLINE, wrapped.toString());
}
-
- @Test
- public void testFormat() throws Exception {
- assertSame(print, print.format("[%s]", FIRST));
- assertMessages();
- print.println();
- assertMessages("[" + FIRST + "]");
- assertEquals("[" + FIRST + "]" + NEWLINE, wrapped.toString());
- }
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30ef44b5/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerReaderCallerInfoTest.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerReaderCallerInfoTest.java b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerReaderCallerInfoTest.java
index cce13f4..18a8cdf 100644
--- a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerReaderCallerInfoTest.java
+++ b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerReaderCallerInfoTest.java
@@ -27,12 +27,6 @@ public class LoggerReaderCallerInfoTest extends LoggerStreamsCallerInfoTesting {
LoggerReader logReader;
- @Before
- public void setupReader() {
- final Reader srcReader = new StringReader("a\nb\nc\nd\ne");
- logReader = new LoggerReader(srcReader, getLogger(), LEVEL);
- }
-
@Test
public void read() throws Exception {
logReader.read();
@@ -54,4 +48,10 @@ public class LoggerReaderCallerInfoTest extends LoggerStreamsCallerInfoTesting {
logReader.close();
assertMessages("after close size", 5, "read");
}
+
+ @Before
+ public void setupReader() {
+ final Reader srcReader = new StringReader("a\nb\nc\nd\ne");
+ logReader = new LoggerReader(srcReader, getLogger(), LEVEL);
+ }
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30ef44b5/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerReaderTest.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerReaderTest.java b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerReaderTest.java
index 8ac5ec9..14d0ac1 100644
--- a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerReaderTest.java
+++ b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerReaderTest.java
@@ -33,30 +33,37 @@ public class LoggerReaderTest extends AbstractStreamTest {
protected StringWriter read;
protected Reader reader;
+ protected Reader createReader() {
+ return new LoggerReader(wrapped, getLogger(), LEVEL);
+ }
+
@Before
public void createStream() {
wrapped = new StringReader(FIRST + "\r\n" + LAST);
read = new StringWriter();
reader = createReader();
}
-
- protected Reader createReader() {
- return new LoggerReader(wrapped, getLogger(), LEVEL);
- }
@Test
- public void testRead_int() throws Exception {
- for (int i = 0; i < FIRST.length(); i++) {
- read.write(reader.read());
- }
- if (!(reader instanceof BufferedReader)) {
- assertMessages();
- }
- assertEquals("carriage return", '\r', reader.read());
+ public void testClose_HasRemainingData() throws IOException {
+ final char[] chars = new char[1024];
+ reader.read(chars);
if (!(reader instanceof BufferedReader)) {
- assertMessages();
+ assertMessages(FIRST);
}
- assertEquals("newline", '\n', reader.read());
+ reader.close();
+ assertMessages(FIRST, LAST);
+ }
+
+ @Test
+ public void testClose_NoRemainingData() throws IOException {
+ wrapped = new StringReader(FIRST + '\n');
+ reader = createReader();
+
+ final char[] chars = new char[1024];
+ reader.read(chars);
+ assertMessages(FIRST);
+ reader.close();
assertMessages(FIRST);
}
@@ -105,6 +112,22 @@ public class LoggerReaderTest extends AbstractStreamTest {
}
@Test
+ public void testRead_int() throws Exception {
+ for (int i = 0; i < FIRST.length(); i++) {
+ read.write(reader.read());
+ }
+ if (!(reader instanceof BufferedReader)) {
+ assertMessages();
+ }
+ assertEquals("carriage return", '\r', reader.read());
+ if (!(reader instanceof BufferedReader)) {
+ assertMessages();
+ }
+ assertEquals("newline", '\n', reader.read());
+ assertMessages(FIRST);
+ }
+
+ @Test
public void testRead_MultipleLines() throws IOException {
wrapped = new StringReader(FIRST + "\n" + LAST + '\n');
reader = createReader();
@@ -115,27 +138,4 @@ public class LoggerReaderTest extends AbstractStreamTest {
assertMessages(FIRST, LAST);
assertEquals(FIRST + '\n' + LAST + '\n', read.toString());
}
-
- @Test
- public void testClose_NoRemainingData() throws IOException {
- wrapped = new StringReader(FIRST + '\n');
- reader = createReader();
-
- final char[] chars = new char[1024];
- reader.read(chars);
- assertMessages(FIRST);
- reader.close();
- assertMessages(FIRST);
- }
-
- @Test
- public void testClose_HasRemainingData() throws IOException {
- final char[] chars = new char[1024];
- reader.read(chars);
- if (!(reader instanceof BufferedReader)) {
- assertMessages(FIRST);
- }
- reader.close();
- assertMessages(FIRST, LAST);
- }
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30ef44b5/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerStreamsCallerInfoTesting.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerStreamsCallerInfoTesting.java b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerStreamsCallerInfoTesting.java
index 5d81380..73f22a0 100644
--- a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerStreamsCallerInfoTesting.java
+++ b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerStreamsCallerInfoTesting.java
@@ -27,19 +27,14 @@ import org.junit.ClassRule;
public class LoggerStreamsCallerInfoTesting {
- protected final static Level LEVEL = Level.WARN;
-
- @ClassRule
- public static InitialLoggerContext ctx = new InitialLoggerContext("log4j2-streams-calling-info.xml");
-
protected static Logger getLogger() {
return ctx.getLogger("ClassAndMethodLogger");
}
+
+ protected final static Level LEVEL = Level.WARN;
- @Before
- public void clearAppender() {
- ((ListAppender) ctx.getAppender("ClassAndMethod")).clear();
- }
+ @ClassRule
+ public static InitialLoggerContext ctx = new InitialLoggerContext("log4j2-streams-calling-info.xml");
public void assertMessages(final String msg, final int size, final String methodName) {
final ListAppender appender = (ListAppender) ctx.getAppender("ClassAndMethod");
@@ -48,4 +43,9 @@ public class LoggerStreamsCallerInfoTesting {
assertEquals(msg + " has incorrect caller info", this.getClass().getName() + '.' + methodName, message);
}
}
+
+ @Before
+ public void clearAppender() {
+ ((ListAppender) ctx.getAppender("ClassAndMethod")).clear();
+ }
}