Closedown

This commit is contained in:
boccioli_m
2015-09-04 15:23:01 +02:00
parent d7492922c7
commit 0bfa608385
4 changed files with 131 additions and 110 deletions

View File

@@ -1151,7 +1151,7 @@ public class TestingList extends Panel {
String sTestName = testPath;
//getController().getDataManager().appendLog(str(log));
System.out.println("Looking for: deviceName: " + deviceName + "; testPath: " + testPath + " in table.");
//System.out.println("Looking for: deviceName: " + deviceName + "; testPath: " + testPath + " in table.");
String sStatus;
if (status == "true") {
@@ -1281,6 +1281,11 @@ public class TestingList extends Panel {
}
}
/**
* Stop all the tests in progress and return to idle state (no further tests are launched)
*
* @param resultMessage the message that will be shown as Result of each stopped test
*/
public void stopAll(String resultMessage){
setToStopped();
String testInProgress[] = getTestInProgress();
@@ -1398,6 +1403,7 @@ public class TestingList extends Panel {
//collect tests to be launched in parallel
//the test must be: selected, set as start with previous, pending.
//alternatively, the test must be: selected, first of the list.
//if the user pressed Stop, exit from run:
if(!isTestRunAllowed())
return;
//System.out.println(String.valueOf(row) + "\t" + String.valueOf(bSelected) + "\t" + String.valueOf(selectedTestsRows.length) + "\t" + sStartSequence + "\t" + sStatus);
@@ -1517,6 +1523,7 @@ public class TestingList extends Panel {
showResult(sDeviceName, sTestPath, "Cannot find test script: " + sTestPath, TestStatus.FAILURE.toString());
continue;
}
//if the user pressed Stop, exit from run:
if(!isTestRunAllowed())
return iRet;
showResult(sDeviceName, sTestPath, "Test running", TestStatus.RUNNING.toString());
@@ -1565,10 +1572,10 @@ public class TestingList extends Panel {
sParallelizeCommand = sParallelizeCommand + ")))"; //very last part of command "parallelize"
}
}
System.out.println(sParallelizeCommand);
//System.out.println(sParallelizeCommand);
Object ret;
ret = eval(sParallelizeCommand);
System.out.println(ret);
//System.out.println(ret);
String sTestResult, sTestStatus;
if(ret == null){
SwingUtils.showMessage(TestingList.this, "executeParallelTestsGroup()", "The test script(s) did not return any feedback.");