[CIShell-SVN] SF.net SVN: cishell: [479] trunk/testing/org.cishell.testing. convertertester.core.new/src/org/cishell/testing/convertertester/core/ tester2/TestFileKeeper.java

[<mwl...@us...>]

Revision: 479
          http://cishell.svn.sourceforge.net/cishell/?rev=479&view=rev
Author:   mwlinnem
Date:     2007-08-16 15:10:02 -0700 (Thu, 16 Aug 2007)

Log Message:
-----------
Test files are now expected to be in nwb/converter_test_files/. Solves problem of the file path previously being platform-dependent.

Modified Paths:
--------------
    trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/TestFileKeeper.java

Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/TestFileKeeper.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/TestFileKeeper.java	2007-08-16 21:06:26 UTC (rev 478)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/TestFileKeeper.java	2007-08-16 22:10:02 UTC (rev 479)
@@ -25,23 +25,9 @@
 				"org" + fs + "cishell" + fs + "testing" + fs +
 				"convertertester" + fs + "core" + fs + "test_files" + fs;
 */
-		File currentDir = null;
-        currentDir = new File(System.getProperty("user.dir") + fs + "converter_test_files");
-            
-        if (!currentDir.exists()) {
-                currentDir = new File(System.getProperty("user.home") + fs + "anything");
-        } else {
-                currentDir = new File(System.getProperty("user.dir") + fs + "converter_test_files" + File.separator + "anything");
-        }
-                      
-        if (currentDir.exists()) {  
-           	DEFAULT_ROOT_DIR = currentDir.getPath()+fs;            	
-        }
-        else{
-          	System.err.println(">>>Error, didn't find test_files directory.");
-           	DEFAULT_ROOT_DIR = null;
-        }        
+        System.out.println("osgi.install.area:"+System.getProperty("osgi.install.area"));
 
+        DEFAULT_ROOT_DIR = System.getProperty("osgi.install.area").replace("file:","") + fs + "converter_test_files" + fs;
 	}
 	
 	public static final String DEFAULT_ROOT_DIR;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.