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

v++

Browse Source
This commit is contained in:
02090095
2024-03-08 02:45:49 +03:00
parent b792cf80b8
commit 8f38a616d5
8 changed files with 42 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Visual_DVM_2021/Passes/All/AddTasksToSapforPackage.java
View File

@@ -228,6 +228,7 @@ public class AddTasksToSapforPackage extends Pass_2021<SapforPackage> {
//--
SapforConfiguration_json configuration_json = new SapforConfiguration_json();
configuration_json.id = configuration.id;
configuration_json.name=configuration.description;
configuration_json.flags = configuration.getFlags();
Vector<PassCode_2021> codes = configuration.getPassCodes();
//--- коррекцию кода нельзя вызвать если инклуды есть. в общем случае.
@@ -260,6 +261,7 @@ public class AddTasksToSapforPackage extends Pass_2021<SapforPackage> {
}
target.tasksCount += new_tasks.size();
target.testsNames = String.join(";", target.package_json.getTestsNames());
target.configurationsNames = String.join(";", target.package_json.getConfigurationsNames());
}
@Override
protected void showDone() throws Exception {

8
src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java
View File

@@ -57,6 +57,7 @@ public class CloneSapforPackage extends AddObjectPass<SapforPackage> {
SapforConfiguration_json configurationJson = new SapforConfiguration_json();
//--
configurationJson.id = configuration.id;
configurationJson.name = configuration.description;
configurationJson.flags = src_configuration.flags;
configurationJson.codes.addAll(src_configuration.codes);
//--
@@ -153,7 +154,7 @@ public class CloneSapforPackage extends AddObjectPass<SapforPackage> {
SapforTestingSet_json dst = cloneTestingSet(src);
//--
Vector<SapforTask> new_tasks = target.getActualTestingSetTasks(dst);
if (!new_tasks.isEmpty()){
if (!new_tasks.isEmpty()) {
target.package_json.testingSets.add(dst);
target.package_json.tasks.addAll(new_tasks);
}
@@ -161,6 +162,7 @@ public class CloneSapforPackage extends AddObjectPass<SapforPackage> {
}
target.tasksCount = target.package_json.tasks.size();
target.testsNames = String.join(";", target.package_json.getTestsNames());
target.configurationsNames = String.join(";", target.package_json.getConfigurationsNames());
//--
for (String test_id : inexistingTests) {
System.out.println("Тест " + test_id + " не найден!");
@@ -180,7 +182,7 @@ public class CloneSapforPackage extends AddObjectPass<SapforPackage> {
protected void body() throws Exception {
Global.testingServer.db.sapforPackages.Data.put(target.id, target);
//--
Utils.CheckAndCleanDirectory(target.getLocalWorkspace());
target.saveJson();
// Utils.CheckAndCleanDirectory(target.getLocalWorkspace());
// target.saveJson();
}
}