You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2019/06/20 14:49:18 UTC
[logging-log4j2] 03/03: Separated
SequenceNumberPatternConverterTests
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit b9ad7d581104819997df2454d2b8a00134fe485c
Author: Marco Herrn <ma...@mherrn.de>
AuthorDate: Wed Oct 24 09:25:00 2018 +0200
Separated SequenceNumberPatternConverterTests
- Those tests can not be run sanely in the same test case. Therefore
they are now split again
---
.../SequenceNumberPatternConverterTest.java | 25 +---------------------
...uenceNumberPatternConverterZeroPaddedTest.java} | 20 ++---------------
.../SequenceNumberPatternConverterTest.yml | 13 ++++-------
...quenceNumberPatternConverterZeroPaddedTest.yml} | 5 -----
4 files changed, 7 insertions(+), 56 deletions(-)
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverterTest.java
index 4043e1d..b3fe206 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverterTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverterTest.java
@@ -21,12 +21,11 @@ import java.util.List;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.junit.LoggerContextRule;
import org.apache.logging.log4j.test.appender.ListAppender;
+import org.junit.ClassRule;
import org.junit.Test;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
-import org.junit.Before;
-import org.junit.ClassRule;
/**
*
@@ -36,12 +35,6 @@ public class SequenceNumberPatternConverterTest {
@ClassRule
public static LoggerContextRule ctx = new LoggerContextRule("SequenceNumberPatternConverterTest.yml");
- @Before
- public void before() {
- ctx.getListAppender("List").clear();
- ctx.getListAppender("Padded").clear();
- }
-
@Test
public void testSequenceIncreases() throws Exception {
final Logger logger = ctx.getLogger();
@@ -53,22 +46,6 @@ public class SequenceNumberPatternConverterTest {
final ListAppender app = ctx.getListAppender("List");
final List<String> messages = app.getMessages();
- System.out.println("Written messages: "+messages);
assertThat(messages, contains("1", "2", "3", "4", "5"));
}
-
- @Test
- public void testPaddedSequence() throws Exception {
- final Logger logger = ctx.getLogger();
- logger.info("Message 1");
- logger.info("Message 2");
- logger.info("Message 3");
- logger.info("Message 4");
- logger.info("Message 5");
-
- final ListAppender app = ctx.getListAppender("Padded");
- final List<String> messages = app.getMessages();
- System.out.println("Written messages "+messages);
- assertThat(messages, contains("001", "002", "003", "004", "005"));
- }
}
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverterZeroPaddedTest.java
similarity index 73%
copy from log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverterTest.java
copy to log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverterZeroPaddedTest.java
index 4043e1d..f7f2540 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverterTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverterZeroPaddedTest.java
@@ -31,33 +31,17 @@ import org.junit.ClassRule;
/**
*
*/
-public class SequenceNumberPatternConverterTest {
+public class SequenceNumberPatternConverterZeroPaddedTest {
@ClassRule
- public static LoggerContextRule ctx = new LoggerContextRule("SequenceNumberPatternConverterTest.yml");
+ public static LoggerContextRule ctx = new LoggerContextRule("SequenceNumberPatternConverterZeroPaddedTest.yml");
@Before
public void before() {
- ctx.getListAppender("List").clear();
ctx.getListAppender("Padded").clear();
}
@Test
- public void testSequenceIncreases() throws Exception {
- final Logger logger = ctx.getLogger();
- logger.info("Message 1");
- logger.info("Message 2");
- logger.info("Message 3");
- logger.info("Message 4");
- logger.info("Message 5");
-
- final ListAppender app = ctx.getListAppender("List");
- final List<String> messages = app.getMessages();
- System.out.println("Written messages: "+messages);
- assertThat(messages, contains("1", "2", "3", "4", "5"));
- }
-
- @Test
public void testPaddedSequence() throws Exception {
final Logger logger = ctx.getLogger();
logger.info("Message 1");
diff --git a/log4j-core/src/test/resources/SequenceNumberPatternConverterTest.yml b/log4j-core/src/test/resources/SequenceNumberPatternConverterTest.yml
index 64698cf..05f0b05 100644
--- a/log4j-core/src/test/resources/SequenceNumberPatternConverterTest.yml
+++ b/log4j-core/src/test/resources/SequenceNumberPatternConverterTest.yml
@@ -4,17 +4,12 @@ Configuration:
Appenders:
List:
- - name: List
- PatternLayout:
- pattern: '%sn'
-
- - name: Padded
- PatternLayout:
- pattern: '%03sn'
+ name: List
+ PatternLayout:
+ pattern: '%sn'
Loggers:
Root:
level: INFO
AppenderRef:
- - ref: List
- - ref: Padded
+ ref: List
diff --git a/log4j-core/src/test/resources/SequenceNumberPatternConverterTest.yml b/log4j-core/src/test/resources/SequenceNumberPatternConverterZeroPaddedTest.yml
similarity index 73%
copy from log4j-core/src/test/resources/SequenceNumberPatternConverterTest.yml
copy to log4j-core/src/test/resources/SequenceNumberPatternConverterZeroPaddedTest.yml
index 64698cf..3dea4d7 100644
--- a/log4j-core/src/test/resources/SequenceNumberPatternConverterTest.yml
+++ b/log4j-core/src/test/resources/SequenceNumberPatternConverterZeroPaddedTest.yml
@@ -4,10 +4,6 @@ Configuration:
Appenders:
List:
- - name: List
- PatternLayout:
- pattern: '%sn'
-
- name: Padded
PatternLayout:
pattern: '%03sn'
@@ -16,5 +12,4 @@ Configuration:
Root:
level: INFO
AppenderRef:
- - ref: List
- ref: Padded