From b15b1e98b42f00a89ae647db602a95c53976adc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julia=20Kr=C3=BCger?= Date: Tue, 19 Nov 2024 13:15:06 +0100 Subject: [PATCH] refactor: SecurityManagerTestRule to junit5 --- .../test/junit/SecurityManagerExtension.java | 39 +++++++++++++++++++ ...MessageFormatMessageSerializationTest.java | 2 +- ...onmentPropertySourceSecurityManagerIT.java | 10 ++--- .../util/LoaderUtilSecurityManagerTest.java | 10 ++--- ...tyFilePropertySourceSecurityManagerIT.java | 22 +++++------ .../log4j/util/StackLocatorTestIT.java | 10 ++--- ...ertiesPropertySourceSecurityManagerIT.java | 12 +++--- 7 files changed, 72 insertions(+), 33 deletions(-) create mode 100644 log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/SecurityManagerExtension.java diff --git a/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/SecurityManagerExtension.java b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/SecurityManagerExtension.java new file mode 100644 index 000000000000..c6959d83a6b9 --- /dev/null +++ b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/SecurityManagerExtension.java @@ -0,0 +1,39 @@ +/* + * 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.test.junit; + +import org.junit.jupiter.api.extension.AfterEachCallback; +import org.junit.jupiter.api.extension.BeforeEachCallback; +import org.junit.jupiter.api.extension.ExtensionContext; + +public class SecurityManagerExtension implements BeforeEachCallback, AfterEachCallback { + private SecurityManager securityManagerBefore; + private final SecurityManager securityManager; + + public SecurityManagerExtension(final SecurityManager securityManager) { + this.securityManager = securityManager; + } + + public void beforeEach(ExtensionContext ctx) { + securityManagerBefore = System.getSecurityManager(); + System.setSecurityManager(securityManager); + } + + public void afterEach(ExtensionContext ctx) { + System.setSecurityManager(securityManagerBefore); + } +} diff --git a/log4j-api-test/src/test/java/org/apache/logging/log4j/message/MessageFormatMessageSerializationTest.java b/log4j-api-test/src/test/java/org/apache/logging/log4j/message/MessageFormatMessageSerializationTest.java index 56778508b84e..361651d444a5 100644 --- a/log4j-api-test/src/test/java/org/apache/logging/log4j/message/MessageFormatMessageSerializationTest.java +++ b/log4j-api-test/src/test/java/org/apache/logging/log4j/message/MessageFormatMessageSerializationTest.java @@ -16,9 +16,9 @@ */ package org.apache.logging.log4j.message; +import java.io.Serializable; import java.util.Arrays; import java.util.Collection; -import java.io.Serializable; import org.apache.logging.log4j.test.AbstractSerializationTest; import org.junit.jupiter.api.parallel.ResourceAccessMode; import org.junit.jupiter.api.parallel.ResourceLock; diff --git a/log4j-api-test/src/test/java/org/apache/logging/log4j/util/EnvironmentPropertySourceSecurityManagerIT.java b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/EnvironmentPropertySourceSecurityManagerIT.java index b90dc9a8725f..fd9154b3cec0 100644 --- a/log4j-api-test/src/test/java/org/apache/logging/log4j/util/EnvironmentPropertySourceSecurityManagerIT.java +++ b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/EnvironmentPropertySourceSecurityManagerIT.java @@ -17,9 +17,9 @@ package org.apache.logging.log4j.util; import java.security.Permission; -import org.apache.logging.log4j.test.junit.SecurityManagerTestRule; -import org.junit.Rule; -import org.junit.Test; +import org.apache.logging.log4j.test.junit.SecurityManagerExtension; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.parallel.ResourceLock; /** @@ -37,8 +37,8 @@ @ResourceLock("java.lang.SecurityManager") public class EnvironmentPropertySourceSecurityManagerIT { - @Rule - public final SecurityManagerTestRule rule = new SecurityManagerTestRule(new TestSecurityManager()); + @RegisterExtension + public final SecurityManagerExtension ext = new SecurityManagerExtension(new TestSecurityManager()); /** * Always throws a SecurityException for any environment variables permission diff --git a/log4j-api-test/src/test/java/org/apache/logging/log4j/util/LoaderUtilSecurityManagerTest.java b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/LoaderUtilSecurityManagerTest.java index beb7cc345b62..d33dc8dbd9cc 100644 --- a/log4j-api-test/src/test/java/org/apache/logging/log4j/util/LoaderUtilSecurityManagerTest.java +++ b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/LoaderUtilSecurityManagerTest.java @@ -20,15 +20,15 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import java.security.Permission; -import org.apache.logging.log4j.test.junit.SecurityManagerTestRule; -import org.junit.Rule; -import org.junit.Test; +import org.apache.logging.log4j.test.junit.SecurityManagerExtension; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.parallel.ResourceLock; @ResourceLock("java.lang.SecurityManager") public class LoaderUtilSecurityManagerTest { - @Rule - public final SecurityManagerTestRule rule = new SecurityManagerTestRule(new TestSecurityManager()); + @RegisterExtension + public final SecurityManagerExtension ext = new SecurityManagerExtension(new TestSecurityManager()); private static class TestSecurityManager extends SecurityManager { @Override diff --git a/log4j-api-test/src/test/java/org/apache/logging/log4j/util/PropertyFilePropertySourceSecurityManagerIT.java b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/PropertyFilePropertySourceSecurityManagerIT.java index 7d40e110e69b..95972a33be8b 100644 --- a/log4j-api-test/src/test/java/org/apache/logging/log4j/util/PropertyFilePropertySourceSecurityManagerIT.java +++ b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/PropertyFilePropertySourceSecurityManagerIT.java @@ -16,18 +16,18 @@ */ package org.apache.logging.log4j.util; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.FilePermission; import java.nio.file.Files; import java.nio.file.Paths; import java.security.Permission; import java.util.PropertyPermission; -import org.apache.logging.log4j.test.junit.SecurityManagerTestRule; -import org.junit.BeforeClass; -import org.junit.Rule; -import org.junit.Test; +import org.apache.logging.log4j.test.junit.SecurityManagerExtension; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.parallel.ResourceLock; /** @@ -46,13 +46,13 @@ @ResourceLock("java.lang.SecurityManager") public class PropertyFilePropertySourceSecurityManagerIT { - @BeforeClass - public static void beforeClass() { - assertTrue(TEST_FIXTURE_PATH, Files.exists(Paths.get(TEST_FIXTURE_PATH))); + @BeforeAll + public static void beforeAll() { + assertTrue(Files.exists(Paths.get(TEST_FIXTURE_PATH)), TEST_FIXTURE_PATH); } - @Rule - public final SecurityManagerTestRule rule = new SecurityManagerTestRule(new TestSecurityManager()); + @RegisterExtension + public final SecurityManagerExtension ext = new SecurityManagerExtension(new TestSecurityManager()); private static final String TEST_FIXTURE_PATH = "src/test/resources/PropertiesUtilTest.properties"; diff --git a/log4j-api-test/src/test/java/org/apache/logging/log4j/util/StackLocatorTestIT.java b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/StackLocatorTestIT.java index b4d240d942c0..c04f94b9be4a 100644 --- a/log4j-api-test/src/test/java/org/apache/logging/log4j/util/StackLocatorTestIT.java +++ b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/StackLocatorTestIT.java @@ -18,10 +18,10 @@ import java.security.Permission; import java.util.Deque; -import org.apache.logging.log4j.test.junit.SecurityManagerTestRule; -import org.junit.Rule; -import org.junit.Test; +import org.apache.logging.log4j.test.junit.SecurityManagerExtension; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.parallel.ResourceLock; /** @@ -38,8 +38,8 @@ */ @ResourceLock("java.lang.SecurityManager") public class StackLocatorTestIT { - @Rule - public final SecurityManagerTestRule rule = new SecurityManagerTestRule(new TestSecurityManager()); + @RegisterExtension + public final SecurityManagerExtension ext = new SecurityManagerExtension(new TestSecurityManager()); /** * Always throws a SecurityException for any reques to create a new SecurityManager diff --git a/log4j-api-test/src/test/java/org/apache/logging/log4j/util/SystemPropertiesPropertySourceSecurityManagerIT.java b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/SystemPropertiesPropertySourceSecurityManagerIT.java index 715f6a44b602..8623ede2a568 100644 --- a/log4j-api-test/src/test/java/org/apache/logging/log4j/util/SystemPropertiesPropertySourceSecurityManagerIT.java +++ b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/SystemPropertiesPropertySourceSecurityManagerIT.java @@ -16,13 +16,13 @@ */ package org.apache.logging.log4j.util; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; import java.security.Permission; import java.util.PropertyPermission; -import org.apache.logging.log4j.test.junit.SecurityManagerTestRule; -import org.junit.Rule; -import org.junit.Test; +import org.apache.logging.log4j.test.junit.SecurityManagerExtension; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.parallel.ResourceLock; /** @@ -41,8 +41,8 @@ @ResourceLock("java.lang.SecurityManager") public class SystemPropertiesPropertySourceSecurityManagerIT { - @Rule - public final SecurityManagerTestRule rule = new SecurityManagerTestRule(new TestSecurityManager()); + @RegisterExtension + public final SecurityManagerExtension ext = new SecurityManagerExtension(new TestSecurityManager()); /** * Always throws a SecurityException for any environment variables permission