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

[<hu...@us...>]

Revision: 476
          http://cishell.svn.sourceforge.net/cishell/?rev=476&view=rev
Author:   huangb
Date:     2007-08-16 13:14:27 -0700 (Thu, 16 Aug 2007)

Log Message:
-----------
This is a quick fix. The previous implementation tries to find 
test_files directory under default Eclipse workspace directory. 
We change it to point to converter_test_files subfolder under 
nwb installation directory.

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 20:09:25 UTC (rev 475)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/TestFileKeeper.java	2007-08-16 20:14:27 UTC (rev 476)
@@ -19,10 +19,25 @@
 	static {
 		String fs = File.separator;
 		
-		 DEFAULT_ROOT_DIR = "workspace" + fs + "org.cishell."
+//Replaced by Bonnie		
+/*		 DEFAULT_ROOT_DIR = "My Documents"+fs+"workspace" + fs + "org.cishell."
 				+ "testing.convertertester.core.new" + fs + "src" + fs + 
 				"org" + fs + "cishell" + fs + "testing" + fs +
 				"convertertester" + fs + "core" + fs + "test_files" + fs;
+*/
+		File currentDir = null;
+        currentDir = new File(System.getProperty("user.dir") + File.separator + "converter_test_files");
+            
+            if (currentDir.exists()) {  
+             	DEFAULT_ROOT_DIR = currentDir.getPath()+fs;            	
+            }
+            else{
+            	System.err.println(">>>Error, didn't find test_files directory.");
+            	DEFAULT_ROOT_DIR = null;
+            }
+            	
+        
+
 	}
 	
 	public static final String DEFAULT_ROOT_DIR;
@@ -51,9 +66,11 @@
 
 		try {
 			//open config file that maps formats to test file directories
-
-			String filePath = System.getProperty("user.home") + File.separator + rootDir
-					+ CONF_FILE_NAME;
+			
+// Replaced by Bonnie
+//			String filePath = System.getProperty("user.home") + File.separator + rootDir
+//					+ CONF_FILE_NAME;
+			String filePath = rootDir + CONF_FILE_NAME;
 			reader = new BufferedReader(new FileReader(filePath));
 
 			//map formats to test files found in specified directories
@@ -71,9 +88,12 @@
 					String fileFormat = splitLine[0];
 					String dir = splitLine[1];
 
-					String testFileDirPath = System.getProperty("user.home")
-							+ "/" + rootDir + dir;
-
+//	Replaced by Bonnie
+//					String testFileDirPath = System.getProperty("user.home")
+//							+ "/" + rootDir + dir;
+					
+					String testFileDirPath =rootDir + dir;
+					
 					//use directory name to get names of test files inside it.
 					String[] testFileNames = 
 						getVisibleFileNames(testFileDirPath);


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