Skip to content

Commit ef8636f

Browse files
committed
Migrate DefaultRouteScriptAppenderTest to JUnit 5
1 parent 96c8d1d commit ef8636f

5 files changed

+54
-37
lines changed

log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptAppenderTest.java

+30-29
Original file line numberDiff line numberDiff line change
@@ -16,40 +16,41 @@
1616
*/
1717
package org.apache.logging.log4j.core.appender.routing;
1818

19-
import static org.junit.Assert.assertEquals;
20-
import static org.junit.Assert.assertNotNull;
19+
import static org.junit.jupiter.api.Assertions.assertEquals;
20+
import static org.junit.jupiter.api.Assertions.assertFalse;
21+
import static org.junit.jupiter.api.Assertions.assertNotNull;
22+
import static org.junit.jupiter.api.Assertions.assertNull;
23+
import static org.junit.jupiter.api.Assertions.assertTrue;
2124

2225
import java.util.Map;
2326
import java.util.concurrent.ConcurrentMap;
2427
import org.apache.logging.log4j.Marker;
2528
import org.apache.logging.log4j.MarkerManager;
29+
import org.apache.logging.log4j.core.Appender;
2630
import org.apache.logging.log4j.core.Logger;
31+
import org.apache.logging.log4j.core.LoggerContext;
2732
import org.apache.logging.log4j.core.config.AppenderControl;
2833
import org.apache.logging.log4j.core.test.appender.ListAppender;
29-
import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
3034
import org.apache.logging.log4j.core.util.Constants;
31-
import org.junit.Assert;
32-
import org.junit.BeforeClass;
33-
import org.junit.Rule;
34-
import org.junit.Test;
35+
import org.junit.jupiter.api.BeforeAll;
36+
import org.junit.jupiter.api.Test;
3537

3638
/**
3739
*
3840
*/
3941
public abstract class DefaultRouteScriptAppenderTest {
4042

41-
@BeforeClass
43+
@BeforeAll
4244
public static void beforeClass() {
4345
System.setProperty(Constants.SCRIPT_LANGUAGES, "Groovy, Javascript");
4446
}
4547

46-
@Rule
47-
public final LoggerContextRule loggerContextRule;
48+
public final LoggerContext loggerContext;
4849

4950
private final boolean expectBindingEntries;
5051

51-
public DefaultRouteScriptAppenderTest(final String configLocation, final boolean expectBindingEntries) {
52-
this.loggerContextRule = new LoggerContextRule(configLocation);
52+
public DefaultRouteScriptAppenderTest(final LoggerContext context, boolean expectBindingEntries) {
53+
this.loggerContext = context;
5354
this.expectBindingEntries = expectBindingEntries;
5455
}
5556

@@ -65,60 +66,60 @@ private void checkStaticVars() {
6566
private ListAppender getListAppender() {
6667
final String key = "Service2";
6768
final RoutingAppender routingAppender = getRoutingAppender();
68-
Assert.assertTrue(routingAppender.isStarted());
69+
assertTrue(routingAppender.isStarted());
6970
final Map<String, AppenderControl> appenders = routingAppender.getAppenders();
7071
final AppenderControl appenderControl = appenders.get(key);
71-
assertNotNull("No appender control generated for '" + key + "'; appenders = " + appenders, appenderControl);
72+
assertNotNull(appenderControl, "No appender control generated for '" + key + "'; appenders = " + appenders);
7273
final ListAppender listAppender = (ListAppender) appenderControl.getAppender();
7374
return listAppender;
7475
}
7576

7677
private RoutingAppender getRoutingAppender() {
77-
return loggerContextRule.getRequiredAppender("Routing", RoutingAppender.class);
78+
return (RoutingAppender) loggerContext.getConfiguration().getAppenders().get("Routing");
7879
}
7980

8081
private void logAndCheck() {
8182
final Marker marker = MarkerManager.getMarker("HEXDUMP");
82-
final Logger logger = loggerContextRule.getLogger(DefaultRouteScriptAppenderTest.class);
83+
final Logger logger = (Logger) loggerContext.getLogger(DefaultRouteScriptAppenderTest.class);
8384
logger.error("Hello");
8485
final ListAppender listAppender = getListAppender();
85-
assertEquals("Incorrect number of events", 1, listAppender.getEvents().size());
86+
assertEquals(1, listAppender.getEvents().size(), "Incorrect number of events");
8687
logger.error("World");
87-
assertEquals("Incorrect number of events", 2, listAppender.getEvents().size());
88+
assertEquals(2, listAppender.getEvents().size(), "Incorrect number of events");
8889
logger.error(marker, "DEADBEEF");
89-
assertEquals("Incorrect number of events", 3, listAppender.getEvents().size());
90+
assertEquals(3, listAppender.getEvents().size(), "Incorrect number of events");
9091
}
9192

92-
@Test(expected = AssertionError.class)
93-
public void testAppenderAbsence() {
94-
loggerContextRule.getListAppender("List1");
93+
@Test
94+
public void testNotListAppender() {
95+
Appender appender = loggerContext.getConfiguration().getAppender("List1");
96+
assertNotNull(appender);
97+
assertFalse(appender instanceof ListAppender);
9598
}
9699

97100
@Test
98101
public void testListAppenderPresence() {
99102
// No appender until an event is routed, even thought we initialized the default route on startup.
100-
Assert.assertNull(
101-
"No appender control generated",
102-
getRoutingAppender().getAppenders().get("Service2"));
103+
assertNull(getRoutingAppender().getAppenders().get("Service2"), "No appender control generated");
103104
}
104105

105106
@Test
106107
public void testNoPurgePolicy() {
107108
// No PurgePolicy in this test
108-
Assert.assertNull("Unexpected PurgePolicy", getRoutingAppender().getPurgePolicy());
109+
assertNull(getRoutingAppender().getPurgePolicy(), "Unexpected PurgePolicy");
109110
}
110111

111112
@Test
112113
public void testNoRewritePolicy() {
113114
// No RewritePolicy in this test
114-
Assert.assertNull("Unexpected RewritePolicy", getRoutingAppender().getRewritePolicy());
115+
assertNull(getRoutingAppender().getRewritePolicy(), "Unexpected RewritePolicy");
115116
}
116117

117118
@Test
118119
public void testRoutingAppenderDefaultRouteKey() {
119120
final RoutingAppender routingAppender = getRoutingAppender();
120-
Assert.assertNotNull(routingAppender.getDefaultRouteScript());
121-
Assert.assertNotNull(routingAppender.getDefaultRoute());
121+
assertNotNull(routingAppender.getDefaultRouteScript());
122+
assertNotNull(routingAppender.getDefaultRoute());
122123
assertEquals("Service2", routingAppender.getDefaultRoute().getKey());
123124
}
124125

log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptGroovyAppenderTest.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,12 @@
1616
*/
1717
package org.apache.logging.log4j.core.appender.routing;
1818

19+
import org.apache.logging.log4j.core.LoggerContext;
20+
import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
21+
22+
@LoggerContextSource("log4j-routing-default-route-script-groovy.xml")
1923
public class DefaultRouteScriptGroovyAppenderTest extends DefaultRouteScriptAppenderTest {
20-
public DefaultRouteScriptGroovyAppenderTest() {
21-
super("log4j-routing-default-route-script-groovy.xml", false);
24+
public DefaultRouteScriptGroovyAppenderTest(LoggerContext context) {
25+
super(context, false);
2226
}
2327
}

log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptJavaScriptAppenderTest.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,12 @@
1616
*/
1717
package org.apache.logging.log4j.core.appender.routing;
1818

19+
import org.apache.logging.log4j.core.LoggerContext;
20+
import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
21+
22+
@LoggerContextSource("log4j-routing-default-route-script-javascript.xml")
1923
public class DefaultRouteScriptJavaScriptAppenderTest extends DefaultRouteScriptAppenderTest {
20-
public DefaultRouteScriptJavaScriptAppenderTest() {
21-
super("log4j-routing-default-route-script-javascript.xml", false);
24+
public DefaultRouteScriptJavaScriptAppenderTest(LoggerContext context) {
25+
super(context, false);
2226
}
2327
}

log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/ScriptStaticVarsGroovyAppenderTest.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,12 @@
1616
*/
1717
package org.apache.logging.log4j.core.appender.routing;
1818

19+
import org.apache.logging.log4j.core.LoggerContext;
20+
import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
21+
22+
@LoggerContextSource("log4j-routing-script-staticvars-groovy.xml")
1923
public class ScriptStaticVarsGroovyAppenderTest extends DefaultRouteScriptAppenderTest {
20-
public ScriptStaticVarsGroovyAppenderTest() {
21-
super("log4j-routing-script-staticvars-groovy.xml", true);
24+
public ScriptStaticVarsGroovyAppenderTest(LoggerContext context) {
25+
super(context, true);
2226
}
2327
}

log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/ScriptStaticVarsJavaScriptAppenderTest.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,12 @@
1616
*/
1717
package org.apache.logging.log4j.core.appender.routing;
1818

19+
import org.apache.logging.log4j.core.LoggerContext;
20+
import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
21+
22+
@LoggerContextSource("log4j-routing-script-staticvars-javascript.xml")
1923
public class ScriptStaticVarsJavaScriptAppenderTest extends DefaultRouteScriptAppenderTest {
20-
public ScriptStaticVarsJavaScriptAppenderTest() {
21-
super("log4j-routing-script-staticvars-javascript.xml", true);
24+
public ScriptStaticVarsJavaScriptAppenderTest(LoggerContext context) {
25+
super(context, true);
2226
}
2327
}

0 commit comments

Comments
 (0)