Closedown

This commit is contained in:
boccioli_m
2017-10-23 13:35:04 +02:00
parent 8362c66e44
commit 4929a40a9c
2 changed files with 27 additions and 12 deletions

View File

@@ -2303,12 +2303,12 @@ public class TestingList extends Panel {
*/
private void addToTable(String deviceName,
String deviceDescription,
//String devicePath,
String devicePath,
String testSuite,
String testName,
String testParams,
String testDescription,
//String testPath,
String testPath,
String testHelp) {
String sDate = "";
if (testName.equals("") || deviceName.equals("")) {
@@ -2318,11 +2318,11 @@ public class TestingList extends Panel {
ImageIcon icon = null;// new ImageIcon(getClass().getResource("/icons/button_pause-16px.png"));
DefaultTableModel model = (DefaultTableModel) jTable1.getModel();
//String testPath = FilenameUtils.separatorsToSystem(TESTS_TESTS_DEFAULT_DIR + testSuite + "/" + testName + "/" + testName + ".py");
String testPath = Paths.get(TESTS_TESTS_DEFAULT_DIR.toString(), testSuite, testName, testName + ".py").toString();
String devicePath = Paths.get(TESTS_DEVICES_DEFAULT_DIR.toString(), deviceName, deviceName + ".config").toString();
String otestPath = Paths.get(TESTS_TESTS_DEFAULT_DIR.toString(), testSuite, testName, testName + ".py").toString();
String odevicePath = Paths.get(TESTS_DEVICES_DEFAULT_DIR.toString(), deviceName, deviceName + ".config").toString();
//System.out.println("Old Test Path = " + otestPath);
//System.out.println("Old Dev Path = " + odevicePath);
System.out.println("Old Test Path = " + otestPath);
System.out.println("Old Dev Path = " + odevicePath);
System.out.println("Test Path = " + testPath);
System.out.println("Dev Path = " + devicePath);
@@ -2416,12 +2416,12 @@ public class TestingList extends Panel {
ist.close();
addToTable(propDevice.getProperty("name"),
propDevice.getProperty("description"),
//deviceInList.getPath(),
deviceInList.getPath(),
propDevice.getProperty("tests"),
propTest.getProperty("name"),
"", //test parameters
"", //test description
//testinList.getPath(),
testinList.getPath(),
propTest.getProperty("help"));
iCounter++;
}