Closedown

This commit is contained in:
boccioli_m
2018-03-20 10:12:39 +01:00
parent 304cca55ea
commit dbc312e33a

View File

@@ -2416,7 +2416,7 @@ public class TestingList extends Panel {
propDevice.clear();
if (deviceInList.isFile()) {
} else if (deviceInList.isDirectory()) {
System.out.println("deviceInList:" + deviceInList.getPath());
System.out.println("deviceInList:" + deviceInList.getPath()+ FilenameUtils.separatorsToSystem("/" + TESTS_CONFIG_FILENAME));
File configFile = new File(deviceInList.getPath() + FilenameUtils.separatorsToSystem("/" + TESTS_CONFIG_FILENAME));
if (configFile.exists() && !configFile.isDirectory()) {
System.out.println("deviceInList found");
@@ -2425,13 +2425,17 @@ public class TestingList extends Panel {
is.close();
//config of device was loaded. now load the config of each test belonging to the device
testsFolder = Paths.get(TESTS_TESTS_DEFAULT_DIR.toString(), propDevice.getProperty("tests")).toFile();
System.out.println(" testsFolder:" + testsFolder);
if (testsFolder.exists() && testsFolder.isDirectory()) {
System.out.println(" testsFolder found");
File[] listOfTests = testsFolder.listFiles();
for (File testinList : listOfTests) {
propTest.clear();
if (testinList.isDirectory()) {
configFile = new File(testinList.getPath() + FilenameUtils.separatorsToSystem("/" + TESTS_CONFIG_FILENAME));
System.out.println(" configFile:" + testinList.getPath() + FilenameUtils.separatorsToSystem("/" + TESTS_CONFIG_FILENAME));
if (configFile.exists() && !configFile.isDirectory()) {
System.out.println(" configFile exists");
InputStream ist = new FileInputStream(configFile);
propTest.load(ist);
ist.close();