no message

This commit is contained in:
2023-10-01 23:22:07 +03:00
parent b6bd529fb1
commit bf25aae4d9
8 changed files with 40 additions and 22 deletions

View File

@@ -5,6 +5,10 @@ import com.google.gson.annotations.Expose;
import java.util.List;
import java.util.Vector;
public class SapforScenarioResults_json {
@Expose
public long StartDate = 0;
@Expose
public long EndDate = 0;
@Expose
public List<SapforTask> tasks = new Vector<>();
}

View File

@@ -2,7 +2,7 @@ package SapforTestingSystem.SapforScenario;
import Common.Current;
import Common.Database.*;
import Common.UI.DataSetControlForm;
import SapforTestingSystem.SapforTask.SapforTask;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import java.util.Date;
import java.util.LinkedHashMap;
@@ -79,7 +79,7 @@ public class SapforScenariosDBTable extends iDBTable<SapforScenario> {
@Override
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
res.put(SapforTask.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
res.put(SapforTasksPackage.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
return res;
}
}

View File

@@ -2,20 +2,21 @@ package SapforTestingSystem.SapforTestingPlaner;
import Common.Global;
import Common.Utils.Utils;
import SapforTestingSystem.Json.SapforPackage_json;
import SapforTestingSystem.Json.SapforScenario_json;
import SapforTestingSystem.Json.SapforScenarioResults_json;
import SapforTestingSystem.Json.SapforScenario_json;
import SapforTestingSystem.PerformSapforTask;
import SapforTestingSystem.SapforTask.SapforTask;
import SapforTestingSystem.ThreadsPlanner.ThreadsPlanner;
import java.io.File;
import java.util.Date;
public class SapforTestingPlanner extends ThreadsPlanner {
SapforScenario_json scenario_json = null;
SapforScenarioResults_json results_json = new SapforScenarioResults_json();
public SapforTestingPlanner() throws Exception {
super(Global.properties.threadsTimeout, Global.properties.threadsNum);
scenario_json = (SapforScenario_json) Utils.jsonFromFile(new File(Global.Home, "scenario.txt"), SapforScenario_json.class);
results_json.StartDate = new Date().getTime();
//формирование списка задач.
File sapfor_drv = new File(Global.Home, scenario_json.sapfor_drv);
for (SapforPackage_json sapforPackage_json : scenario_json.packages) {
@@ -47,6 +48,7 @@ public class SapforTestingPlanner extends ThreadsPlanner {
}
@Override
protected void finalize() {
results_json.EndDate = new Date().getTime();
System.out.println("Запись результатов");
//записать результаты всех задач.
try {
@@ -56,7 +58,6 @@ public class SapforTestingPlanner extends ThreadsPlanner {
} catch (Exception e) {
Global.Log.PrintException(e);
}
System.exit(0);
}
}