16
16
*/
17
17
package org .apache .logging .log4j .core .appender .routing ;
18
18
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 ;
21
24
22
25
import java .util .Map ;
23
26
import java .util .concurrent .ConcurrentMap ;
24
27
import org .apache .logging .log4j .Marker ;
25
28
import org .apache .logging .log4j .MarkerManager ;
29
+ import org .apache .logging .log4j .core .Appender ;
26
30
import org .apache .logging .log4j .core .Logger ;
31
+ import org .apache .logging .log4j .core .LoggerContext ;
27
32
import org .apache .logging .log4j .core .config .AppenderControl ;
28
33
import org .apache .logging .log4j .core .test .appender .ListAppender ;
29
- import org .apache .logging .log4j .core .test .junit .LoggerContextRule ;
30
34
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 ;
35
37
36
38
/**
37
39
*
38
40
*/
39
41
public abstract class DefaultRouteScriptAppenderTest {
40
42
41
- @ BeforeClass
43
+ @ BeforeAll
42
44
public static void beforeClass () {
43
45
System .setProperty (Constants .SCRIPT_LANGUAGES , "Groovy, Javascript" );
44
46
}
45
47
46
- @ Rule
47
- public final LoggerContextRule loggerContextRule ;
48
+ public final LoggerContext loggerContext ;
48
49
49
50
private final boolean expectBindingEntries ;
50
51
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 ;
53
54
this .expectBindingEntries = expectBindingEntries ;
54
55
}
55
56
@@ -65,60 +66,60 @@ private void checkStaticVars() {
65
66
private ListAppender getListAppender () {
66
67
final String key = "Service2" ;
67
68
final RoutingAppender routingAppender = getRoutingAppender ();
68
- Assert . assertTrue (routingAppender .isStarted ());
69
+ assertTrue (routingAppender .isStarted ());
69
70
final Map <String , AppenderControl > appenders = routingAppender .getAppenders ();
70
71
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 );
72
73
final ListAppender listAppender = (ListAppender ) appenderControl .getAppender ();
73
74
return listAppender ;
74
75
}
75
76
76
77
private RoutingAppender getRoutingAppender () {
77
- return loggerContextRule . getRequiredAppender ( "Routing" , RoutingAppender . class );
78
+ return ( RoutingAppender ) loggerContext . getConfiguration (). getAppenders (). get ( "Routing" );
78
79
}
79
80
80
81
private void logAndCheck () {
81
82
final Marker marker = MarkerManager .getMarker ("HEXDUMP" );
82
- final Logger logger = loggerContextRule .getLogger (DefaultRouteScriptAppenderTest .class );
83
+ final Logger logger = ( Logger ) loggerContext .getLogger (DefaultRouteScriptAppenderTest .class );
83
84
logger .error ("Hello" );
84
85
final ListAppender listAppender = getListAppender ();
85
- assertEquals ("Incorrect number of events" , 1 , listAppender .getEvents ().size ());
86
+ assertEquals (1 , listAppender .getEvents ().size (), "Incorrect number of events" );
86
87
logger .error ("World" );
87
- assertEquals ("Incorrect number of events" , 2 , listAppender .getEvents ().size ());
88
+ assertEquals (2 , listAppender .getEvents ().size (), "Incorrect number of events" );
88
89
logger .error (marker , "DEADBEEF" );
89
- assertEquals ("Incorrect number of events" , 3 , listAppender .getEvents ().size ());
90
+ assertEquals (3 , listAppender .getEvents ().size (), "Incorrect number of events" );
90
91
}
91
92
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 );
95
98
}
96
99
97
100
@ Test
98
101
public void testListAppenderPresence () {
99
102
// 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" );
103
104
}
104
105
105
106
@ Test
106
107
public void testNoPurgePolicy () {
107
108
// No PurgePolicy in this test
108
- Assert . assertNull ("Unexpected PurgePolicy" , getRoutingAppender ().getPurgePolicy ());
109
+ assertNull (getRoutingAppender ().getPurgePolicy (), "Unexpected PurgePolicy" );
109
110
}
110
111
111
112
@ Test
112
113
public void testNoRewritePolicy () {
113
114
// No RewritePolicy in this test
114
- Assert . assertNull ("Unexpected RewritePolicy" , getRoutingAppender ().getRewritePolicy ());
115
+ assertNull (getRoutingAppender ().getRewritePolicy (), "Unexpected RewritePolicy" );
115
116
}
116
117
117
118
@ Test
118
119
public void testRoutingAppenderDefaultRouteKey () {
119
120
final RoutingAppender routingAppender = getRoutingAppender ();
120
- Assert . assertNotNull (routingAppender .getDefaultRouteScript ());
121
- Assert . assertNotNull (routingAppender .getDefaultRoute ());
121
+ assertNotNull (routingAppender .getDefaultRouteScript ());
122
+ assertNotNull (routingAppender .getDefaultRoute ());
122
123
assertEquals ("Service2" , routingAppender .getDefaultRoute ().getKey ());
123
124
}
124
125
0 commit comments