logging-log4j2 git commit: [LOG4J2-1578] RoutingAppender can be configured with scripts. Fix test to use a plain logger instead of EventLogger.

[gg...@apache.org]

Repository: logging-log4j2
Updated Branches:
  refs/heads/master 01cc155e7 -> 250ba2be5


[LOG4J2-1578] RoutingAppender can be configured with scripts. Fix test
to use a plain logger instead of EventLogger.

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/250ba2be
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/250ba2be
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/250ba2be

Branch: refs/heads/master
Commit: 250ba2be58439ba8b353d5d9747e6a91454f7995
Parents: 01cc155
Author: Gary Gregory <gg...@apache.org>
Authored: Tue Sep 13 18:19:58 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Tue Sep 13 18:19:58 2016 -0700

----------------------------------------------------------------------
 .../routing/DefaultRouteScriptAppenderTest.java        | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/250ba2be/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptAppenderTest.java
index bfb2431..3165eb6 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptAppenderTest.java
@@ -22,14 +22,12 @@ import static org.junit.Assert.assertTrue;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.logging.log4j.EventLogger;
 import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.Logger;
 import org.apache.logging.log4j.core.config.AppenderControl;
 import org.apache.logging.log4j.junit.LoggerContextRule;
-import org.apache.logging.log4j.message.StructuredDataMessage;
 import org.apache.logging.log4j.test.appender.ListAppender;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -44,7 +42,7 @@ public class DefaultRouteScriptAppenderTest {
     @Parameterized.Parameters(name = "{0}")
     public static String[] getParameters() {
         return new String[] { 
-                // @Ignore "log4j-routing-default-route-script-groovy.xml",
+                "log4j-routing-default-route-script-groovy.xml",
                 "log4j-routing-default-route-script-javascript.xml" };
     }
 
@@ -71,13 +69,13 @@ public class DefaultRouteScriptAppenderTest {
     }
 
     private void logAndCheck() {
-        final StructuredDataMessage msg = new StructuredDataMessage("Test", "This is a test", "Alert");
-        EventLogger.logEvent(msg);
+        final Logger logger = loggerContextRule.getLogger(DefaultRouteScriptAppenderTest.class);
+        logger.error("Hello");
         final ListAppender listAppender = getListAppender();
         final List<LogEvent> list = listAppender.getEvents();
         assertNotNull("No events generated", list);
         assertTrue("Incorrect number of events. Expected 1, got " + list.size(), list.size() == 1);
-        EventLogger.logEvent(msg);
+        logger.error("World");
         assertTrue("Incorrect number of events. Expected 2, got " + list.size(), list.size() == 2);
     }
 
@@ -123,7 +121,6 @@ public class DefaultRouteScriptAppenderTest {
     }
 
     @Test
-    @Ignore
     public void testRoutingPresence2() {
         logAndCheck();
     }