This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch fix/rebase-on-log4j-api-2.x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit c046f76f888344c61db97635b3ce189db61dd4b6 Author: Piotr P. Karwasz <[email protected]> AuthorDate: Mon Mar 25 21:50:12 2024 +0100 Adapt `log4j-gc-test` to Log4j API 2.x --- .../org/apache/logging/log4j/gctests/GcFreeLoggingTestUtil.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/log4j-gc-test/src/test/java/org/apache/logging/log4j/gctests/GcFreeLoggingTestUtil.java b/log4j-gc-test/src/test/java/org/apache/logging/log4j/gctests/GcFreeLoggingTestUtil.java index 5d93d9a2fa..e2fcf065d4 100644 --- a/log4j-gc-test/src/test/java/org/apache/logging/log4j/gctests/GcFreeLoggingTestUtil.java +++ b/log4j-gc-test/src/test/java/org/apache/logging/log4j/gctests/GcFreeLoggingTestUtil.java @@ -21,7 +21,8 @@ import static org.apache.logging.log4j.core.test.TestConstants.CONFIGURATION_FIL import static org.apache.logging.log4j.core.test.TestConstants.GC_ENABLE_DIRECT_ENCODERS; import static org.apache.logging.log4j.core.test.TestConstants.WEB_IS_WEB_APP; import static org.apache.logging.log4j.core.test.TestConstants.setSystemProperty; -import static org.apache.logging.log4j.util.Constants.isWebApp; +import static org.apache.logging.log4j.core.util.Constants.ENABLE_DIRECT_ENCODERS; +import static org.apache.logging.log4j.util.Constants.IS_WEB_APP; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -45,7 +46,6 @@ import org.apache.logging.log4j.MarkerManager; import org.apache.logging.log4j.ThreadContext; import org.apache.logging.log4j.core.impl.CoreKeys; import org.apache.logging.log4j.core.test.TestConstants; -import org.apache.logging.log4j.core.util.Constants; import org.apache.logging.log4j.kit.env.PropertyEnvironment; import org.apache.logging.log4j.message.StringMapMessage; @@ -61,8 +61,8 @@ enum GcFreeLoggingTestUtil { setSystemProperty(WEB_IS_WEB_APP, "false"); setSystemProperty(CONFIGURATION_FILE, configurationFile); - assertTrue(Constants.ENABLE_DIRECT_ENCODERS, "Constants.ENABLE_DIRECT_ENCODERS"); - assertFalse(isWebApp(), "Constants.isWebApp()"); + assertTrue(ENABLE_DIRECT_ENCODERS, "Constants.ENABLE_DIRECT_ENCODERS"); + assertFalse(IS_WEB_APP, "Constants.isWebApp()"); final MyCharSeq myCharSeq = new MyCharSeq(); final Marker testGrandParent = MarkerManager.getMarker("testGrandParent");
