M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

рефакторинг. неудачные наименования классов, и остатки старых вариантов

Browse Source
This commit is contained in:
02090095
2023-10-08 01:06:55 +03:00
parent 49805f1293
commit eedddcd7d3
42 changed files with 295 additions and 1415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/TestingSystem/TestingServer.java
View File

@@ -15,11 +15,11 @@ import Repository.RepositoryRefuseException;
import Repository.RepositoryServer;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import SapforTestingSystem.Json.PackageModeScenario_json;
import SapforTestingSystem.Json.SapforTasksPackage_json;
import SapforTestingSystem.Json.SapforConfiguration_json;
import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
import SapforTestingSystem.SapforConfiguration.SapforConfigurationInterface;
import SapforTestingSystem.SapforScenario.SapforScenario;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import SapforTestingSystem.SapforServerScenario_info;
import SapforTestingSystem.ServerSapfor.ServerSapfor;
import SapforTestingSystem.ServerSapforTestingPlanner.ServerSapforTestingPlanner;
@@ -186,10 +186,10 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
((ServerSapfor) object).home_path
)
);
} else if (object instanceof SapforScenario) {
} else if (object instanceof SapforTasksPackage) {
Utils.forceDeleteWithCheck(
new File(
((SapforScenario) object).workspace
((SapforTasksPackage) object).workspace
)
);
}
@@ -224,7 +224,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
protected TestingPlanner testingPlanner = new TestingPlanner();
protected Thread testingThread = new Thread(() -> testingPlanner.Perform());
protected ServerSapforTestingPlanner sapforTestingPlanner = new ServerSapforTestingPlanner();
protected Thread sapforTestingThread = new Thread(()-> sapforTestingPlanner.Perform());
protected Thread sapforTestingThread = new Thread(() -> sapforTestingPlanner.Perform());
//------>>>
public static boolean checkTasks = false;
//--
@@ -317,16 +317,16 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
}
public void StartSapforTests(SapforServerScenario_info scenario_info) throws Exception {
//--
PackageModeScenario_json scenario_json = new PackageModeScenario_json();
SapforTasksPackage_json scenario_json = new SapforTasksPackage_json();
for (String test_id : scenario_info.testsIds)
scenario_json.tests.add(db.tests.get(test_id).description);
//создание объекта набора задач. для бд.
SapforScenario sapforScenario = new SapforScenario(); //?может быть все же поменять ключ на сгенерированный из даты.
db.Insert(sapforScenario);
SapforTasksPackage sapforTasksPackage = new SapforTasksPackage(); //?может быть все же поменять ключ на сгенерированный из даты.
db.Insert(sapforTasksPackage);
//создание рабочего пространства для пакетного режима
File scenarioWorkspace = new File(Global.ScenariosDirectory, String.valueOf(sapforScenario.id));
File scenarioWorkspace = new File(Global.ScenariosDirectory, String.valueOf(sapforTasksPackage.id));
Utils.CheckAndCleanDirectory(scenarioWorkspace);
sapforScenario.workspace = scenarioWorkspace.getAbsolutePath();
sapforTasksPackage.workspace = scenarioWorkspace.getAbsolutePath();
//копирование тестов по конфигурациям.
for (String configuration_id : scenario_info.configurationsIds) {
SapforConfiguration configuration = db.sapforConfigurations.get(configuration_id);
@@ -345,11 +345,11 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
File test_root = new File(configurationWorkspace, test.description);
Utils.CheckAndCleanDirectory(test_root);
FileUtils.copyDirectory(new File(Global.TestsDirectory, test.id), test_root);
sapforScenario.tasksCount++;
sapforTasksPackage.tasksCount++;
}
}
//копирование SAPFOR
File sapforFile = new File(sapforScenario.workspace, Utils.getDateName("SAPFOR_F"));
File sapforFile = new File(sapforTasksPackage.workspace, Utils.getDateName("SAPFOR_F"));
ServerSapfor sapfor = db.serverSapfors.get(scenario_info.sapforId);
FileUtils.copyFile(new File(sapfor.call_command), sapforFile);
if (!sapforFile.setExecutable(true))
@@ -357,25 +357,25 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
scenario_json.sapfor_drv = sapforFile.getName();
//--->>
//копирование визуализатора
File visualiser = new File(sapforScenario.workspace, "VisualSapfor.jar");
File visualiser = new File(sapforTasksPackage.workspace, "VisualSapfor.jar");
FileUtils.copyFile(new File(Global.Home, "TestingSystem.jar"), visualiser);
//создание настроек
GlobalProperties properties = new GlobalProperties();
properties.Mode = Current.Mode.Scenario;
properties.threadsNum = Global.properties.threadsNum; //брать из настроек сервера же.
properties.threadsTimeout = Global.properties.threadsTimeout;
Utils.jsonToFile(properties, new File(sapforScenario.workspace, "properties"));
Utils.jsonToFile(properties, new File(sapforTasksPackage.workspace, "properties"));
//создание инструкции
File scenario_file = new File(sapforScenario.workspace, "scenario");
File scenario_file = new File(sapforTasksPackage.workspace, "scenario");
Utils.jsonToFile(scenario_json, scenario_file);
//подготовка пакетного режима. Запустит его уже очередь.
Utils.startScript_(scenarioWorkspace, scenarioWorkspace, "start", "java -jar VisualSapfor.jar");
Utils.createScript(scenarioWorkspace, scenarioWorkspace, "start", "java -jar VisualSapfor.jar");
//--
sapforScenario.sapfor_version = sapfor.version;
sapforScenario.sapfor_build_date = sapfor.buildDate;
sapforScenario.testsNames = String.join(";", scenario_json.tests);
sapforScenario.StartDate = new Date().getTime();
db.Update(sapforScenario);
sapforTasksPackage.sapfor_version = sapfor.version;
sapforTasksPackage.sapfor_build_date = sapfor.buildDate;
sapforTasksPackage.testsNames = String.join(";", scenario_json.tests);
sapforTasksPackage.StartDate = new Date().getTime();
db.Update(sapforTasksPackage);
}
@Override
protected void Session() throws Exception {
@@ -535,6 +535,12 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
response = new ServerExchangeUnit_2021(ServerCode.OK);
response.object = Utils.packFile(account_db.getFile());
break;
//-- Тестирование SAPFOR
case GetFirstActiveSapforTasksPackage:
Print("Получить первый активный сценарий задач SAPFOR");
response = new ServerExchangeUnit_2021(ServerCode.OK);
response.object = db.getFirstActiveSapforScenario();
break;
default:
throw new RepositoryRefuseException("Неподдерживаемый код: " + code);
}

37
src/TestingSystem/TestsDatabase.java
View File

@@ -3,7 +3,7 @@ import Common.Database.SQLITE.SQLiteDatabase;
import GlobalData.Settings.SettingName;
import SapforTestingSystem.SapforConfiguration.SapforConfigurationDBTable;
import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
import SapforTestingSystem.SapforScenario.SapforScenariosDBTable;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackagesDBTable;
import SapforTestingSystem.ServerSapfor.ServerSapforsDBTable;
import TestingSystem.Configuration.UI.ConfigurationDBTable;
@@ -11,6 +11,7 @@ import TestingSystem.Group.GroupsDBTable;
import TestingSystem.MachineMaxKernels.MachineMaxKernelsDBTable;
import TestingSystem.TSetting.TSetting;
import TestingSystem.TSetting.TSettingsDBTable;
import TestingSystem.TasksPackage.TasksPackageState;
import TestingSystem.Test.TestDBTable;
import java.nio.file.Paths;
@@ -26,8 +27,8 @@ public class TestsDatabase extends SQLiteDatabase {
//----
public ServerSapforsDBTable serverSapfors;
//--
public SapforScenariosDBTable sapforScenarios;
public SapforTasksPackagesDBTable sapforTasksPackages;
// public SapforTasksPackagesDBTable sapforTasksPackages;
//--
public TestsDatabase() {
super(Paths.get(System.getProperty("user.dir"), "Data", TasksDatabase.tests_db_name + ".sqlite").toFile());
@@ -43,8 +44,8 @@ public class TestsDatabase extends SQLiteDatabase {
addTable(sapforConfigurations = new SapforConfigurationDBTable());
addTable(sapforConfigurationCommands = new SapforConfigurationCommandsDBTable());
addTable(serverSapfors = new ServerSapforsDBTable());
addTable(sapforScenarios = new SapforScenariosDBTable());
addTable(sapforTasksPackages = new SapforTasksPackagesDBTable());
// addTable(sapforTasksPackages = new SapforTasksPackagesDBTable());
}
@Override
public void Init() throws Exception {
@@ -67,4 +68,34 @@ public class TestsDatabase extends SQLiteDatabase {
Update(setting);
return res;
}
public SapforTasksPackage getFirstActiveSapforScenario() {
SapforTasksPackage first_active = null;
SapforTasksPackage first_queued = null;
if (!sapforTasksPackages.Data.isEmpty()) {
for (SapforTasksPackage s : sapforTasksPackages.Data.values()) {
switch (s.state) {
case Done:
case Aborted:
break;
case Queued:
if (first_queued == null) first_queued = s;
break;
default:
if (first_active == null) first_active = s; //это и будет первый активный.
break;
}
}
if (first_active != null) return first_active;
if (first_queued != null) {
first_queued.state = TasksPackageState.PackageStart;
try {
Update(first_queued);
} catch (Exception ex) {
ex.printStackTrace();
}
}
return first_queued;
}
return null;
}
}