diff --git a/plugins/TestingList.java b/plugins/TestingList.java index b1e1551..6d441f3 100644 --- a/plugins/TestingList.java +++ b/plugins/TestingList.java @@ -67,10 +67,8 @@ public class TestingList extends Panel { if (ret != "" ) { - File fTest = new File(fileName); - String sTestName = fTest.getName(); //SwingUtils.showMessage(getComponent(), "", ret.toString() + " - " + ret.getClass().getName()); - iCurrentTestPos = testingList.showResult(deviceName.toString(), sTestName, ret.toString(), sStatus); + iCurrentTestPos = testingList.showResult(deviceName.toString(), fileName, ret.toString(), sStatus); //start next test if(iCurrentTestPos>=0 && testingList.isTestRunAllowed()) { @@ -559,7 +557,7 @@ public class TestingList extends Panel { sDeviceName = jTable1.getValueAt(row, COL.DEVICENAME.ordinal()).toString(); sTestName = jTable1.getValueAt(row, COL.TESTNAME.ordinal()).toString(); sTestCaseName = jTable1.getValueAt(row, COL.TESTSUITE.ordinal()).toString(); - sTestPath = FilenameUtils.separatorsToSystem(TESTS_TESTS_DEFAULT_DIR + sTestCaseName + "/" + sTestName + "/" + sTestName + ".py"); + sTestPath = jTable1.getValueAt(row, COL.TESTPATH.ordinal()).toString();; File f = new File(sTestPath); if(!f.exists() || f.isDirectory()){ logger.log(Level.SEVERE, "Test file not found: " + sTestPath); @@ -596,6 +594,8 @@ public class TestingList extends Panel { jTable1.getColumnModel().getColumn(COL.CHECK.ordinal()).setMaxWidth(27); jTable1.getColumnModel().getColumn(COL.DEVICENAME.ordinal()).setPreferredWidth(30); jTable1.getColumnModel().getColumn(COL.STATUS.ordinal()).setPreferredWidth(30); + //jTable1.getColumnModel().getColumn(COL.TESTPATH.ordinal()).setMinWidth(0); + //jTable1.getColumnModel().getColumn(COL.TESTPATH.ordinal()).setMaxWidth(0); jTable1.setAutoCreateRowSorter(true); updateStatus(); } @@ -608,7 +608,8 @@ public class TestingList extends Panel { } ImageIcon icon = null;// new ImageIcon(getClass().getResource("/icons/button_pause-16px.png")); DefaultTableModel model = (DefaultTableModel) jTable1.getModel(); - model.addRow(new Object[]{false, sDate, deviceName, deviceDescription, testSuite, testName, "", "Pending", icon}); + String testPath = FilenameUtils.separatorsToSystem(TESTS_TESTS_DEFAULT_DIR + testSuite + "/" + testName + "/" + testName + ".py"); + model.addRow(new Object[]{false, sDate, deviceName, deviceDescription, testSuite, testName, testPath, "", "Pending", icon}); jTable1.setModel(model); updateStatus(); }