A new hygenic way for tests to clean up before or after execution.

This replaces PrefsTester and is more general purpose.

2 files changed, 8 insertions, 0 deletions

diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/PolicyTest.java b/security/src/test/java/org/apache/harmony/security/tests/java/security/PolicyTest.java
index cfa2af1..ce57328 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/PolicyTest.java
+++ b/security/src/test/java/org/apache/harmony/security/tests/java/security/PolicyTest.java
@@ -31,6 +31,7 @@ import junit.framework.TestCase;
 
 import org.apache.harmony.security.tests.support.SecurityChecker;
 import org.apache.harmony.security.tests.support.TestUtils;
+import tests.util.TestEnvironment;
 
 import java.io.File;
 import java.io.FilePermission;
@@ -60,6 +61,11 @@ public class PolicyTest extends TestCase {
         junit.textui.TestRunner.run(PolicyTest.class);
     }
 
+    @Override protected void tearDown() throws Exception {
+        TestEnvironment.reset();
+        super.tearDown();
+    }
+
     /**
      * @tests constructor Policy()
      */
diff --git a/security/src/test/java/tests/security/permissions/JavaLangSystemTest.java b/security/src/test/java/tests/security/permissions/JavaLangSystemTest.java
index d1bf7c2..b9217a1 100644
--- a/security/src/test/java/tests/security/permissions/JavaLangSystemTest.java
+++ b/security/src/test/java/tests/security/permissions/JavaLangSystemTest.java
@@ -22,6 +22,7 @@ import dalvik.annotation.TestTargetNew;
 import dalvik.annotation.TestTargetClass;
 
 import junit.framework.TestCase;
+import tests.util.TestEnvironment;
 
 import java.io.InputStream;
 import java.io.PrintStream;
@@ -46,6 +47,7 @@ public class JavaLangSystemTest extends TestCase {
 
     @Override
     protected void tearDown() throws Exception {
+        TestEnvironment.reset();
         System.setSecurityManager(old);
         super.tearDown();
     }