svn commit: r453407 - /geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/serverinfo/ServerInfoTest.java

[jd...@apache.org]

Author: jdillon
Date: Thu Oct  5 15:21:57 2006
New Revision: 453407

URL: http://svn.apache.org/viewvc?view=rev&rev=453407
Log:
Ensure that all tests start from a known state

Modified:
    geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/serverinfo/ServerInfoTest.java

Modified: geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/serverinfo/ServerInfoTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/serverinfo/ServerInfoTest.java?view=diff&rev=453407&r1=453406&r2=453407
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/serverinfo/ServerInfoTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/serverinfo/ServerInfoTest.java Thu Oct  5 15:21:57 2006
@@ -28,6 +28,11 @@
 public class ServerInfoTest extends TestCase {
     private static final File basedir = new File(System.getProperty("basedir", System.getProperty("user.dir")));
 
+    protected void setUp() throws Exception {
+        // Ensure we are in a known state before each test
+        System.getProperties().remove(BasicServerInfo.HOME_DIR_SYS_PROP);
+    }
+    
     public final void testResolvePath() {
         ServerInfo si = null;
 
@@ -85,7 +90,7 @@
 				fail(ioe.getMessage());
 			} catch (Exception expected) {
 			}
-
+            
 			String basedir = ".";
 			// a workaround - ServerInfo sets system-wide property
 			System.setProperty(BasicServerInfo.HOME_DIR_SYS_PROP, basedir);