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/05/21 06:24:50 UTC
svn commit: r1596454 -
/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/
Author: mattsicker
Date: Wed May 21 04:24:50 2014
New Revision: 1596454
URL: http://svn.apache.org/r1596454
Log:
Use getListAppender and make said appenders members instead of static.
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelJsonTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/CollectionLoggingTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/ExtendedLevelTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/FileConfigTest.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/LevelTest.java
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelJsonTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelJsonTest.java?rev=1596454&r1=1596453&r2=1596454&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelJsonTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelJsonTest.java Wed May 21 04:24:50 2014
@@ -23,7 +23,6 @@ import org.apache.logging.log4j.MarkerMa
import org.apache.logging.log4j.junit.InitialLoggerContext;
import org.apache.logging.log4j.test.appender.ListAppender;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
@@ -35,18 +34,12 @@ import static org.junit.Assert.*;
public class AppenderRefLevelJsonTest {
private static final String CONFIG = "log4j-reference-level.json";
- private static ListAppender app1;
- private static ListAppender app2;
+ private ListAppender app1;
+ private ListAppender app2;
@ClassRule
public static InitialLoggerContext context = new InitialLoggerContext(CONFIG);
- @BeforeClass
- public static void setupClass() {
- app1 = (ListAppender) context.getAppender("LIST1");
- app2 = (ListAppender) context.getAppender("LIST2");
- }
-
org.apache.logging.log4j.Logger logger1 = context.getLogger("org.apache.logging.log4j.test1");
org.apache.logging.log4j.Logger logger2 = context.getLogger("org.apache.logging.log4j.test2");
org.apache.logging.log4j.Logger logger3 = context.getLogger("org.apache.logging.log4j.test3");
@@ -54,8 +47,8 @@ public class AppenderRefLevelJsonTest {
@Before
public void before() {
- app1.clear();
- app2.clear();
+ app1 = context.getListAppender("LIST1").clear();
+ app2 = context.getListAppender("LIST2").clear();
}
@Test
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelTest.java?rev=1596454&r1=1596453&r2=1596454&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelTest.java Wed May 21 04:24:50 2014
@@ -23,7 +23,6 @@ import org.apache.logging.log4j.MarkerMa
import org.apache.logging.log4j.junit.InitialLoggerContext;
import org.apache.logging.log4j.test.appender.ListAppender;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
@@ -35,18 +34,12 @@ import static org.junit.Assert.*;
public class AppenderRefLevelTest {
private static final String CONFIG = "log4j-reference-level.xml";
- private static ListAppender app1;
- private static ListAppender app2;
+ private ListAppender app1;
+ private ListAppender app2;
@ClassRule
public static InitialLoggerContext context = new InitialLoggerContext(CONFIG);
- @BeforeClass
- public static void setupClass() {
- app1 = (ListAppender) context.getAppender("LIST1");
- app2 = (ListAppender) context.getAppender("LIST2");
- }
-
org.apache.logging.log4j.Logger logger1 = context.getLogger("org.apache.logging.log4j.test1");
org.apache.logging.log4j.Logger logger2 = context.getLogger("org.apache.logging.log4j.test2");
org.apache.logging.log4j.Logger logger3 = context.getLogger("org.apache.logging.log4j.test3");
@@ -54,8 +47,8 @@ public class AppenderRefLevelTest {
@Before
public void before() {
- app1.clear();
- app2.clear();
+ app1 = context.getListAppender("LIST1").clear();
+ app2 = context.getListAppender("LIST2").clear();
}
@Test
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/CollectionLoggingTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/CollectionLoggingTest.java?rev=1596454&r1=1596453&r2=1596454&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/CollectionLoggingTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/CollectionLoggingTest.java Wed May 21 04:24:50 2014
@@ -43,8 +43,7 @@ public class CollectionLoggingTest {
@Before
public void before() {
- app = (ListAppender) context.getRequiredAppender("List");
- app.clear();
+ app = context.getListAppender("List").clear();
}
@Test
@@ -52,6 +51,7 @@ public class CollectionLoggingTest {
final Logger logger = context.getLogger(CollectionLoggingTest.class.getName());
logger.error(System.getProperties());
// logger.error(new MapMessage(System.getProperties()));
+ // TODO: some assertions
}
@Test
@@ -63,18 +63,21 @@ public class CollectionLoggingTest {
map.put("MyKey2", "MyValue2");
logger.error(new MapMessage(map));
logger.error(map);
+ // TODO: some assertions
}
@Test
public void testNetworkInterfaces() throws SocketException {
final Logger logger = context.getLogger(CollectionLoggingTest.class.getName());
logger.error(NetworkInterface.getNetworkInterfaces());
+ // TODO: some assertions
}
@Test
public void testAvailableCharsets() throws SocketException {
final Logger logger = context.getLogger(CollectionLoggingTest.class.getName());
logger.error(Charset.availableCharsets());
+ // TODO: some assertions
}
}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/ExtendedLevelTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/ExtendedLevelTest.java?rev=1596454&r1=1596453&r2=1596454&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/ExtendedLevelTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/ExtendedLevelTest.java Wed May 21 04:24:50 2014
@@ -34,18 +34,16 @@ import static org.junit.Assert.*;
public class ExtendedLevelTest {
private static final String CONFIG = "log4j-customLevel.xml";
- private static ListAppender list1;
- private static ListAppender list2;
+ private ListAppender list1;
+ private ListAppender list2;
@ClassRule
public static InitialLoggerContext context = new InitialLoggerContext(CONFIG);
@Before
public void before() {
- list1 = (ListAppender) context.getRequiredAppender("List1");
- list2 = (ListAppender) context.getRequiredAppender("List2");
- list1.clear();
- list2.clear();
+ list1 = context.getListAppender("List1").clear();
+ list2 = context.getListAppender("List2").clear();
}
@Test
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/FileConfigTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/FileConfigTest.java?rev=1596454&r1=1596453&r2=1596454&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/FileConfigTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/FileConfigTest.java Wed May 21 04:24:50 2014
@@ -33,7 +33,7 @@ import static org.junit.Assert.*;
public class FileConfigTest {
private static final String CONFIG = "target/test-classes/log4j-test2.xml";
- private static ListAppender app;
+ private ListAppender app;
@ClassRule
public static InitialLoggerContext context = new InitialLoggerContext(CONFIG);
@@ -42,8 +42,7 @@ public class FileConfigTest {
@Before
public void before() {
- app = (ListAppender) context.getRequiredAppender("List");
- app.clear();
+ app = context.getListAppender("List").clear();
}
@Test
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=1596454&r1=1596453&r2=1596454&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 Wed May 21 04:24:50 2014
@@ -35,23 +35,18 @@ import static org.junit.Assert.*;
public class HostNameTest {
private static final String CONFIG = "log4j-test2.xml";
- private static ListAppender app;
- private static ListAppender host;
- private static RollingFileAppender hostFile;
+ private ListAppender host;
+ private RollingFileAppender hostFile;
@ClassRule
public static InitialLoggerContext context = new InitialLoggerContext(CONFIG);
@Before
public void before() {
- app = (ListAppender) context.getAppender("List");
- host = (ListAppender) context.getAppender("HostTest");
+ host = context.getListAppender("HostTest").clear();
hostFile = (RollingFileAppender) context.getRequiredAppender("HostFile");
- app.clear();
- host.clear();
}
-
@Test
public void testHostname() {
final org.apache.logging.log4j.Logger testLogger = context.getLogger("org.apache.logging.log4j.hosttest");
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/LevelTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/LevelTest.java?rev=1596454&r1=1596453&r2=1596454&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/LevelTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/LevelTest.java Wed May 21 04:24:50 2014
@@ -39,13 +39,13 @@ import static org.junit.Assert.*;
public class LevelTest {
private static final String CONFIG = "log4j-Level.xml";
- private static ListAppender listAll;
- private static ListAppender listTrace;
- private static ListAppender listDebug;
- private static ListAppender listInfo;
- private static ListAppender listWarn;
- private static ListAppender listError;
- private static ListAppender listFatal;
+ private ListAppender listAll;
+ private ListAppender listTrace;
+ private ListAppender listDebug;
+ private ListAppender listInfo;
+ private ListAppender listWarn;
+ private ListAppender listError;
+ private ListAppender listFatal;
@ClassRule
public static InitialLoggerContext context = new InitialLoggerContext(CONFIG);