diff --git a/plugins/TestingList.java b/plugins/TestingList.java index 94c777a..9abea2e 100644 --- a/plugins/TestingList.java +++ b/plugins/TestingList.java @@ -55,27 +55,27 @@ public class TestingList extends Panel { int iCurrentTestPos = 0; try { Object ret = eval("ret"); - boolean success = (boolean) eval("success"); + boolean status = (boolean) eval("status"); Object deviceName = eval("DEVICE"); - String sSuccess = (success == true) ? "Success" : "Failed"; + String sStatus = (status == true) ? "Success" : "Failed"; - if (ret != "" ) { +// if (ret != "" ) { //SwingUtils.showMessage(getComponent(), "", ret.toString() + " - " + ret.getClass().getName()); - iCurrentTestPos = testingList.showResult(deviceName.toString(), fileName, ret.toString(), sSuccess); + iCurrentTestPos = testingList.showResult(deviceName.toString(), fileName, ret.toString(), sStatus); //start next test if(iCurrentTestPos>0) { testingList.executeTest(iCurrentTestPos+1); } - } +/* } else{ ret = "Could not start test script"; - sSuccess = "Failed"; + sStatus = "Failed"; String[] dsDeviceName = testingList.getTestInProgress(); //SwingUtils.showException(getComponent(), ex ); //SwingUtils.showMessage(getComponent(), "", ex.toString() + deviceName[0]); if(dsDeviceName[0] != ""){ - iCurrentTestPos = testingList.showResult(dsDeviceName[0], fileName, ret.toString(), sSuccess); + iCurrentTestPos = testingList.showResult(dsDeviceName[0], fileName, ret.toString(), sStatus); //start next test if(iCurrentTestPos>=0) { @@ -83,14 +83,14 @@ public class TestingList extends Panel { } } } - } catch (Exception ex) { +*/ } catch (Exception ex) { String ret = "Could not start test script"; - String sSuccess = "Failed"; + String sStatus = "Failed"; String[] dsDeviceName = testingList.getTestInProgress(); //SwingUtils.showException(getComponent(), ex ); - //SwingUtils.showMessage(getComponent(), "", ex.toString() + deviceName[0]); + SwingUtils.showMessage(getComponent(), "", ex.toString() + dsDeviceName[0]); if(dsDeviceName[0] != ""){ - iCurrentTestPos = testingList.showResult(dsDeviceName[0], fileName, ret, sSuccess); + iCurrentTestPos = testingList.showResult(dsDeviceName[0], fileName, ret, sStatus); //start next test if(iCurrentTestPos>=0) { @@ -423,8 +423,8 @@ public class TestingList extends Panel { HashMap args = new HashMap(); //scan through the table starting from 'position' and execute the first selected test found int row = position; - if (row <= jTable1.getRowCount() ) { - for(row = position ; row <= jTable1.getRowCount() ; row++){ + if (row <= jTable1.getRowCount()-1 ) { + for(row = position ; row <= jTable1.getRowCount()-1 ; row++){ bSelected = (boolean) jTable1.getValueAt(row, COL_CHECK); if(bSelected) break; } @@ -436,7 +436,7 @@ public class TestingList extends Panel { try{ args.put("DEVICE", sDeviceName); args.put("ret", ""); - args.put("success", false); + args.put("status", false); run(sTestName, args); } catch (Exception ex) { SwingUtils.showMessage(this, "", ex.toString());