From 96c8d1dc3c6f8a238ea26020f3bcb531d0941698 Mon Sep 17 00:00:00 2001 From: James Coglan Date: Fri, 29 Nov 2024 10:20:36 +0000 Subject: [PATCH 1/3] Replace JUnit 4 parameterised tests with subclasses that override the constructor of DefaultRouteScriptAppenderTest --- .../DefaultRouteScriptAppenderTest.java | 17 +------------- .../DefaultRouteScriptGroovyAppenderTest.java | 23 +++++++++++++++++++ ...aultRouteScriptJavaScriptAppenderTest.java | 23 +++++++++++++++++++ .../ScriptStaticVarsGroovyAppenderTest.java | 23 +++++++++++++++++++ ...criptStaticVarsJavaScriptAppenderTest.java | 23 +++++++++++++++++++ 5 files changed, 93 insertions(+), 16 deletions(-) create mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptGroovyAppenderTest.java create mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptJavaScriptAppenderTest.java create mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/ScriptStaticVarsGroovyAppenderTest.java create mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/ScriptStaticVarsJavaScriptAppenderTest.java diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptAppenderTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptAppenderTest.java index 61c37e49145..d01c8e25438 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptAppenderTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptAppenderTest.java @@ -32,26 +32,11 @@ import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; /** * */ -@RunWith(Parameterized.class) -public class DefaultRouteScriptAppenderTest { - - @Parameterized.Parameters(name = "{0} {1}") - public static Object[][] getParameters() { - // @formatter:off - return new Object[][] { - {"log4j-routing-default-route-script-groovy.xml", false}, - {"log4j-routing-default-route-script-javascript.xml", false}, - {"log4j-routing-script-staticvars-javascript.xml", true}, - {"log4j-routing-script-staticvars-groovy.xml", true}, - }; - // @formatter:on - } +public abstract class DefaultRouteScriptAppenderTest { @BeforeClass public static void beforeClass() { diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptGroovyAppenderTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptGroovyAppenderTest.java new file mode 100644 index 00000000000..3d89093d6dd --- /dev/null +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptGroovyAppenderTest.java @@ -0,0 +1,23 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to you under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.logging.log4j.core.appender.routing; + +public class DefaultRouteScriptGroovyAppenderTest extends DefaultRouteScriptAppenderTest { + public DefaultRouteScriptGroovyAppenderTest() { + super("log4j-routing-default-route-script-groovy.xml", false); + } +} diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptJavaScriptAppenderTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptJavaScriptAppenderTest.java new file mode 100644 index 00000000000..2b18c92a28b --- /dev/null +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptJavaScriptAppenderTest.java @@ -0,0 +1,23 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to you under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.logging.log4j.core.appender.routing; + +public class DefaultRouteScriptJavaScriptAppenderTest extends DefaultRouteScriptAppenderTest { + public DefaultRouteScriptJavaScriptAppenderTest() { + super("log4j-routing-default-route-script-javascript.xml", false); + } +} diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/ScriptStaticVarsGroovyAppenderTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/ScriptStaticVarsGroovyAppenderTest.java new file mode 100644 index 00000000000..a1d5c8e75c0 --- /dev/null +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/ScriptStaticVarsGroovyAppenderTest.java @@ -0,0 +1,23 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to you under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.logging.log4j.core.appender.routing; + +public class ScriptStaticVarsGroovyAppenderTest extends DefaultRouteScriptAppenderTest { + public ScriptStaticVarsGroovyAppenderTest() { + super("log4j-routing-script-staticvars-groovy.xml", true); + } +} diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/ScriptStaticVarsJavaScriptAppenderTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/ScriptStaticVarsJavaScriptAppenderTest.java new file mode 100644 index 00000000000..4f7ec7fa200 --- /dev/null +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/ScriptStaticVarsJavaScriptAppenderTest.java @@ -0,0 +1,23 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to you under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.logging.log4j.core.appender.routing; + +public class ScriptStaticVarsJavaScriptAppenderTest extends DefaultRouteScriptAppenderTest { + public ScriptStaticVarsJavaScriptAppenderTest() { + super("log4j-routing-script-staticvars-javascript.xml", true); + } +} From 711550e5ba900f06ca6a220c4715c0da7cae141c Mon Sep 17 00:00:00 2001 From: James Coglan Date: Fri, 29 Nov 2024 14:43:49 +0000 Subject: [PATCH 2/3] Migrate DefaultRouteScriptAppenderTest to JUnit 5 --- .../DefaultRouteScriptAppenderTest.java | 58 +++++++++---------- .../DefaultRouteScriptGroovyAppenderTest.java | 8 ++- ...aultRouteScriptJavaScriptAppenderTest.java | 8 ++- .../ScriptStaticVarsGroovyAppenderTest.java | 8 ++- ...criptStaticVarsJavaScriptAppenderTest.java | 8 ++- 5 files changed, 53 insertions(+), 37 deletions(-) diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptAppenderTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptAppenderTest.java index d01c8e25438..fa901b07781 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptAppenderTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptAppenderTest.java @@ -16,40 +16,41 @@ */ package org.apache.logging.log4j.core.appender.routing; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Map; import java.util.concurrent.ConcurrentMap; import org.apache.logging.log4j.Marker; import org.apache.logging.log4j.MarkerManager; +import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.Logger; +import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.AppenderControl; import org.apache.logging.log4j.core.test.appender.ListAppender; -import org.apache.logging.log4j.core.test.junit.LoggerContextRule; import org.apache.logging.log4j.core.util.Constants; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; /** * */ public abstract class DefaultRouteScriptAppenderTest { - @BeforeClass + @BeforeAll public static void beforeClass() { System.setProperty(Constants.SCRIPT_LANGUAGES, "Groovy, Javascript"); } - @Rule - public final LoggerContextRule loggerContextRule; + public final LoggerContext loggerContext; private final boolean expectBindingEntries; - public DefaultRouteScriptAppenderTest(final String configLocation, final boolean expectBindingEntries) { - this.loggerContextRule = new LoggerContextRule(configLocation); + public DefaultRouteScriptAppenderTest(final LoggerContext context, boolean expectBindingEntries) { + this.loggerContext = context; this.expectBindingEntries = expectBindingEntries; } @@ -65,60 +66,59 @@ private void checkStaticVars() { private ListAppender getListAppender() { final String key = "Service2"; final RoutingAppender routingAppender = getRoutingAppender(); - Assert.assertTrue(routingAppender.isStarted()); + assertTrue(routingAppender.isStarted()); final Map appenders = routingAppender.getAppenders(); final AppenderControl appenderControl = appenders.get(key); - assertNotNull("No appender control generated for '" + key + "'; appenders = " + appenders, appenderControl); + assertNotNull(appenderControl, "No appender control generated for '" + key + "'; appenders = " + appenders); final ListAppender listAppender = (ListAppender) appenderControl.getAppender(); return listAppender; } private RoutingAppender getRoutingAppender() { - return loggerContextRule.getRequiredAppender("Routing", RoutingAppender.class); + return (RoutingAppender) loggerContext.getConfiguration().getAppenders().get("Routing"); } private void logAndCheck() { final Marker marker = MarkerManager.getMarker("HEXDUMP"); - final Logger logger = loggerContextRule.getLogger(DefaultRouteScriptAppenderTest.class); + final Logger logger = (Logger) loggerContext.getLogger(DefaultRouteScriptAppenderTest.class); logger.error("Hello"); final ListAppender listAppender = getListAppender(); - assertEquals("Incorrect number of events", 1, listAppender.getEvents().size()); + assertEquals(1, listAppender.getEvents().size(), "Incorrect number of events"); logger.error("World"); - assertEquals("Incorrect number of events", 2, listAppender.getEvents().size()); + assertEquals(2, listAppender.getEvents().size(), "Incorrect number of events"); logger.error(marker, "DEADBEEF"); - assertEquals("Incorrect number of events", 3, listAppender.getEvents().size()); + assertEquals(3, listAppender.getEvents().size(), "Incorrect number of events"); } - @Test(expected = AssertionError.class) - public void testAppenderAbsence() { - loggerContextRule.getListAppender("List1"); + @Test + public void testNotListAppender() { + Appender appender = loggerContext.getConfiguration().getAppender("List1"); + assertFalse(appender instanceof ListAppender); } @Test public void testListAppenderPresence() { // No appender until an event is routed, even thought we initialized the default route on startup. - Assert.assertNull( - "No appender control generated", - getRoutingAppender().getAppenders().get("Service2")); + assertNull(getRoutingAppender().getAppenders().get("Service2"), "No appender control generated"); } @Test public void testNoPurgePolicy() { // No PurgePolicy in this test - Assert.assertNull("Unexpected PurgePolicy", getRoutingAppender().getPurgePolicy()); + assertNull(getRoutingAppender().getPurgePolicy(), "Unexpected PurgePolicy"); } @Test public void testNoRewritePolicy() { // No RewritePolicy in this test - Assert.assertNull("Unexpected RewritePolicy", getRoutingAppender().getRewritePolicy()); + assertNull(getRoutingAppender().getRewritePolicy(), "Unexpected RewritePolicy"); } @Test public void testRoutingAppenderDefaultRouteKey() { final RoutingAppender routingAppender = getRoutingAppender(); - Assert.assertNotNull(routingAppender.getDefaultRouteScript()); - Assert.assertNotNull(routingAppender.getDefaultRoute()); + assertNotNull(routingAppender.getDefaultRouteScript()); + assertNotNull(routingAppender.getDefaultRoute()); assertEquals("Service2", routingAppender.getDefaultRoute().getKey()); } diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptGroovyAppenderTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptGroovyAppenderTest.java index 3d89093d6dd..1b162f68ca3 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptGroovyAppenderTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptGroovyAppenderTest.java @@ -16,8 +16,12 @@ */ package org.apache.logging.log4j.core.appender.routing; +import org.apache.logging.log4j.core.LoggerContext; +import org.apache.logging.log4j.core.test.junit.LoggerContextSource; + +@LoggerContextSource("log4j-routing-default-route-script-groovy.xml") public class DefaultRouteScriptGroovyAppenderTest extends DefaultRouteScriptAppenderTest { - public DefaultRouteScriptGroovyAppenderTest() { - super("log4j-routing-default-route-script-groovy.xml", false); + public DefaultRouteScriptGroovyAppenderTest(LoggerContext context) { + super(context, false); } } diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptJavaScriptAppenderTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptJavaScriptAppenderTest.java index 2b18c92a28b..6ab09632426 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptJavaScriptAppenderTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptJavaScriptAppenderTest.java @@ -16,8 +16,12 @@ */ package org.apache.logging.log4j.core.appender.routing; +import org.apache.logging.log4j.core.LoggerContext; +import org.apache.logging.log4j.core.test.junit.LoggerContextSource; + +@LoggerContextSource("log4j-routing-default-route-script-javascript.xml") public class DefaultRouteScriptJavaScriptAppenderTest extends DefaultRouteScriptAppenderTest { - public DefaultRouteScriptJavaScriptAppenderTest() { - super("log4j-routing-default-route-script-javascript.xml", false); + public DefaultRouteScriptJavaScriptAppenderTest(LoggerContext context) { + super(context, false); } } diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/ScriptStaticVarsGroovyAppenderTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/ScriptStaticVarsGroovyAppenderTest.java index a1d5c8e75c0..1a79e43461f 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/ScriptStaticVarsGroovyAppenderTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/ScriptStaticVarsGroovyAppenderTest.java @@ -16,8 +16,12 @@ */ package org.apache.logging.log4j.core.appender.routing; +import org.apache.logging.log4j.core.LoggerContext; +import org.apache.logging.log4j.core.test.junit.LoggerContextSource; + +@LoggerContextSource("log4j-routing-script-staticvars-groovy.xml") public class ScriptStaticVarsGroovyAppenderTest extends DefaultRouteScriptAppenderTest { - public ScriptStaticVarsGroovyAppenderTest() { - super("log4j-routing-script-staticvars-groovy.xml", true); + public ScriptStaticVarsGroovyAppenderTest(LoggerContext context) { + super(context, true); } } diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/ScriptStaticVarsJavaScriptAppenderTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/ScriptStaticVarsJavaScriptAppenderTest.java index 4f7ec7fa200..e816fc35db8 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/ScriptStaticVarsJavaScriptAppenderTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/ScriptStaticVarsJavaScriptAppenderTest.java @@ -16,8 +16,12 @@ */ package org.apache.logging.log4j.core.appender.routing; +import org.apache.logging.log4j.core.LoggerContext; +import org.apache.logging.log4j.core.test.junit.LoggerContextSource; + +@LoggerContextSource("log4j-routing-script-staticvars-javascript.xml") public class ScriptStaticVarsJavaScriptAppenderTest extends DefaultRouteScriptAppenderTest { - public ScriptStaticVarsJavaScriptAppenderTest() { - super("log4j-routing-script-staticvars-javascript.xml", true); + public ScriptStaticVarsJavaScriptAppenderTest(LoggerContext context) { + super(context, true); } } From 270b42ccf4abee6531ceb988ad31c624367e2ccd Mon Sep 17 00:00:00 2001 From: James Coglan Date: Mon, 2 Dec 2024 11:39:36 +0000 Subject: [PATCH 3/3] Set LoggerContextSource.reconfigure on DefaultRouteScriptAppenderTest test subclasses --- .../appender/routing/DefaultRouteScriptGroovyAppenderTest.java | 3 ++- .../routing/DefaultRouteScriptJavaScriptAppenderTest.java | 3 ++- .../appender/routing/ScriptStaticVarsGroovyAppenderTest.java | 3 ++- .../routing/ScriptStaticVarsJavaScriptAppenderTest.java | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptGroovyAppenderTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptGroovyAppenderTest.java index 1b162f68ca3..49d9e977731 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptGroovyAppenderTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptGroovyAppenderTest.java @@ -18,8 +18,9 @@ import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.test.junit.LoggerContextSource; +import org.apache.logging.log4j.core.test.junit.ReconfigurationPolicy; -@LoggerContextSource("log4j-routing-default-route-script-groovy.xml") +@LoggerContextSource(value = "log4j-routing-default-route-script-groovy.xml", reconfigure = ReconfigurationPolicy.BEFORE_EACH) public class DefaultRouteScriptGroovyAppenderTest extends DefaultRouteScriptAppenderTest { public DefaultRouteScriptGroovyAppenderTest(LoggerContext context) { super(context, false); diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptJavaScriptAppenderTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptJavaScriptAppenderTest.java index 6ab09632426..12321d76e3a 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptJavaScriptAppenderTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptJavaScriptAppenderTest.java @@ -18,8 +18,9 @@ import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.test.junit.LoggerContextSource; +import org.apache.logging.log4j.core.test.junit.ReconfigurationPolicy; -@LoggerContextSource("log4j-routing-default-route-script-javascript.xml") +@LoggerContextSource(value = "log4j-routing-default-route-script-javascript.xml", reconfigure = ReconfigurationPolicy.BEFORE_EACH) public class DefaultRouteScriptJavaScriptAppenderTest extends DefaultRouteScriptAppenderTest { public DefaultRouteScriptJavaScriptAppenderTest(LoggerContext context) { super(context, false); diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/ScriptStaticVarsGroovyAppenderTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/ScriptStaticVarsGroovyAppenderTest.java index 1a79e43461f..3d18b10e5e4 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/ScriptStaticVarsGroovyAppenderTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/ScriptStaticVarsGroovyAppenderTest.java @@ -18,8 +18,9 @@ import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.test.junit.LoggerContextSource; +import org.apache.logging.log4j.core.test.junit.ReconfigurationPolicy; -@LoggerContextSource("log4j-routing-script-staticvars-groovy.xml") +@LoggerContextSource(value = "log4j-routing-script-staticvars-groovy.xml", reconfigure = ReconfigurationPolicy.BEFORE_EACH) public class ScriptStaticVarsGroovyAppenderTest extends DefaultRouteScriptAppenderTest { public ScriptStaticVarsGroovyAppenderTest(LoggerContext context) { super(context, true); diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/ScriptStaticVarsJavaScriptAppenderTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/ScriptStaticVarsJavaScriptAppenderTest.java index e816fc35db8..b285cd72c4c 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/ScriptStaticVarsJavaScriptAppenderTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/routing/ScriptStaticVarsJavaScriptAppenderTest.java @@ -18,8 +18,9 @@ import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.test.junit.LoggerContextSource; +import org.apache.logging.log4j.core.test.junit.ReconfigurationPolicy; -@LoggerContextSource("log4j-routing-script-staticvars-javascript.xml") +@LoggerContextSource(value = "log4j-routing-script-staticvars-javascript.xml", reconfigure = ReconfigurationPolicy.BEFORE_EACH) public class ScriptStaticVarsJavaScriptAppenderTest extends DefaultRouteScriptAppenderTest { public ScriptStaticVarsJavaScriptAppenderTest(LoggerContext context) { super(context, true);