diff --git a/plugins/TestingList.java b/plugins/TestingList.java index cb62c6d..89165f3 100644 --- a/plugins/TestingList.java +++ b/plugins/TestingList.java @@ -81,7 +81,7 @@ public class TestingList extends Panel { String[] dsDeviceName = testingList.getTestInProgress(); //SwingUtils.showException(getComponent(), ex ); //SwingUtils.showMessage(getComponent(), "", ex.toString() + deviceName[0]); - if(dsDeviceName[0] != "" && testingList.isTestRunAllowed()){ + if(dsDeviceName[0] != ""){ iCurrentTestPos = testingList.showResult(dsDeviceName[0], fileName, ret.toString(), sStatus); //start next test if(iCurrentTestPos>=0 && testingList.isTestRunAllowed()) @@ -95,11 +95,11 @@ public class TestingList extends Panel { String sStatus = TestStatus.FAILURE.toString(); String[] dsDeviceName = testingList.getTestInProgress(); //SwingUtils.showException(getComponent(), ex ); - SwingUtils.showMessage(getComponent(), "onExecutedFile()", ex.toString() + dsDeviceName[0]); - if(dsDeviceName[0] != "" && testingList.isTestRunAllowed() ){ + SwingUtils.showMessage(getComponent(), "onExecutedFile()", ex.toString() + " " + dsDeviceName[0]); + if(dsDeviceName[0] != ""){ iCurrentTestPos = testingList.showResult(dsDeviceName[0], fileName, ret, sStatus); //start next test - if(iCurrentTestPos>=0 && testingList.isTestRunAllowed()) + if(iCurrentTestPos>=0 && testingList.isTestRunAllowed() ) { testingList.executeTest(iCurrentTestPos+1); } @@ -556,10 +556,10 @@ public class TestingList extends Panel { } if (bSelected) { //build the .py test file path - sDeviceName = jTable1.getValueAt(row, COL.DEVICENAME.ordinal()).toString(); - sTestName = jTable1.getValueAt(row, COL.TESTNAME.ordinal()).toString(); + 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 = TESTS_TESTS_DEFAULT_DIR + sTestCaseName + "\\" + sTestName + "\\" + sTestName + ".py"; + sTestPath = FilenameUtils.separatorsToSystem(TESTS_TESTS_DEFAULT_DIR + sTestCaseName + "/" + sTestName + "/" + sTestName + ".py"); File f = new File(sTestPath); if(!f.exists() || f.isDirectory()){ logger.log(Level.SEVERE, "Test file not found: " + sTestPath);