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

This replaces PrefsTester and is more general purpose.

3 files changed, 23 insertions, 54 deletions

diff --git a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FileHandlerTest.java b/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FileHandlerTest.java
index 3ff1fc9..e4ef413 100644
--- a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FileHandlerTest.java
+++ b/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FileHandlerTest.java
@@ -50,6 +50,7 @@ import junit.framework.TestCase;
 
 import org.apache.harmony.logging.tests.java.util.logging.HandlerTest.NullOutputStream;
 import org.apache.harmony.logging.tests.java.util.logging.util.EnvironmentHelper;
+import tests.util.TestEnvironment;
 
 /**
  */
@@ -62,18 +63,11 @@ public class FileHandlerTest extends TestCase {
 
     final static String className = FileHandlerTest.class.getName();
 
-    final static StringWriter writer = new StringWriter();
-
-    final static SecurityManager securityManager = new MockLogSecurityManager();
-
     final static String SEP = File.separator;
 
-    private String oldHomePath = System.getProperty("user.home");
-    
-    // The HOMEPATH can't be used in android.
-    final static String HOMEPATH = System.getProperty("java.io.tmpdir") + SEP + "home";
+    String HOMEPATH;
 
-    final static String TEMPPATH = System.getProperty("java.io.tmpdir");
+    String TEMPPATH;
 
     private final PrintStream err = System.err;
 
@@ -88,6 +82,7 @@ public class FileHandlerTest extends TestCase {
      */
     protected void setUp() throws Exception {
         super.setUp();
+        TestEnvironment.reset();
         manager.reset();
         
         //initProp
@@ -106,19 +101,10 @@ public class FileHandlerTest extends TestCase {
         props.put("java.util.logging.FileHandler.append", "true");
         props.put("java.util.logging.FileHandler.pattern",
                         "%t/log/java%u.test");
-        
-        File home = new File(HOMEPATH);
-        if (!home.exists()) {
-            home.mkdirs();
-        } else if (!home.isDirectory()) {
-            home.delete();
-            home.mkdirs();
-        }
-        if(!home.isDirectory()) {
-            fail("unable to create temp path");
-        }
-        System.setProperty("user.home", HOMEPATH);
-        
+
+        HOMEPATH = System.getProperty("user.home");
+        TEMPPATH = System.getProperty("java.io.tmpdir");
+
         File file = new File(TEMPPATH + SEP + "log");
         file.mkdir();
         manager.readConfiguration(EnvironmentHelper
@@ -140,8 +126,7 @@ public class FileHandlerTest extends TestCase {
         }
         reset(TEMPPATH + SEP + "log", "");
         System.setErr(err);
-        System.setProperty("user.home", oldHomePath);
-        new File(HOMEPATH).delete();
+        TestEnvironment.reset();
         super.tearDown();
     }
 
@@ -634,8 +619,6 @@ public class FileHandlerTest extends TestCase {
         assertFileContent(TEMPPATH, "testLimitCount0.0",
                 new LogRecord[] { rs[9] }, handler.getFormatter());
 
-        String oldUserDir = System.getProperty("user.dir");
-        System.setProperty("user.dir", System.getProperty("java.io.tmpdir"));
         FileHandler h1 = null;
         FileHandler h2 = null;
         try {
@@ -656,7 +639,6 @@ public class FileHandlerTest extends TestCase {
             } catch (Exception e) {
             }
             reset("log", "");
-            System.setProperty("user.dir", oldUserDir);
         }
     }
     @TestTargets({
@@ -1000,14 +982,6 @@ public class FileHandlerTest extends TestCase {
             fail("should throw IllegalArgumentException");
         } catch (IllegalArgumentException e) {
         }
-        
-        // always parse special pattern
-        System.setProperty("user.home", "home");
-        try {
-            h1 = new FileHandler("%t/%h.txt");
-        } catch (Exception e) {
-            fail("Unexpected exception " + e.toString());
-        }
     }
 
     /*
diff --git a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java b/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java
index cf608bc..44389be 100644
--- a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java
+++ b/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java
@@ -45,6 +45,7 @@ import dalvik.annotation.TestLevel;
 import dalvik.annotation.TestTargetClass;
 import dalvik.annotation.TestTargetNew;
 import dalvik.annotation.TestTargets;
+import tests.util.TestEnvironment;
 
 /**
  * 
@@ -107,6 +108,7 @@ public class LogManagerTest extends TestCase {
      */
     @Override
     protected void tearDown() throws Exception {
+        TestEnvironment.reset();
         super.tearDown();
         handler = null;
     }
@@ -1194,24 +1196,17 @@ public class LogManagerTest extends TestCase {
         args = {}
     )
     public void testValidConfigClass() throws Exception {
-        String oldProperty = System.getProperty("java.util.logging.config.class");
-        try {
-            //            System.setProperty("java.util.logging.config.class", "org.apache.harmony.logging.tests.java.util.logging.LogManagerTest$ConfigClass");
-            System.setProperty("java.util.logging.config.class", this.getClass().getName()
-                    + "$ConfigClass");
-            assertNull(manager.getLogger("testConfigClass.foo"));
-
-            manager.readConfiguration();
-            assertNull(manager.getLogger("testConfigClass.foo"));
-            Logger l = Logger.getLogger("testConfigClass.foo.child");
-            assertSame(Level.FINEST, manager.getLogger("").getLevel());
-            assertEquals(0, manager.getLogger("").getHandlers().length);
-            assertEquals("testConfigClass.foo", l.getParent().getName());
-        } finally {
-            if (oldProperty != null) {
-                System.setProperty("java.util.logging.config.class", oldProperty);
-            }
-        }
+        //            System.setProperty("java.util.logging.config.class", "org.apache.harmony.logging.tests.java.util.logging.LogManagerTest$ConfigClass");
+        System.setProperty("java.util.logging.config.class", this.getClass().getName()
+                + "$ConfigClass");
+        assertNull(manager.getLogger("testConfigClass.foo"));
+
+        manager.readConfiguration();
+        assertNull(manager.getLogger("testConfigClass.foo"));
+        Logger l = Logger.getLogger("testConfigClass.foo.child");
+        assertSame(Level.FINEST, manager.getLogger("").getLevel());
+        assertEquals(0, manager.getLogger("").getHandlers().length);
+        assertEquals("testConfigClass.foo", l.getParent().getName());
     }
 
     /*
diff --git a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogRecordTest.java b/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogRecordTest.java
index 5b21099..6d4f784 100644
--- a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogRecordTest.java
+++ b/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogRecordTest.java
@@ -295,7 +295,7 @@ public class LogRecordTest extends TestCase {
         assertNull(lr.getSourceClassName());
 
         // find class and method who called logger
-        Logger logger = Logger.global;
+        Logger logger = Logger.getLogger("testGetSourceDefaultValue");
         MockHandler handler = new MockHandler();
         logger.addHandler(handler);
         logger.log(Level.SEVERE, MSG);