You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2016/04/18 13:38:34 UTC
[48/50] logging-log4j2 git commit: Do not use our own deprecated code.
Do not use our own deprecated code.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d3e571f3
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d3e571f3
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d3e571f3
Branch: refs/heads/LOG4J2-1365
Commit: d3e571f37bd9a2ef07e426a1809d3cb1f69c3482
Parents: a15477b
Author: ggregory <gg...@apache.org>
Authored: Sun Apr 17 17:26:34 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Sun Apr 17 17:26:34 2016 -0700
----------------------------------------------------------------------
.../logging/log4j/core/AppenderRefLevelJsonTest.java | 12 ++++++------
.../logging/log4j/core/AppenderRefLevelTest.java | 12 ++++++------
.../apache/logging/log4j/core/PatternSelectorTest.java | 12 ++++++------
.../apache/logging/log4j/core/StrictXmlConfigTest.java | 13 +++++++++++--
.../log4j/core/filter/AbstractScriptFilterTest.java | 4 ++--
5 files changed, 31 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d3e571f3/log4j-core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelJsonTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelJsonTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelJsonTest.java
index a6c7697..3d9424a 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelJsonTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelJsonTest.java
@@ -52,36 +52,36 @@ public class AppenderRefLevelJsonTest {
@Test
public void logger1() {
- logger1.entry();
+ logger1.traceEntry();
logger1.debug("debug message");
logger1.error("Test Message");
logger1.info("Info Message");
logger1.warn("warn Message");
- logger1.exit();
+ logger1.traceExit();
assertThat(app1.getEvents(), hasSize(6));
assertThat(app2.getEvents(), hasSize(1));
}
@Test
public void logger2() {
- logger2.entry();
+ logger2.traceEntry();
logger2.debug("debug message");
logger2.error("Test Message");
logger2.info("Info Message");
logger2.warn("warn Message");
- logger2.exit();
+ logger2.traceExit();
assertThat(app1.getEvents(), hasSize(2));
assertThat(app2.getEvents(), hasSize(4));
}
@Test
public void logger3() {
- logger3.entry();
+ logger3.traceEntry();
logger3.debug(testMarker, "debug message");
logger3.error("Test Message");
logger3.info(testMarker, "Info Message");
logger3.warn("warn Message");
- logger3.exit();
+ logger3.traceExit();
assertThat(app1.getEvents(), hasSize(4));
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d3e571f3/log4j-core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelTest.java
index d59c1a0..861ed87 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelTest.java
@@ -53,12 +53,12 @@ public class AppenderRefLevelTest {
@Test
public void logger1() {
- logger1.entry();
+ logger1.traceEntry();
logger1.debug("debug message");
logger1.error("Test Message");
logger1.info("Info Message");
logger1.warn("warn Message");
- logger1.exit();
+ logger1.traceExit();
List<LogEvent> events = app1.getEvents();
assertEquals("Incorrect number of events. Expected 6, actual " + events.size(), 6, events.size());
events = app2.getEvents();
@@ -67,12 +67,12 @@ public class AppenderRefLevelTest {
@Test
public void logger2() {
- logger2.entry();
+ logger2.traceEntry();
logger2.debug("debug message");
logger2.error("Test Message");
logger2.info("Info Message");
logger2.warn("warn Message");
- logger2.exit();
+ logger2.traceExit();
List<LogEvent> events = app1.getEvents();
assertEquals("Incorrect number of events. Expected 2, actual " + events.size(), events.size(), 2);
events = app2.getEvents();
@@ -81,12 +81,12 @@ public class AppenderRefLevelTest {
@Test
public void logger3() {
- logger3.entry();
+ logger3.traceEntry();
logger3.debug(testMarker, "debug message");
logger3.error("Test Message");
logger3.info(testMarker, "Info Message");
logger3.warn("warn Message");
- logger3.exit();
+ logger3.traceExit();
final List<LogEvent> events = app1.getEvents();
assertEquals("Incorrect number of events. Expected 4, actual " + events.size(), 4, events.size());
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d3e571f3/log4j-core/src/test/java/org/apache/logging/log4j/core/PatternSelectorTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/PatternSelectorTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/PatternSelectorTest.java
index 9fda787..1214e4e 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/PatternSelectorTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/PatternSelectorTest.java
@@ -40,9 +40,9 @@ public class PatternSelectorTest {
@Test
public void testMarkerPatternSelector() throws Exception {
org.apache.logging.log4j.Logger logger = LogManager.getLogger("TestMarkerPatternSelector");
- logger.entry();
+ logger.traceEntry();
logger.info("Hello World");
- logger.exit();
+ logger.traceExit();
final ListAppender app = (ListAppender) context.getRequiredAppender("List");
assertNotNull("No ListAppender", app);
List<String> messages = app.getMessages();
@@ -59,10 +59,10 @@ public class PatternSelectorTest {
public void testScriptPatternSelector() throws Exception {
org.apache.logging.log4j.Logger logger = LogManager.getLogger("TestScriptPatternSelector");
org.apache.logging.log4j.Logger logger2 = LogManager.getLogger("NoLocation");
- logger.entry();
+ logger.traceEntry();
logger.info("Hello World");
logger2.info("No location information");
- logger.exit();
+ logger.traceExit();
final ListAppender app = (ListAppender) context.getRequiredAppender("List2");
assertNotNull("No ListAppender", app);
List<String> messages = app.getMessages();
@@ -82,10 +82,10 @@ public class PatternSelectorTest {
public void testJavaScriptPatternSelector() throws Exception {
org.apache.logging.log4j.Logger logger = LogManager.getLogger("TestJavaScriptPatternSelector");
org.apache.logging.log4j.Logger logger2 = LogManager.getLogger("JavascriptNoLocation");
- logger.entry();
+ logger.traceEntry();
logger.info("Hello World");
logger2.info("No location information");
- logger.exit();
+ logger.traceExit();
final ListAppender app = (ListAppender) context.getRequiredAppender("List3");
assertNotNull("No ListAppender", app);
List<String> messages = app.getMessages();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d3e571f3/log4j-core/src/test/java/org/apache/logging/log4j/core/StrictXmlConfigTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/StrictXmlConfigTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/StrictXmlConfigTest.java
index edc428e..f94a60d 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/StrictXmlConfigTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/StrictXmlConfigTest.java
@@ -23,6 +23,7 @@ import java.util.Locale;
import org.apache.logging.log4j.MarkerManager;
import org.apache.logging.log4j.ThreadContext;
import org.apache.logging.log4j.junit.LoggerContextRule;
+import org.apache.logging.log4j.message.EntryMessage;
import org.apache.logging.log4j.message.StructuredDataMessage;
import org.apache.logging.log4j.test.appender.ListAppender;
import org.junit.Before;
@@ -51,8 +52,16 @@ public class StrictXmlConfigTest {
@Test
public void basicFlow() {
- logger.entry();
- logger.exit();
+ final EntryMessage entry = logger.traceEntry();
+ logger.traceExit(entry);
+ final List<LogEvent> events = app.getEvents();
+ assertEquals("Incorrect number of events. Expected 2, actual " + events.size(), 2, events.size());
+ }
+
+ @Test
+ public void basicFlowDeprecated() {
+ logger.traceEntry();
+ logger.traceExit();
final List<LogEvent> events = app.getEvents();
assertEquals("Incorrect number of events. Expected 2, actual " + events.size(), 2, events.size());
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d3e571f3/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/AbstractScriptFilterTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/AbstractScriptFilterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/AbstractScriptFilterTest.java
index 56fa8f4..a2e949c 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/AbstractScriptFilterTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/AbstractScriptFilterTest.java
@@ -38,7 +38,7 @@ public abstract class AbstractScriptFilterTest {
@Test
public void testGroovyFilter() throws Exception {
Logger logger = LogManager.getLogger("TestGroovyFilter");
- logger.entry();
+ logger.traceEntry();
logger.info("This should not be logged");
ThreadContext.put("UserId", "JohnDoe");
logger.info("This should be logged");
@@ -56,7 +56,7 @@ public abstract class AbstractScriptFilterTest {
@Test
public void testJavascriptFilter() throws Exception {
Logger logger = LogManager.getLogger("TestJavaScriptFilter");
- logger.entry();
+ logger.traceEntry();
logger.info("This should not be logged");
ThreadContext.put("UserId", "JohnDoe");
logger.info("This should be logged");