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-15 01:36:19 +03:00
parent 1e782daa3d
commit 7ea64c49d1
18 changed files with 488 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/TestingSystem/DVM/Configuration/DVMConfiguration.java
View File

@@ -19,6 +19,8 @@ public class DVMConfiguration extends Configuration {
public String environments="\n";
public String usr_par = "";
//-
//под флагами понимается в данном случае набор цепочек флагов запакованных через энтер.
// скорее всего будет лишь одна цепочка. с окружением похожая ситуация.
@Override
public String getFlags() {
return flags;

42
src/TestingSystem/DVM/Configuration/ConfigurationDBTable.java → src/TestingSystem/DVM/Configuration/DVMConfigurationDBTable.java
View File

@@ -8,21 +8,21 @@ import Common.UI.VisualiserStringList;
import Common.UI.Windows.Dialog.DBObjectDialog;
import Common.Utils.Utils;
import TestingSystem.DVM.Configuration.UI.ConfigurationFields;
public class ConfigurationDBTable extends iDBTable<DVMConfiguration> {
public ConfigurationDBTable() {
public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
public DVMConfigurationDBTable() {
super(DVMConfiguration.class);
}
@Override
public Current CurrentName() {
return Current.Configuration;
return Current.DVMConfiguration;
}
@Override
public String getSingleDescription() {
return "конфигурация тестирования";
return "конфигурация тестирования DVM системы";
}
@Override
public String getPluralDescription() {
return "конфигурации";
return "конфигурации тестирования DVM системы";
}
@Override
protected DataSetControlForm createUI() {
@@ -34,9 +34,10 @@ public class ConfigurationDBTable extends iDBTable<DVMConfiguration> {
@Override
protected void AdditionalInitColumns() {
// columns.get(0).setVisible(false);
columns.get(4).setRenderer(TableRenderers.RendererMultiline);
columns.get(5).setRenderer(TableRenderers.RendererMultiline);
columns.get(12).setRenderer(TableRenderers.RendererMultiline);
columns.get(7).setRenderer(TableRenderers.RendererMultiline);
columns.get(8).setRenderer(TableRenderers.RendererMultiline);
columns.get(15).setRenderer(TableRenderers.RendererMultiline);
}
};
}
@@ -45,6 +46,9 @@ public class ConfigurationDBTable extends iDBTable<DVMConfiguration> {
return new String[]{
"имя",
"автор",
"авто",
"группы",
"тестов",
"флаги",
"окружение",
"c_time",
@@ -63,23 +67,31 @@ public class ConfigurationDBTable extends iDBTable<DVMConfiguration> {
return object.description;
case 3:
return object.sender_name;
//---
case 4:
return Utils.unpackStrings(object.flags, true);
return object.printAuto();
case 5:
return Utils.unpackStrings(object.environments, true);
return object.getGroupsNamesArray();
case 6:
return object.c_maxtime;
return object.testsCount;
//---
case 7:
return object.cube;
return Utils.unpackStrings(object.flags, true);
case 8:
return object.max_proc_count;
return Utils.unpackStrings(object.environments, true);
case 9:
return object.min_dim_proc_count;
return object.c_maxtime;
case 10:
return object.max_dim_proc_count;
return object.cube;
case 11:
return object.maxtime;
return object.max_proc_count;
case 12:
return object.min_dim_proc_count;
case 13:
return object.max_dim_proc_count;
case 14:
return object.maxtime;
case 15:
return Utils.unpackStrings(object.usr_par, true);
default:
return null;

12
src/TestingSystem/DVM/Configuration/ConfigurationsMenuBar.java → src/TestingSystem/DVM/Configuration/DVMConfigurationsMenuBar.java
View File

@@ -1,15 +1,19 @@
package TestingSystem.DVM.Configuration;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class ConfigurationsMenuBar extends DataMenuBar {
public ConfigurationsMenuBar() {
public class DVMConfigurationsMenuBar extends DataMenuBar {
public DVMConfigurationsMenuBar() {
super("конфигурации");
addPasses(
// PassCode_2021.StartTests,
PassCode_2021.PublishConfiguration,
PassCode_2021.EditConfiguration,
PassCode_2021.DeleteConfiguration
PassCode_2021.ShowCurrentDVMConfigurationTests,
PassCode_2021.SaveCurrentDVMConfiguration,
PassCode_2021.DeleteConfiguration,
PassCode_2021.StartCurrentDVMConfiguration
);
}
}

31
src/TestingSystem/DVM/DVMPackage/DVMPackage.java
View File

@@ -1,14 +1,15 @@
package TestingSystem.DVM.DVMPackage;
import Common.Constants;
import Common.Current;
import Common.Database.DBObject;
import Common.Global;
import GlobalData.Account.Account;
import GlobalData.Compiler.Compiler;
import GlobalData.Machine.Machine;
import GlobalData.Machine.MachineType;
import GlobalData.User.User;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.Test;
import TestingSystem.Common.TasksPackageState;
import TestingSystem.Common.TestingPackage.TestingPackage;
import TestingSystem.DVM.Configuration.DVMConfiguration;
import TestingSystem.DVM.DVMTasks.DVMCompilationTask;
import TestingSystem.DVM.DVMTasks.DVMRunTask;
@@ -26,6 +27,30 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
//---
public DVMPackage() {
}
public DVMPackage(Account account, Machine machine, User user, Compiler compiler){
id = Constants.Nan;
//-
sender_name = account.name;
sender_address = account.email;
//-
machine_name = machine.name;
machine_address = machine.address;
machine_port = machine.port;
//-
user_name = user.login;
user_password = user.password;
user_workspace = user.workspace;
//-
drv = compiler.call_command;
version = compiler.getVersionInfo();
//-
kernels = Global.properties.TestingKernels;
needsEmail = Global.properties.EmailOnTestingProgress ? 1 : 0;
//--
package_json = new DVMPackage_json();
//--
state = TasksPackageState.Queued;
}
@Override
public Class getJsonClass() {
return DVMPackage_json.class;