промежуточный. изменение Сапфора . теперь можно формировать пакеты.

This commit is contained in:
2023-12-25 00:33:14 +03:00
parent 44e37d01cf
commit 6eccd3364a
17 changed files with 383 additions and 556 deletions

View File

@@ -5,6 +5,7 @@ import Common.Utils.Utils;
import GlobalData.Tasks.TaskState;
import Repository.Component.Sapfor.Sapfor;
import TestingSystem.SAPFOR.Json.SapforConfiguration_json;
import TestingSystem.SAPFOR.Json.SapforTestingSet_json;
import TestingSystem.SAPFOR.Json.SapforVersion_json;
import TestingSystem.SAPFOR.SapforTask.SapforTask;
import Visual_DVM_2021.Passes.PassCode_2021;
@@ -28,7 +29,8 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
}
//--
File sapfor_drv;
SapforConfiguration_json sapforConfiguration_json;
SapforTestingSet_json set_json;
SapforConfiguration_json configuration_json;
SapforVersion_json version_json;
//-----
File root;
@@ -38,12 +40,16 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
@Override
protected boolean canStart(Object... args) throws Exception {
sapfor_drv = (File) args[0];
sapforConfiguration_json = (SapforConfiguration_json) args[1];
target = (SapforTask) args[2];
set_json = (SapforTestingSet_json) args[1];
configuration_json = (SapforConfiguration_json) args[2];
target = (SapforTask) args[3];
version_json = null;
//--->>
parentTask = Paths.get(Global.Home, String.valueOf(sapforConfiguration_json.id), target.test_description).toFile();
root = new File(Global.Home, String.valueOf(sapforConfiguration_json.id));
parentTask = Paths.get(Global.Home,
String.valueOf(set_json.id),
String.valueOf(configuration_json.id),
target.test_description).toFile();
root = new File(Global.Home, String.valueOf(configuration_json.id));
task = null;
//--->>
return true;
@@ -61,7 +67,7 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
task = new File(parentTask, "v1");
Utils.CheckAndCleanDirectory(task); //папка для преобразования.
//если версия пустая, это тоже результат тестирования. Поэтому должна учитываться в древе.
target.versions.add(version_json =new SapforVersion_json(
target.versions.add(version_json = new SapforVersion_json(
root.getAbsolutePath(),
task.getAbsolutePath(), code.getDescription()));
//---
@@ -109,7 +115,7 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
protected void body() throws Exception {
target.StartDate = new Date().getTime();
target.versions.add(version_json = new SapforVersion_json(target.test_description, ""));
for (PassCode_2021 code : sapforConfiguration_json.codes) {
for (PassCode_2021 code : configuration_json.codes) {
if (parse()) {
if (code.equals(PassCode_2021.CreateParallelVariants))
variants();