commit d90182733f9b579fe7abe4f4ead693e4b0275af1
author Felix Meschberger <fmeschbe@apache.org> Wed Jul 04 07:13:41 2007 +0000
committer Felix Meschberger <fmeschbe@apache.org> Wed Jul 04 07:13:41 2007 +0000
tree d5713a871884bacd1e7d5241e3fbd2a652b11cdf
parent a2cfb09350d9362e728e472e770ad9ade291ee62

Ensure the test directories are created in the target folder

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@553105 13f79535-47bb-0310-9956-ffa450edef68

configadmin/src/test/java/org/apache/felix/cm/file/FilePersistenceManagerConstructorTest.java

diff --git a/configadmin/src/test/java/org/apache/felix/cm/file/FilePersistenceManagerConstructorTest.java b/configadmin/src/test/java/org/apache/felix/cm/file/FilePersistenceManagerConstructorTest.java
index 3fb4cf5..eff2bd6 100644
--- a/configadmin/src/test/java/org/apache/felix/cm/file/FilePersistenceManagerConstructorTest.java
+++ b/configadmin/src/test/java/org/apache/felix/cm/file/FilePersistenceManagerConstructorTest.java
@@ -39,6 +39,35 @@
 public class FilePersistenceManagerConstructorTest extends TestCase
 {
 
+    /** The current working directory for the tests */
+    private static final String TEST_WORKING_DIRECTORY = "target";
+    
+    /** The Bundle Data Area directory for testing */
+    private static final String BUNDLE_DATA = "bundleData";
+    
+    /** The Configuration location path for testing */
+    private static final String LOCATION_TEST = "test";
+
+    /** the previous working directory to return to on tearDown */
+    private String oldWorkingDirectory;
+    
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        
+        String testDir = new File(TEST_WORKING_DIRECTORY).getAbsolutePath();
+        
+        oldWorkingDirectory = System.getProperty( "user.dir" );
+        System.setProperty( "user.dir", testDir );
+    }
+    
+    protected void tearDown() throws Exception
+    {
+        System.setProperty( "user.dir", oldWorkingDirectory );
+
+        super.tearDown();
+    }
+    
     /**
      * Test method for {@link org.apache.felix.cm.file.FilePersistenceManager#FilePersistenceManager(java.lang.String)}.
      */
@@ -54,12 +83,12 @@
         assertFpm(fpm, new File(FilePersistenceManager.DEFAULT_CONFIG_DIR) );
         
         // with a relative path
-        relPath = "test";
+        relPath = LOCATION_TEST;
         fpm = new FilePersistenceManager(relPath);
         assertFpm(fpm, new File(relPath) );
         
         // with an absolute path
-        absPath = new File("test").getAbsolutePath();
+        absPath = new File(LOCATION_TEST).getAbsolutePath();
         fpm = new FilePersistenceManager(absPath);
         assertFpm(fpm, new File(absPath) );
     }
@@ -84,12 +113,12 @@
         assertFpm(fpm, new File(FilePersistenceManager.DEFAULT_CONFIG_DIR) );
         
         // with a relative path
-        relPath = "test";
+        relPath = LOCATION_TEST;
         fpm = new FilePersistenceManager(relPath);
         assertFpm(fpm, new File(relPath) );
         
         // with an absolute path
-        absPath = new File("test").getAbsolutePath();
+        absPath = new File(LOCATION_TEST).getAbsolutePath();
         fpm = new FilePersistenceManager(absPath);
         assertFpm(fpm, new File(absPath) );
         
@@ -102,18 +131,18 @@
         assertFpm(fpm, new File(FilePersistenceManager.DEFAULT_CONFIG_DIR) );
         
         // with a relative path
-        relPath = "test";
+        relPath = LOCATION_TEST;
         fpm = new FilePersistenceManager(bundleContext, relPath);
         assertFpm(fpm, new File(relPath) );
         
         // with an absolute path
-        absPath = new File("test").getAbsolutePath();
+        absPath = new File(LOCATION_TEST).getAbsolutePath();
         fpm = new FilePersistenceManager(bundleContext, absPath);
         assertFpm(fpm, new File(absPath) );
 
         
         // third suite: BundleContext with relative data file
-        dataArea = new File("bundleData");
+        dataArea = new File(BUNDLE_DATA);
         bundleContext = new FilePersistenceManagerBundleContext(dataArea);
         
         // with null
@@ -121,17 +150,17 @@
         assertFpm(fpm, new File(dataArea, FilePersistenceManager.DEFAULT_CONFIG_DIR) );
         
         // with a relative path
-        relPath = "test";
+        relPath = LOCATION_TEST;
         fpm = new FilePersistenceManager(bundleContext, relPath);
         assertFpm(fpm, new File(dataArea, relPath) );
         
         // with an absolute path
-        absPath = new File("test").getAbsolutePath();
+        absPath = new File(LOCATION_TEST).getAbsolutePath();
         fpm = new FilePersistenceManager(bundleContext, absPath);
         assertFpm(fpm, new File(absPath) );
 
         // fourth suite: BundleContext with absolute data file
-        dataArea = new File("bundleData").getAbsoluteFile();
+        dataArea = new File(BUNDLE_DATA).getAbsoluteFile();
         bundleContext = new FilePersistenceManagerBundleContext(dataArea);
         
         // with null
@@ -139,12 +168,12 @@
         assertFpm(fpm, new File(dataArea, FilePersistenceManager.DEFAULT_CONFIG_DIR) );
         
         // with a relative path
-        relPath = "test";
+        relPath = LOCATION_TEST;
         fpm = new FilePersistenceManager(bundleContext, relPath);
         assertFpm(fpm, new File(dataArea, relPath) );
         
         // with an absolute path
-        absPath = new File("test").getAbsolutePath();
+        absPath = new File(LOCATION_TEST).getAbsolutePath();
         fpm = new FilePersistenceManager(bundleContext, absPath);
         assertFpm(fpm, new File(absPath) );
     }