This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch 2.x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 55e224e2b88e3b5e94256c0afcf91c71b4172027 Author: Piotr P. Karwasz <[email protected]> AuthorDate: Tue Aug 1 22:16:01 2023 +0200 Rewrite EnvironmentArbiterTest without additional deps --- log4j-core-test/pom.xml | 7 ----- .../config/arbiters/EnvironmentArbiterTest.java | 35 ++++++++-------------- 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/log4j-core-test/pom.xml b/log4j-core-test/pom.xml index 2e5b3a4e35..3cb01f9049 100644 --- a/log4j-core-test/pom.xml +++ b/log4j-core-test/pom.xml @@ -329,13 +329,6 @@ <artifactId>xz</artifactId> <scope>test</scope> </dependency> - <!-- Used for testing environment variables arbiter --> - <dependency> - <groupId>com.github.stefanbirkner</groupId> - <artifactId>system-lambda</artifactId> - <version>1.2.1</version> - <scope>test</scope> - </dependency> </dependencies> <build> <plugins> diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/arbiters/EnvironmentArbiterTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/arbiters/EnvironmentArbiterTest.java index d25caa6e6c..9ed7530254 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/arbiters/EnvironmentArbiterTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/arbiters/EnvironmentArbiterTest.java @@ -16,14 +16,13 @@ */ package org.apache.logging.log4j.core.config.arbiters; -import com.github.stefanbirkner.systemlambda.SystemLambda; import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.appender.ConsoleAppender; -import org.apache.logging.log4j.core.config.Configurator; import org.apache.logging.log4j.core.test.appender.ListAppender; -import org.junit.jupiter.api.AfterEach; +import org.apache.logging.log4j.core.test.junit.LoggerContextSource; import org.junit.jupiter.api.Test; +import org.junitpioneer.jupiter.SetEnvironmentVariable; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -31,35 +30,25 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /** * Tests system property condition processing. */ -public class EnvironmentArbiterTest { - static final String CONFIG = "log4j2-environmentArbiters.xml"; - static LoggerContext loggerContext = null; +public class EnvironmentArbiterTest { - @AfterEach - public void after() { - loggerContext.stop(); - loggerContext = null; - } + private static final String CONFIG = "log4j2-environmentArbiters.xml"; @Test - public void prodTest() throws Exception { - Appender app = SystemLambda.withEnvironmentVariable("ENV", "prod").execute(() -> { - loggerContext = Configurator.initialize(null, CONFIG); - assertNotNull(loggerContext); - return loggerContext.getConfiguration().getAppender("Out"); - }); + @SetEnvironmentVariable(key = "ENV", value = "prod") + @LoggerContextSource(CONFIG) + public void prodTest(final LoggerContext loggerContext) throws Exception { + final Appender app = loggerContext.getConfiguration().getAppender("Out"); assertNotNull(app); assertTrue(app instanceof ListAppender); } @Test - public void devTest() throws Exception { - Appender app = SystemLambda.withEnvironmentVariable("ENV", "dev").execute(() -> { - loggerContext = Configurator.initialize(null, CONFIG); - assertNotNull(loggerContext); - return loggerContext.getConfiguration().getAppender("Out"); - }); + @SetEnvironmentVariable(key = "ENV", value = "dev") + @LoggerContextSource(CONFIG) + public void devTest(final LoggerContext loggerContext) throws Exception { + final Appender app = loggerContext.getConfiguration().getAppender("Out"); assertNotNull(app); assertTrue(app instanceof ConsoleAppender); }
