Repository: logging-log4j2 Updated Branches: refs/heads/master abe0fc1d9 -> 9685ea824
Better test case name and I need the old name for a new properly named test case. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/9685ea82 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/9685ea82 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/9685ea82 Branch: refs/heads/master Commit: 9685ea824b909560041513d6f34720de9c319fbf Parents: abe0fc1 Author: ggregory <[email protected]> Authored: Thu Oct 29 16:29:11 2015 -0700 Committer: ggregory <[email protected]> Committed: Thu Oct 29 16:29:11 2015 -0700 ---------------------------------------------------------------------- .../core/appender/InMemoryAppenderTest.java | 82 ++++++++++++++++++++ .../core/appender/OutputStreamAppenderTest.java | 82 -------------------- 2 files changed, 82 insertions(+), 82 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9685ea82/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/InMemoryAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/InMemoryAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/InMemoryAppenderTest.java new file mode 100644 index 0000000..d9446b7 --- /dev/null +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/InMemoryAppenderTest.java @@ -0,0 +1,82 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache license, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the license for the specific language governing permissions and + * limitations under the license. + */ +package org.apache.logging.log4j.core.appender; + +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.LogEvent; +import org.apache.logging.log4j.core.impl.Log4jLogEvent; +import org.apache.logging.log4j.core.layout.PatternLayout; +import org.apache.logging.log4j.core.util.Constants; +import org.apache.logging.log4j.message.SimpleMessage; +import org.apache.logging.log4j.test.appender.InMemoryAppender; +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * + */ +public class InMemoryAppenderTest { + + @Test + public void testAppender() { + final Layout<String> layout = PatternLayout.createDefaultLayout(); + final boolean writeHeader = true; + final InMemoryAppender app = new InMemoryAppender("test", layout, null, false, writeHeader); + final String expectedHeader = null; + assertMessage("Test", app, expectedHeader); + } + + @Test + public void testHeaderRequested() { + final PatternLayout layout = PatternLayout.newBuilder().withHeader("HEADERHEADER").build(); + final boolean writeHeader = true; + final InMemoryAppender app = new InMemoryAppender("test", layout, null, false, writeHeader); + final String expectedHeader = "HEADERHEADER"; + assertMessage("Test", app, expectedHeader); + } + + @Test + public void testHeaderSuppressed() { + final PatternLayout layout = PatternLayout.newBuilder().withHeader("HEADERHEADER").build(); + final boolean writeHeader = false; + final InMemoryAppender app = new InMemoryAppender("test", layout, null, false, writeHeader); + final String expectedHeader = null; + assertMessage("Test", app, expectedHeader); + } + + private void assertMessage(final String string, final InMemoryAppender app, final String header) { + final LogEvent event = Log4jLogEvent.newBuilder() // + .setLoggerName("TestLogger") // + .setLoggerFqcn(InMemoryAppenderTest.class.getName()) // + .setLevel(Level.INFO) // + .setMessage(new SimpleMessage("Test")) // + .build(); + app.start(); + assertTrue("Appender did not start", app.isStarted()); + app.append(event); + app.append(event); + final String msg = app.toString(); + assertNotNull("No message", msg); + final String expectedHeader = header == null ? "" : header; + final String expected = expectedHeader + "Test" + Constants.LINE_SEPARATOR + "Test" + Constants.LINE_SEPARATOR; + assertTrue("Incorrect message: " + msg, msg.equals(expected)); + app.stop(); + assertFalse("Appender did not stop", app.isStarted()); + } +} http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9685ea82/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java deleted file mode 100644 index 892146e..0000000 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache license, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the license for the specific language governing permissions and - * limitations under the license. - */ -package org.apache.logging.log4j.core.appender; - -import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.core.Layout; -import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.core.impl.Log4jLogEvent; -import org.apache.logging.log4j.core.layout.PatternLayout; -import org.apache.logging.log4j.core.util.Constants; -import org.apache.logging.log4j.message.SimpleMessage; -import org.apache.logging.log4j.test.appender.InMemoryAppender; -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * - */ -public class OutputStreamAppenderTest { - - @Test - public void testAppender() { - final Layout<String> layout = PatternLayout.createDefaultLayout(); - final boolean writeHeader = true; - final InMemoryAppender app = new InMemoryAppender("test", layout, null, false, writeHeader); - final String expectedHeader = null; - assertMessage("Test", app, expectedHeader); - } - - @Test - public void testHeaderRequested() { - final PatternLayout layout = PatternLayout.newBuilder().withHeader("HEADERHEADER").build(); - final boolean writeHeader = true; - final InMemoryAppender app = new InMemoryAppender("test", layout, null, false, writeHeader); - final String expectedHeader = "HEADERHEADER"; - assertMessage("Test", app, expectedHeader); - } - - @Test - public void testHeaderSuppressed() { - final PatternLayout layout = PatternLayout.newBuilder().withHeader("HEADERHEADER").build(); - final boolean writeHeader = false; - final InMemoryAppender app = new InMemoryAppender("test", layout, null, false, writeHeader); - final String expectedHeader = null; - assertMessage("Test", app, expectedHeader); - } - - private void assertMessage(final String string, final InMemoryAppender app, final String header) { - final LogEvent event = Log4jLogEvent.newBuilder() // - .setLoggerName("TestLogger") // - .setLoggerFqcn(OutputStreamAppenderTest.class.getName()) // - .setLevel(Level.INFO) // - .setMessage(new SimpleMessage("Test")) // - .build(); - app.start(); - assertTrue("Appender did not start", app.isStarted()); - app.append(event); - app.append(event); - final String msg = app.toString(); - assertNotNull("No message", msg); - final String expectedHeader = header == null ? "" : header; - final String expected = expectedHeader + "Test" + Constants.LINE_SEPARATOR + "Test" + Constants.LINE_SEPARATOR; - assertTrue("Incorrect message: " + msg, msg.equals(expected)); - app.stop(); - assertFalse("Appender did not stop", app.isStarted()); - } -}
