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

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

Browse Source
This commit is contained in:
02090095
2024-09-10 01:50:44 +03:00
parent 958ccbc9ab
commit 151572fd82
21 changed files with 274 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java
View File

@@ -4,18 +4,21 @@ import Common.Global;
import Common.UI.UI;
import Common.Utils.Utils;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.TasksPackageState;
import TestingSystem.Common.Test.Test;
import TestingSystem.DVM.Configuration.Configuration;
import TestingSystem.DVM.DVMPackage.DVMPackage;
import TestingSystem.DVM.DVMPackage.DVMPackage_json;
import TestingSystem.DVM.DVMTasks.DVMCompilationTask;
import TestingSystem.DVM.DVMTasks.DVMRunTask;
import TestingSystem.Common.TasksPackageState;
import Visual_DVM_2021.Passes.Pass_2021;
import java.util.Vector;
public class AddTasksToDVMPackage extends Pass_2021<DVMPackage> {
Vector<DVMCompilationTask> tasks;
Vector<Configuration> configurations;
Vector<Group> groups;
Vector<Test> tests;
int tasks_count;
@Override
public String getIconPath() {
@@ -102,6 +105,9 @@ public class AddTasksToDVMPackage extends Pass_2021<DVMPackage> {
}
//---
tasks = new Vector<>();
configurations = new Vector<>();
groups = new Vector<>();
tests = new Vector<>();
tasks_count = 0;
//-----------
//1, Проверяем выбраны ли конфиги.
@@ -112,6 +118,7 @@ public class AddTasksToDVMPackage extends Pass_2021<DVMPackage> {
if (Global.testingServer.db.groups.getCheckedCount() > 0) {
//2 Проверяем выбраны ли группы.
for (TestingSystem.DVM.Configuration.Configuration configuration : Global.testingServer.db.configurations.getCheckedItems()) {
configurations.add(configuration);
for (Group group : Global.testingServer.db.groups.getCheckedItems()) {
Vector<Test> groupTests = new Vector<>();
Vector<Test> checkedGroupTests = new Vector<>();
@@ -123,15 +130,20 @@ public class AddTasksToDVMPackage extends Pass_2021<DVMPackage> {
}
}
if (!groupTests.isEmpty()) {
groups.add(group);
if (checkedGroupTests.isEmpty()) {
for (Test test : groupTests)
for (Test test : groupTests) {
tasks.addAll(createTasksCGT(configuration, group, test));
tests.add(test);
}
} else {
//добавляем только отмеченные.
for (Test test : checkedGroupTests) {
tasks.addAll(createTasksCGT(configuration, group, test));
tests.add(test);
}
}
//--
}
}
}
@@ -161,8 +173,15 @@ public class AddTasksToDVMPackage extends Pass_2021<DVMPackage> {
}
}
json.compilationTasks.addAll(tasks);
//--
target.addConfigurations(configurations);
target.addGroups(groups);
target.addTests(tests);
//--
target.tasksCount += tasks_count;
Global.testingServer.db.Update(target);
//--
target.printCGT();
}
@Override
protected void showDone() throws Exception {