Closedown
This commit is contained in:
@@ -73,22 +73,7 @@ public class TestingList extends Panel {
|
||||
};
|
||||
|
||||
public TestingList() throws Exception {
|
||||
initComponents();
|
||||
initLogger();
|
||||
buildTable();
|
||||
try {
|
||||
loadTests();
|
||||
//if not administrator, then show only enabled tests
|
||||
boolean bShow = Controller.getInstance().getLevel()==AccessLevel.administrator;
|
||||
showSelectedTestsOnly(bShow);
|
||||
jCheckBoxMenuShowSelectedTests1.setState(bShow);
|
||||
if(bShow){
|
||||
//if tests are not shown, then show the load tests dialog
|
||||
loadSettings();
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
getLogger().severe(ex.getMessage());
|
||||
}
|
||||
initialise();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -302,6 +287,27 @@ public class TestingList extends Panel {
|
||||
public static String TESTS_CONFIG_FILENAME = ".config";
|
||||
public static String TESTS_HELP_FILENAME = "help.html";
|
||||
|
||||
/**
|
||||
* initialise panel
|
||||
*/
|
||||
private void initialise(){
|
||||
initComponents();
|
||||
initLogger();
|
||||
buildTable();
|
||||
try {
|
||||
loadTests();
|
||||
//if not administrator, then show only enabled tests
|
||||
boolean bShow = Controller.getInstance().getLevel()==AccessLevel.administrator;
|
||||
showSelectedTestsOnly(bShow);
|
||||
jCheckBoxMenuShowSelectedTests1.setState(bShow);
|
||||
if(bShow){
|
||||
//if tests are not shown, then show the load tests dialog
|
||||
loadSettings();
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
getLogger().severe(ex.getMessage());
|
||||
}
|
||||
}
|
||||
/**
|
||||
* write info into a log file
|
||||
* @param text the info to be logged
|
||||
@@ -1425,6 +1431,8 @@ public class TestingList extends Panel {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(!isTestRunAllowed())
|
||||
return;
|
||||
if (selectedTestsRows.length > 0) { //at least one test is selected: launch it (or them)
|
||||
System.out.println("\n===================================================\n");
|
||||
executeParallelTestsGroup(selectedTestsRows); //last execution did not find a test file. Continue with next execution
|
||||
@@ -1516,7 +1524,7 @@ public class TestingList extends Panel {
|
||||
RunTest runTest;
|
||||
String sTestName = "", sDeviceName = "", sTestPath = "";
|
||||
for (int row : rowsToExecute) {
|
||||
//System.out.println(String.valueOf(row) + "\t" + sDeviceName + "\t" + sTestName + "\t" + sTestCaseName + "\t" + String.valueOf(rowsToExecute.length));
|
||||
//System.out.println(String.valueOf(row) + "\t" + sDeviceName + "\t" + sTestName + "\t" + sTestCaseName + "\t" + String.valueOf(rowsToExecute.length));
|
||||
try {
|
||||
testArgs = buildMapFromTableRow(row);
|
||||
sTestName = (String) testArgs.get(testArgNames.TEST.toString());
|
||||
@@ -1579,6 +1587,8 @@ public class TestingList extends Panel {
|
||||
}
|
||||
}
|
||||
//System.out.println(sParallelizeCommand);
|
||||
if(!isTestRunAllowed())
|
||||
return iRet;
|
||||
Object ret = eval(sParallelizeCommand);
|
||||
//System.out.println(ret);
|
||||
String sTestResult, sTestStatus;
|
||||
|
||||
Reference in New Issue
Block a user