This commit is contained in:
boccioli_m
2017-10-23 09:10:11 +02:00
parent 9e9bc01d40
commit f75ad220c6
2 changed files with 5 additions and 4 deletions

View File

@@ -2301,10 +2301,12 @@ public class TestingList extends Panel {
*/
private void addToTable(String deviceName,
String deviceDescription,
String devicePath,
String testSuite,
String testName,
String testParams,
String testDescription,
String testPath,
String testHelp) {
String sDate = "";
if (testName.equals("") || deviceName.equals("")) {
@@ -2313,9 +2315,6 @@ public class TestingList extends Panel {
try {
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();
//System.out.println("Path = " + testPath);
Object rowData[] = new Object[]{false, "", sDate, deviceName, devicePath, deviceDescription, testSuite, testName, testPath, testParams, testDescription, testHelp, "", "Pending", icon};
//vedify that this test is not already in the table
@@ -2407,10 +2406,12 @@ public class TestingList extends Panel {
ist.close();
addToTable(propDevice.getProperty("name"),
propDevice.getProperty("description"),
deviceInList.getPath(),
propDevice.getProperty("tests"),
propTest.getProperty("name"),
"", //test parameters
"", //test description
testinList.getPath(),
propTest.getProperty("help"));
iCounter++;
}