no message
This commit is contained in:
@@ -3,10 +3,12 @@ import Common.Global;
|
||||
import Common.Utils.InterruptThread;
|
||||
import Common.Utils.Utils;
|
||||
import SapforTestingSystem.Json.Scenario_json;
|
||||
import SapforTestingSystem.SapforTest.SapforTest;
|
||||
import org.apache.commons.io.FileUtils;
|
||||
|
||||
import java.io.File;
|
||||
import java.nio.charset.Charset;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Stack;
|
||||
import java.util.Vector;
|
||||
public class PackageModeSupervisor {
|
||||
@@ -24,6 +26,8 @@ public class PackageModeSupervisor {
|
||||
File sapfor_drv;
|
||||
File scenarioFile;
|
||||
//--->>
|
||||
LinkedHashMap<String, SapforTest> allTests = new LinkedHashMap<>();
|
||||
//--->>>
|
||||
Vector<String> activeTests = new Vector<>();
|
||||
Stack<String> waitingTests = new Stack<>();
|
||||
//--->>
|
||||
@@ -34,13 +38,12 @@ public class PackageModeSupervisor {
|
||||
String packed = FileUtils.readFileToString(scenarioFile, Charset.defaultCharset());
|
||||
scenario = Utils.gson.fromJson(packed, Scenario_json.class);
|
||||
//--->>
|
||||
/*
|
||||
for (String test : scenario.tests)
|
||||
for (String test : scenario.tests) {
|
||||
allTests.put(test, new SapforTest(Global.Home, test));
|
||||
waitingTests.push(test);
|
||||
|
||||
*/
|
||||
}
|
||||
}
|
||||
public boolean isFinished(String test){
|
||||
public boolean isFinished(String test) {
|
||||
return true;
|
||||
}
|
||||
//--->>
|
||||
@@ -55,23 +58,32 @@ public class PackageModeSupervisor {
|
||||
activeTests.remove(test);
|
||||
}
|
||||
*/
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
public boolean startWaitingTests() throws Exception {
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
public void finalize(){
|
||||
Global.Log.Print("END");
|
||||
}
|
||||
//--->>
|
||||
public void Do() {
|
||||
try {
|
||||
Global.Log.Print("START");
|
||||
interruptThread.start();
|
||||
//--->>
|
||||
init();
|
||||
//--->>
|
||||
while (checkActiveTests()&&startWaitingTests()){
|
||||
while (checkActiveTests() && startWaitingTests()) {
|
||||
Thread.sleep(1000);
|
||||
}
|
||||
finalize();
|
||||
//--->>
|
||||
} catch (Exception ex) {
|
||||
ex.printStackTrace();
|
||||
}
|
||||
finally {
|
||||
System.exit(0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user