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-04 00:25:36 +03:00
parent 2deecd47bf
commit 1cbd4eb393
16 changed files with 324 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/SapforTestingSystem/PerformSapforTask.java
View File

@@ -4,7 +4,7 @@ import Common.Global;
import Common.Utils.Utils;
import GlobalData.Tasks.TaskState;
import ProjectData.Project.db_project_info;
import SapforTestingSystem.Json.SapforPackage_json;
import SapforTestingSystem.Json.SapforConfiguration_json;
import SapforTestingSystem.Json.SapforVersion_json;
import SapforTestingSystem.SapforTask.SapforTask;
import Visual_DVM_2021.Passes.PassCode_2021;
@@ -29,7 +29,7 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
}
//--
File sapfor_drv;
SapforPackage_json sapforPackage_json;
SapforConfiguration_json sapforConfiguration_json;
//-----
File parentTask;
File task;
@@ -46,14 +46,14 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
@Override
protected boolean canStart(Object... args) throws Exception {
sapfor_drv = (File) args[0];
sapforPackage_json = (SapforPackage_json) args[1];
sapforConfiguration_json = (SapforConfiguration_json) args[1];
String testDescription = (String) args[2];
target = (SapforTask) args[3];
//--->>
parentTask = Paths.get(Global.Home, sapforPackage_json.id, testDescription).toFile();
parentTask = Paths.get(Global.Home, sapforConfiguration_json.id, testDescription).toFile();
task = null;
//--->>
target.sapfortaskspackage_2023_id = Integer.parseInt(sapforPackage_json.id);
target.sapfor_configuration_id = sapforConfiguration_json.id;
target.test_description = testDescription;
target.root = parentTask.getAbsolutePath();
return true;
@@ -86,7 +86,7 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
File file = new File(data_workspace, name + (Global.isWindows ? ".bat" : ".sh"));
FileUtils.write(file,
Utils.DQuotes(sapfor_drv.getAbsolutePath())
+ (sapforPackage_json.flags.isEmpty() ? "" : (" " + sapforPackage_json.flags))
+ (sapforConfiguration_json.flags.isEmpty() ? "" : (" " + sapforConfiguration_json.flags))
+ " -noLogo"
+ " " + command +
" 1>" +
@@ -158,8 +158,8 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
}
@Override
protected void body() throws Exception {
System.out.println(target.root + " " + Utils.Brackets(sapforPackage_json.flags));//!!
for (PassCode_2021 code : sapforPackage_json.codes) {
System.out.println(target.root + " " + Utils.Brackets(sapforConfiguration_json.flags));//!!
for (PassCode_2021 code : sapforConfiguration_json.codes) {
System.out.println(code); //!!
if (parse()) {
if (code.equals(PassCode_2021.CreateParallelVariants))
@@ -169,11 +169,5 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
} else
break;
}
/*
//Запись результатов. todo сделать единый файл со списком итогов. уже после выполнения нитей.
File data_workspace = new File(target.root, db_project_info.data);
Utils.CheckDirectory(data_workspace);
Utils.jsonToFile(target, new File(data_workspace, "result.txt"));
*/
}
}