diff --git a/plugins/TestingList.java b/plugins/TestingList.java index 7a978b5..aeaa0af 100644 --- a/plugins/TestingList.java +++ b/plugins/TestingList.java @@ -77,9 +77,9 @@ public class TestingList extends Panel { Logger logger = Logger.getLogger("TestsLog"); //these paths are converted to unix or win path according to host OS - private String TESTS_DEVICES_DEFAULT_DIR = FilenameUtils.separatorsToSystem("/home/script/tests/production/"); - private String TESTS_TESTS_DEFAULT_DIR = FilenameUtils.separatorsToSystem("/home/script/tests/tests/"); - private String TESTS_LOG_DEFAULT_DIR = FilenameUtils.separatorsToSystem("/home/script/tests/log/TestsLog.txt"); + private String TESTS_DEVICES_DEFAULT_DIR = new java.io.File( "." ).getCanonicalPath()+ FilenameUtils.separatorsToSystem("/home/script/tests/production/"); + private String TESTS_TESTS_DEFAULT_DIR = new java.io.File( "." ).getCanonicalPath()+ FilenameUtils.separatorsToSystem("/home/script/tests/tests/"); + private String TESTS_LOG_DEFAULT_DIR = new java.io.File( "." ).getCanonicalPath()+ FilenameUtils.separatorsToSystem("/home/script/tests/log/TestsLog.txt"); //table1 columns indexes private int COL_CHECK = 0; private int COL_TIME = 1; @@ -91,7 +91,7 @@ public class TestingList extends Panel { try { FileHandler fh; // This block configure the logger with handler and formatter - fh = new FileHandler(new java.io.File( "." ).getCanonicalPath() + TESTS_LOG_DEFAULT_DIR); + fh = new FileHandler( TESTS_LOG_DEFAULT_DIR); logger.addHandler(fh); SimpleFormatter formatter = new SimpleFormatter(); fh.setFormatter(formatter); @@ -397,7 +397,7 @@ public class TestingList extends Panel { public void loadTests() throws FileNotFoundException, IOException{ Properties propDevice = new Properties(); Properties propTest = new Properties(); - String fileName = new java.io.File( "." ).getCanonicalPath()+ TESTS_DEVICES_DEFAULT_DIR; + String fileName = TESTS_DEVICES_DEFAULT_DIR; this.jTextField1.setText(fileName + "\n"); File folder = new File(fileName); File testsFolder = null; @@ -415,7 +415,7 @@ public class TestingList extends Panel { propDevice.load(is); //config of device was loaded. now load the config of each test belonging to the device - sTestName = new java.io.File( "." ).getCanonicalPath()+ TESTS_TESTS_DEFAULT_DIR + propDevice.getProperty("tests"); + sTestName = TESTS_TESTS_DEFAULT_DIR + propDevice.getProperty("tests"); this.jTextField1.append("\nTest suite: " + sTestName); testsFolder = new File(sTestName); if(testsFolder.exists() && testsFolder.isDirectory()){