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

no message

Browse Source
This commit is contained in:
02090095
2024-09-16 15:41:43 +03:00
parent 7ea64c49d1
commit d4d8d255fb
27 changed files with 72 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@ import TestingSystem.Common.Configuration;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.TasksPackageState;
import TestingSystem.Common.Test.Test;
import TestingSystem.DVM.Configuration.DVMConfiguration;
import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import TestingSystem.DVM.DVMPackage.DVMPackage;
import TestingSystem.DVM.DVMPackage.DVMPackage_json;
import TestingSystem.DVM.DVMTasks.DVMCompilationTask;
@@ -177,8 +177,6 @@ public class AddTasksToDVMPackage extends Pass_2021<DVMPackage> {
json.compilationTasks.addAll(tasks);
//--
target.saveConfigurations(configurations);
target.saveGroups(groups);
target.saveTests(tests);
//--
target.tasksCount += tasks_count;
target.state= TasksPackageState.Inactive;

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

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Global;
import TestingSystem.Common.TestingServer;
import TestingSystem.DVM.Configuration.DVMConfiguration;
import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import Visual_DVM_2021.Passes.DeleteServerObjects;
public class DeleteConfiguration extends DeleteServerObjects<TestingServer, DVMConfiguration> {
public DeleteConfiguration() {

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

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Global;
import TestingSystem.Common.TestingServer;
import TestingSystem.DVM.Configuration.DVMConfiguration;
import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import Visual_DVM_2021.Passes.Server.EditServerObject;
public class EditConfiguration extends EditServerObject<TestingServer, DVMConfiguration> {
public EditConfiguration() {

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

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Global;
import TestingSystem.Common.TestingServer;
import TestingSystem.DVM.Configuration.DVMConfiguration;
import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import Visual_DVM_2021.Passes.Server.PublishServerObject;
public class PublishConfiguration extends PublishServerObject<TestingServer, DVMConfiguration> {
public PublishConfiguration() {

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

@@ -4,7 +4,7 @@ import Common.Global;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.Test;
import TestingSystem.Common.TestingServer;
import TestingSystem.DVM.Configuration.DVMConfiguration;
import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import Visual_DVM_2021.Passes.Server.EditServerObject;
import java.util.Vector;

178
src/Visual_DVM_2021/Passes/All/SaveCurrentDVMPackage.java
View File

@@ -1,178 +0,0 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.Global;
import Common.UI.UI;
import Common.Utils.Utils;
import TestingSystem.Common.Configuration;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.Test;
import TestingSystem.Common.TestingServer;
import TestingSystem.DVM.Configuration.DVMConfiguration;
import TestingSystem.DVM.DVMPackage.DVMPackage;
import TestingSystem.DVM.DVMTasks.DVMCompilationTask;
import TestingSystem.DVM.DVMTasks.DVMRunTask;
import Visual_DVM_2021.Passes.Server.EditServerObject;
import java.util.LinkedHashMap;
import java.util.Vector;
public class SaveCurrentDVMPackage extends EditServerObject<TestingServer, DVMPackage> {
//--
Vector<DVMConfiguration> configurations;
Vector<Group> groups;
Vector<Test> tests;
//--
Vector<String> configurationsNames;
Vector<String> groupsNames;
//--
LinkedHashMap<Integer, Vector<Test>> testsByGroups;
int tasks_count;
Vector<DVMCompilationTask> tasks;
public SaveCurrentDVMPackage() {
super(Global.testingServer,DVMPackage.class);
}
//--
@Override
public String getIconPath() {
return "/icons/Save.png";
}
@Override
public String getButtonText() {
return "";
}
public static String checkFlags(String flags_in) {
if (!flags_in.contains("-shared-dvm")) {
if (flags_in.isEmpty())
return "-shared-dvm";
else return flags_in + " -shared-dvm";
} else
return flags_in;
}
public static String checkEnvironments(String environmentsSet_in) {
if (!environmentsSet_in.contains("DVMH_NO_DIRECT_COPY")) {
if (environmentsSet_in.isEmpty())
return "DVMH_NO_DIRECT_COPY=" + Utils.DQuotes("1");
else
return environmentsSet_in + " " + "DVMH_NO_DIRECT_COPY=" + Utils.DQuotes("1");
} else
return environmentsSet_in;
}
//--
public Vector<DVMCompilationTask> createTasksCGT(
DVMConfiguration configuration,
Group group,
Test test
) {
Vector<DVMCompilationTask> compilationTasks = new Vector<>();
for (String flags : configuration.getFlagsArray()) {
String checked_flags = checkFlags(flags);
DVMCompilationTask dvmCompilationTask = new DVMCompilationTask(
configuration,
group,
test,
checked_flags
);
Vector<String> matrixes = configuration.getMatrixes(test.max_dim);
Vector<String> environments = configuration.getEnvironments();
for (String environmentSet : environments) {
String checkedEnvironments = checkEnvironments(environmentSet);
if (flags.trim().equalsIgnoreCase("-s")) {
dvmCompilationTask.runTasks.add(new DVMRunTask(
configuration,
group,
test,
"",
checked_flags,
checkedEnvironments,
configuration.getParamsText(),
target.kernels
));
tasks_count++;
} else
for (String matrix : matrixes) {
dvmCompilationTask.runTasks.add(new DVMRunTask(
configuration,
group,
test,
matrix,
checked_flags,
checkedEnvironments,
configuration.getParamsText(),
target.kernels));
tasks_count++;
}
}
compilationTasks.add(dvmCompilationTask);
}
return compilationTasks;
}
@Override
protected boolean canStart(Object... args) throws Exception {
target = null;
configurations = new Vector<>();
//---
groups = new Vector<>();
tests = new Vector<>();
//---
configurationsNames = new Vector<>();
groupsNames = new Vector<>();
//---
tasks_count = 0;
tasks = new Vector<>();
testsByGroups = new LinkedHashMap<>();
//---
if (!Current.Check(Log, Current.DVMPackage)) return false;
//--
target = Current.getDVMPackage();
if (target.state.isActive()) {
Log.Writeln_("Возможно редактировать только неактивный пакет!");
return false;
}
for (DVMConfiguration configuration : Global.testingServer.db.dvm_configurations.getCheckedItems()) {
configurations.add(configuration);
configurationsNames.add(configuration.description);
}
for (Group group : Global.testingServer.db.groups.getCheckedItems()) {
groups.add(group);
groupsNames.add(group.description);
Vector<Test> groupTests = Global.testingServer.db.tests.getSelectedGroupTests(group);
tests.addAll(groupTests);
testsByGroups.put(group.id, groupTests);
}
//---
//создание задач
for (DVMConfiguration configuration : configurations) {
for (Group group : groups) {
Vector<Test> groupTests = testsByGroups.get(group.id);
for (Test test: groupTests)
tasks.addAll(createTasksCGT(configuration, group, test));
}
}
//---
/*
if (tasks.isEmpty()) {
Log.Writeln_("Не удалось добавить задачи.\n" +
"Для создания задач отметьте требуемые конфигурации,\n" +
"Отметьте группы, или отдельные тесты в отмеченной текущей группе");
return false;
}
*/
//---
return UI.Question("Будет создано " + tasks_count + " задач. Продолжить");
}
@Override
protected void ServerAction() throws Exception {
//занесение информации об участвующих группах конфигурациях и тестах
target.saveConfigurations(configurations);
target.saveGroups(groups);
target.saveTests(tests);
//--
target.saveTasks(tasks, tasks_count);
target.Reset();
super.ServerAction();
}
@Override
protected void showDone() throws Exception {
Global.testingServer.db.dvmPackages.ShowUI(target.id);
Global.testingServer.db.dvmRunTasks.ShowDVMPackage(target);
}
}

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

@@ -3,7 +3,7 @@ import Common.Current;
import Common.Global;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.Test;
import TestingSystem.DVM.Configuration.DVMConfiguration;
import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import Visual_DVM_2021.Passes.Pass_2021;
import java.util.Vector;

74
src/Visual_DVM_2021/Passes/All/ShowCurrentDVMPackage.java
View File

@@ -1,74 +0,0 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.Global;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.Test;
import TestingSystem.DVM.Configuration.DVMConfiguration;
import TestingSystem.DVM.DVMPackage.DVMPackage;
import Visual_DVM_2021.Passes.Pass_2021;
import java.util.Vector;
public class ShowCurrentDVMPackage extends Pass_2021<DVMPackage> {
@Override
public String getIconPath() {
return "/icons/Edit.png";
}
@Override
public String getButtonText() {
return "";
}
public Current currentName(){return Current.DVMPackage;};
@Override
protected boolean canStart(Object... args) throws Exception {
target = null;
if (Current.Check(Log, Current.DVMPackage)) {
target = Current.getDVMPackage();
return true;
}
return false;
}
@Override
protected void showPreparation() throws Exception {
Global.testingServer.db.UnselectAllGTC();
}
@Override
protected void showDone() throws Exception {
System.out.println("package="+target.id);
Vector<DVMConfiguration> configurations = target.getConfigurations();
Vector<Group> groups = target.getGroups();
Vector<Test> tests = target.getTests();
//-----
Vector<String> res = new Vector<>();
res.add("конфигурации: " + configurations.size());
for (DVMConfiguration configuration : configurations)
res.add(configuration.description);
//--
res.add("группы: " + groups.size());
for (Group group : groups)
res.add(group.description);
//--
res.add("тесты: " + tests.size());
for (Test test : tests)
res.add(test.description);
System.out.println(String.join("\n", res));
//--
for (DVMConfiguration configuration: configurations)
configuration.Select(true);
for (Group group: groups)
group.Select(true);
for (Test test: tests)
test.Select(true);
//--
if (!groups.isEmpty()){
Global.testingServer.db.groups.ShowUI(groups.lastElement().id);
}
if (!tests.isEmpty()){
Global.testingServer.db.tests.ShowUI(tests.lastElement().id);
}
if (!configurations.isEmpty()){
Global.testingServer.db.dvm_configurations.ShowUI(configurations.lastElement().id);
}
}
}

7
src/Visual_DVM_2021/Passes/All/StartCurrentDVMConfiguration.java
View File

@@ -9,7 +9,7 @@ import GlobalData.User.UserState;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.Test;
import TestingSystem.Common.TestingServer;
import TestingSystem.DVM.Configuration.DVMConfiguration;
import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import TestingSystem.DVM.DVMPackage.DVMPackage;
import TestingSystem.DVM.DVMTasks.DVMCompilationTask;
import TestingSystem.DVM.DVMTasks.DVMRunTask;
@@ -156,11 +156,8 @@ public class StartCurrentDVMConfiguration extends PublishServerObject<TestingSer
}
@Override
protected void ServerAction() throws Exception {
//занесение информации об участвующих группах конфигурациях и тестах
//занесение информации об участвующих конфигурациях
target.saveConfigurations(configurations);
target.saveGroups(groups);
target.saveTests(tests);
//--
target.saveTasks(tasks, tasks_count);
super.ServerAction();
}

43
src/Visual_DVM_2021/Passes/All/StartDVMPackage.java
View File

@@ -1,43 +0,0 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.Global;
import Common.UI.UI;
import TestingSystem.Common.TasksPackageState;
import TestingSystem.Common.TestingServer;
import TestingSystem.DVM.DVMPackage.DVMPackage;
import Visual_DVM_2021.Passes.Server.EditServerObject;
public class StartDVMPackage extends EditServerObject<TestingServer, DVMPackage> {
@Override
public String getIconPath() {
return "/icons/Start.png";
}
public StartDVMPackage() {
super(Global.testingServer,DVMPackage.class);
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (!Current.getAccount().CheckRegistered(Log)) {
return false;
}
if (Current.Check(Log,Current.DVMPackage)) {
target = Current.getDVMPackage();
//-
if (!target.state.equals(TasksPackageState.Inactive)) {
Log.Writeln_("Возможно запустить только неактивный пакет.");
return false;
}
if (target.tasksCount == 0) {
Log.Writeln_("В пакете отсутствуют задачи.");
return false;
}
if (UI.Question("Будет запущено:\n"
+ target.tasksCount + " задач.\n" +
"Продолжить")) {
target.connectionErrosCount=0;
target.state = TasksPackageState.Queued;
return true;
}
}
return false;
}
}

12
src/Visual_DVM_2021/Passes/PassCode_2021.java
View File

@@ -299,8 +299,7 @@ public enum PassCode_2021 {
ActualizePackages,
//->
AddDVMPackage,
AddTasksToDVMPackage,
StartDVMPackage,
AddTasksToDVMPackage,// вывести. теперь все через конфигурацию.
DeleteDVMPackage,
AbortDVMPackage,
//->
@@ -342,9 +341,6 @@ public enum PassCode_2021 {
ShowSapforCompilationOut,
ShowSapforCompilationErr,
GetOldBugReports,
ShowCurrentDVMPackage,
SaveCurrentDVMPackage,
ShowCurrentDVMConfigurationTests,
SaveCurrentDVMConfiguration,
StartCurrentDVMConfiguration,
@@ -360,10 +356,6 @@ public enum PassCode_2021 {
return "Отметить группы и тесты, участвующие в текущей конфигурации DVM системы";
case SaveCurrentDVMConfiguration:
return "Сохранить информацию о тестах текущей конфигурации DVM системы";
case SaveCurrentDVMPackage:
return "Сохранить текущий пакет тестирования DVM системы";
case ShowCurrentDVMPackage:
return "Редактировать пакет тестирования DVM системы";
case GetOldBugReports:
return "Получить неиспользуемые баг репорты";
case SPF_RenameIncludes:
@@ -435,8 +427,6 @@ public enum PassCode_2021 {
return "Прервать пакет тестирования DVM";
case DeleteDVMPackage:
return "Удалить пакет задач DVM";
case StartDVMPackage:
return "Запустить пакет задач DVM";
case DownloadDVMPackage:
return "Скачать пакет задач DVM";
case AddTasksToDVMPackage: