no message
This commit is contained in:
@@ -15,12 +15,12 @@ import Repository.RepositoryRefuseException;
|
||||
import Repository.RepositoryServer;
|
||||
import Repository.Server.ServerCode;
|
||||
import Repository.Server.ServerExchangeUnit_2021;
|
||||
import SapforTestingSystem.Json.SapforTasksPackage_json;
|
||||
import SapforTestingSystem.Json.SapforConfiguration_json;
|
||||
import SapforTestingSystem.Json.SapforTasksPackage_json;
|
||||
import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
|
||||
import SapforTestingSystem.SapforConfiguration.SapforConfigurationInterface;
|
||||
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
|
||||
import SapforTestingSystem.SapforServerScenario_info;
|
||||
import SapforTestingSystem.SapforTasksPackage_info;
|
||||
import SapforTestingSystem.ServerSapfor.ServerSapfor;
|
||||
import SapforTestingSystem.ServerSapforTestingPlanner.ServerSapforTestingPlanner;
|
||||
import TestingSystem.Group.Group;
|
||||
@@ -315,32 +315,32 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
||||
groups.sort(Comparator.comparing(o -> o.description));
|
||||
return groups;
|
||||
}
|
||||
public void StartSapforTests(SapforServerScenario_info scenario_info) throws Exception {
|
||||
public void StartSapforTests(SapforTasksPackage_info sapforTasksPackage_info) throws Exception {
|
||||
//--
|
||||
SapforTasksPackage_json scenario_json = new SapforTasksPackage_json();
|
||||
for (String test_id : scenario_info.testsIds)
|
||||
scenario_json.tests.add(db.tests.get(test_id).description);
|
||||
SapforTasksPackage_json package_json = new SapforTasksPackage_json();
|
||||
for (String test_id : sapforTasksPackage_info.testsIds)
|
||||
package_json.tests.add(db.tests.get(test_id).description);
|
||||
//создание объекта набора задач. для бд.
|
||||
SapforTasksPackage sapforTasksPackage = new SapforTasksPackage(); //?может быть все же поменять ключ на сгенерированный из даты.
|
||||
db.Insert(sapforTasksPackage);
|
||||
// db.Insert(sapforTasksPackage);
|
||||
//создание рабочего пространства для пакетного режима
|
||||
File scenarioWorkspace = new File(Global.ScenariosDirectory, String.valueOf(sapforTasksPackage.id));
|
||||
Utils.CheckAndCleanDirectory(scenarioWorkspace);
|
||||
sapforTasksPackage.workspace = scenarioWorkspace.getAbsolutePath();
|
||||
File packageWorkspace = new File(Global.SapforPackagesDirectory, String.valueOf(sapforTasksPackage.id));
|
||||
Utils.CheckAndCleanDirectory(packageWorkspace);
|
||||
sapforTasksPackage.workspace = packageWorkspace.getAbsolutePath();
|
||||
//копирование тестов по конфигурациям.
|
||||
for (String configuration_id : scenario_info.configurationsIds) {
|
||||
for (String configuration_id : sapforTasksPackage_info.configurationsIds) {
|
||||
SapforConfiguration configuration = db.sapforConfigurations.get(configuration_id);
|
||||
//--
|
||||
SapforConfiguration_json package_json = new SapforConfiguration_json();
|
||||
package_json.id = String.valueOf(configuration_id);
|
||||
package_json.flags = SapforConfigurationInterface.getFlags(configuration);
|
||||
package_json.codes.addAll(SapforConfigurationInterface.getPassCodes(configuration));
|
||||
SapforConfiguration_json configuration_json = new SapforConfiguration_json();
|
||||
configuration_json.id = String.valueOf(configuration_id);
|
||||
configuration_json.flags = SapforConfigurationInterface.getFlags(configuration);
|
||||
configuration_json.codes.addAll(SapforConfigurationInterface.getPassCodes(configuration));
|
||||
//--->>
|
||||
scenario_json.packages.add(package_json);
|
||||
package_json.configurations.add(configuration_json);
|
||||
//-->>
|
||||
File configurationWorkspace = new File(scenarioWorkspace, configuration_id);
|
||||
File configurationWorkspace = new File(packageWorkspace, configuration_id);
|
||||
FileUtils.forceMkdir(configurationWorkspace);
|
||||
for (String test_id : scenario_info.testsIds) {
|
||||
for (String test_id : sapforTasksPackage_info.testsIds) {
|
||||
Test test = db.tests.get(test_id);
|
||||
File test_root = new File(configurationWorkspace, test.description);
|
||||
Utils.CheckAndCleanDirectory(test_root);
|
||||
@@ -350,11 +350,11 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
||||
}
|
||||
//копирование SAPFOR
|
||||
File sapforFile = new File(sapforTasksPackage.workspace, Utils.getDateName("SAPFOR_F"));
|
||||
ServerSapfor sapfor = db.serverSapfors.get(scenario_info.sapforId);
|
||||
ServerSapfor sapfor = db.serverSapfors.get(sapforTasksPackage_info.sapforId);
|
||||
FileUtils.copyFile(new File(sapfor.call_command), sapforFile);
|
||||
if (!sapforFile.setExecutable(true))
|
||||
throw new RepositoryRefuseException("Не удалось сделать файл " + sapforFile.getName() + " исполняемым!");
|
||||
scenario_json.sapfor_drv = sapforFile.getName();
|
||||
package_json.sapfor_drv = sapforFile.getName();
|
||||
//--->>
|
||||
//копирование визуализатора
|
||||
File visualiser = new File(sapforTasksPackage.workspace, "VisualSapfor.jar");
|
||||
@@ -366,26 +366,26 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
||||
properties.threadsTimeout = Global.properties.threadsTimeout;
|
||||
Utils.jsonToFile(properties, new File(sapforTasksPackage.workspace, "properties"));
|
||||
//создание инструкции
|
||||
File scenario_file = new File(sapforTasksPackage.workspace, "scenario");
|
||||
Utils.jsonToFile(scenario_json, scenario_file);
|
||||
File package_json_file = new File(sapforTasksPackage.workspace, "package_json");
|
||||
Utils.jsonToFile(package_json, package_json_file);
|
||||
//подготовка пакетного режима. Запустит его уже очередь.
|
||||
Utils.createScript(scenarioWorkspace, scenarioWorkspace, "start", "java -jar VisualSapfor.jar");
|
||||
Utils.createScript(packageWorkspace, packageWorkspace, "start", "java -jar VisualSapfor.jar");
|
||||
//--
|
||||
sapforTasksPackage.sapfor_version = sapfor.version;
|
||||
sapforTasksPackage.sapfor_build_date = sapfor.buildDate;
|
||||
sapforTasksPackage.testsNames = String.join(";", scenario_json.tests);
|
||||
sapforTasksPackage.testsNames = String.join(";", package_json.tests);
|
||||
sapforTasksPackage.StartDate = new Date().getTime();
|
||||
db.Update(sapforTasksPackage);
|
||||
// db.Update(sapforTasksPackage);
|
||||
}
|
||||
@Override
|
||||
protected void Session() throws Exception {
|
||||
DBObject dbObject = null;
|
||||
SapforServerScenario_info scenario = null;
|
||||
SapforTasksPackage_info scenario = null;
|
||||
Test test = null;
|
||||
switch (code) {
|
||||
case StartSapforTests:
|
||||
Print("Запуск тестирования SAPFOR");
|
||||
StartSapforTests((SapforServerScenario_info) request.object);
|
||||
StartSapforTests((SapforTasksPackage_info) request.object);
|
||||
response = new ServerExchangeUnit_2021(ServerCode.OK);
|
||||
break;
|
||||
case SynchronizeTests:
|
||||
|
||||
@@ -4,14 +4,12 @@ import GlobalData.Settings.SettingName;
|
||||
import SapforTestingSystem.SapforConfiguration.SapforConfigurationDBTable;
|
||||
import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
|
||||
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
|
||||
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackagesDBTable;
|
||||
import SapforTestingSystem.ServerSapfor.ServerSapforsDBTable;
|
||||
import TestingSystem.Configuration.UI.ConfigurationDBTable;
|
||||
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;
|
||||
@@ -27,7 +25,7 @@ public class TestsDatabase extends SQLiteDatabase {
|
||||
//----
|
||||
public ServerSapforsDBTable serverSapfors;
|
||||
//--
|
||||
public SapforTasksPackagesDBTable sapforTasksPackages;
|
||||
// public SapforTasksPackagesDBTable sapforTasksPackages;
|
||||
// public SapforTasksPackagesDBTable sapforTasksPackages;
|
||||
//--
|
||||
public TestsDatabase() {
|
||||
@@ -44,7 +42,7 @@ public class TestsDatabase extends SQLiteDatabase {
|
||||
addTable(sapforConfigurations = new SapforConfigurationDBTable());
|
||||
addTable(sapforConfigurationCommands = new SapforConfigurationCommandsDBTable());
|
||||
addTable(serverSapfors = new ServerSapforsDBTable());
|
||||
addTable(sapforTasksPackages = new SapforTasksPackagesDBTable());
|
||||
// addTable(sapforTasksPackages = new SapforTasksPackagesDBTable());
|
||||
// addTable(sapforTasksPackages = new SapforTasksPackagesDBTable());
|
||||
}
|
||||
@Override
|
||||
@@ -69,6 +67,7 @@ public class TestsDatabase extends SQLiteDatabase {
|
||||
return res;
|
||||
}
|
||||
public SapforTasksPackage getFirstActiveSapforScenario() {
|
||||
/*
|
||||
SapforTasksPackage first_active = null;
|
||||
SapforTasksPackage first_queued = null;
|
||||
if (!sapforTasksPackages.Data.isEmpty()) {
|
||||
@@ -96,6 +95,7 @@ public class TestsDatabase extends SQLiteDatabase {
|
||||
}
|
||||
return first_queued;
|
||||
}
|
||||
*/
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user