Move tear down test code to beginning of Environment

newrelic · Oct 29, 2024 · a0e9161 · a0e9161
1 parent 79bd9fe
commit a0e9161
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/newrelic-agent/src/test/java/com/newrelic/agent/environment/EnvironmentTest.java b/newrelic-agent/src/test/java/com/newrelic/agent/environment/EnvironmentTest.java
@@ -22,6 +22,13 @@
 
 public class EnvironmentTest {
 
+    @After
+    public void clearObfuscateJvmPropsSettings() {
+        System.clearProperty("newrelic.config.obfuscate_jvm_props.enabled");
+        System.clearProperty("newrelic.config.obfuscate_jvm_props.allow");
+        System.clearProperty("newrelic.config.obfuscate_jvm_props.block");
+    }
+
     @Test
     public void overrideServerPort() throws Exception {
         System.setProperty("newrelic.config.appserver_port", "666");
@@ -249,11 +256,4 @@ private List<String> getObfuscatedProps(List<String> props) {
         Environment env = new Environment(config, "c:\\test\\log");
         return env.obfuscateProps(props, config.getObfuscateJvmPropsConfig());
     }
-
-    @After
-    public void clearObfuscateJvmPropsSettings() {
-        System.clearProperty("newrelic.config.obfuscate_jvm_props.enabled");
-        System.clearProperty("newrelic.config.obfuscate_jvm_props.allow");
-        System.clearProperty("newrelic.config.obfuscate_jvm_props.block");
-    }
 }