no message
This commit is contained in:
15
.idea/workspace.xml
generated
15
.idea/workspace.xml
generated
@@ -8,8 +8,17 @@
|
|||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/Configuration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/Configuration.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/ConfigurationInterface.java" beforeDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/UI/ConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/ConfigurationDBTable.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditConfiguration.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditConfigurationOnServer.java" beforeDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishConfiguration.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartTests.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
@@ -49,9 +58,9 @@
|
|||||||
</component>
|
</component>
|
||||||
<component name="HighlightingSettingsPerFile">
|
<component name="HighlightingSettingsPerFile">
|
||||||
<setting file="file://$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTest.java" root0="FORCE_HIGHLIGHTING" />
|
<setting file="file://$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTest.java" root0="FORCE_HIGHLIGHTING" />
|
||||||
|
<setting file="file://$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" root0="FORCE_HIGHLIGHTING" />
|
||||||
<setting file="file://$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java" root0="FORCE_HIGHLIGHTING" />
|
<setting file="file://$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java" root0="FORCE_HIGHLIGHTING" />
|
||||||
<setting file="file://$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishGroup.java" root0="FORCE_HIGHLIGHTING" />
|
<setting file="file://$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishGroup.java" root0="FORCE_HIGHLIGHTING" />
|
||||||
<setting file="file://$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" root0="FORCE_HIGHLIGHTING" />
|
|
||||||
</component>
|
</component>
|
||||||
<component name="KotlinCodeInsightWorkspaceSettings">
|
<component name="KotlinCodeInsightWorkspaceSettings">
|
||||||
<option name="optimizeImportsOnTheFly" value="true" />
|
<option name="optimizeImportsOnTheFly" value="true" />
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ public class ConfigurationsMenuBar extends DataMenuBar {
|
|||||||
PassCode_2021.StartTests,
|
PassCode_2021.StartTests,
|
||||||
PassCode_2021.PublishConfiguration,
|
PassCode_2021.PublishConfiguration,
|
||||||
PassCode_2021.EditConfiguration,
|
PassCode_2021.EditConfiguration,
|
||||||
PassCode_2021.DeleteSelectedConfigurations
|
PassCode_2021.DeleteConfiguration
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationComman
|
|||||||
import TestingSystem.SAPFOR.SapforTask.SapforTasksDBTable;
|
import TestingSystem.SAPFOR.SapforTask.SapforTasksDBTable;
|
||||||
import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackagesDBTable;
|
import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackagesDBTable;
|
||||||
import TestingSystem.SAPFOR.ServerSapfor.ServerSapforsDBTable;
|
import TestingSystem.SAPFOR.ServerSapfor.ServerSapforsDBTable;
|
||||||
import TestingSystem.DVM.Configuration.UI.ConfigurationDBTable;
|
import TestingSystem.DVM.Configuration.ConfigurationDBTable;
|
||||||
import TestingSystem.Common.Group.GroupsDBTable;
|
import TestingSystem.Common.Group.GroupsDBTable;
|
||||||
import TestingSystem.DVM.Tasks.TestRunTasksDBTable;
|
import TestingSystem.DVM.Tasks.TestRunTasksDBTable;
|
||||||
import TestingSystem.DVM.TasksPackage.TasksPackageDBTable;
|
import TestingSystem.DVM.TasksPackage.TasksPackageDBTable;
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import GlobalData.Settings.SettingName;
|
|||||||
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationDBTable;
|
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationDBTable;
|
||||||
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
|
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
|
||||||
import TestingSystem.SAPFOR.ServerSapfor.ServerSapforsDBTable;
|
import TestingSystem.SAPFOR.ServerSapfor.ServerSapforsDBTable;
|
||||||
import TestingSystem.DVM.Configuration.UI.ConfigurationDBTable;
|
import TestingSystem.DVM.Configuration.ConfigurationDBTable;
|
||||||
import TestingSystem.Common.Group.GroupsDBTable;
|
import TestingSystem.Common.Group.GroupsDBTable;
|
||||||
import TestingSystem.Common.TSetting.TSetting;
|
import TestingSystem.Common.TSetting.TSetting;
|
||||||
import TestingSystem.Common.TSetting.TSettingsDBTable;
|
import TestingSystem.Common.TSetting.TSettingsDBTable;
|
||||||
|
|||||||
@@ -1,7 +1,11 @@
|
|||||||
package TestingSystem.DVM.Configuration;
|
package TestingSystem.DVM.Configuration;
|
||||||
import Common.Database.DBObject;
|
import Common.Database.DBObject;
|
||||||
import Common.Database.rDBObject;
|
import Common.Database.riDBObject;
|
||||||
public class Configuration extends rDBObject {
|
import Common.Utils.Utils;
|
||||||
|
import GlobalData.RunConfiguration.RunConfiguration;
|
||||||
|
|
||||||
|
import java.util.Vector;
|
||||||
|
public class Configuration extends riDBObject {
|
||||||
//компиляция.
|
//компиляция.
|
||||||
public String flags = "\n";
|
public String flags = "\n";
|
||||||
public int c_maxtime = 40;
|
public int c_maxtime = 40;
|
||||||
@@ -33,4 +37,67 @@ public class Configuration extends rDBObject {
|
|||||||
this.SynchronizeFields(src);
|
this.SynchronizeFields(src);
|
||||||
}
|
}
|
||||||
public Configuration(){}
|
public Configuration(){}
|
||||||
|
//--
|
||||||
|
public Vector<String> getFlags() {
|
||||||
|
return Utils.unpackStrings(flags);
|
||||||
|
}
|
||||||
|
public Vector<String> getEnvironments() {
|
||||||
|
return Utils.unpackStrings(environments);
|
||||||
|
}
|
||||||
|
public Vector<String> getParams() {
|
||||||
|
return Utils.unpackStrings(usr_par);
|
||||||
|
}
|
||||||
|
public Vector<String> getMatrixes(int testDim) {
|
||||||
|
Vector<Vector<Integer>> res_ = new Vector<>();
|
||||||
|
Vector<String> res = new Vector<>();
|
||||||
|
if ((max_proc_count==0) || (min_dim_proc_count == 0 && max_dim_proc_count == 0)) {
|
||||||
|
res.add("");
|
||||||
|
} else {
|
||||||
|
if (testDim > 0) {
|
||||||
|
Vector<String> min_border = new Vector<>();
|
||||||
|
Vector<String> max_border = new Vector<>();
|
||||||
|
for (int i = 1; i <= testDim; ++i) {
|
||||||
|
min_border.add(String.valueOf(min_dim_proc_count));
|
||||||
|
max_border.add(String.valueOf(max_dim_proc_count));
|
||||||
|
}
|
||||||
|
Vector<Integer> from = RunConfiguration.getBounds(String.join(" ", min_border));
|
||||||
|
Vector<Integer> to = RunConfiguration.getBounds(String.join(" ", max_border));
|
||||||
|
if (from.size() != to.size()) {
|
||||||
|
System.out.println("Верхняя и нижняя границы матриц конфигурации имеют разные размерности");
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
if (from.size() != testDim) {
|
||||||
|
System.out.println("Границы матриц не совпадают с размерностью конфигурации");
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
//1 стадия. заполнение.
|
||||||
|
for (int j = from.get(0); j <= to.get(0); ++j) {
|
||||||
|
Vector<Integer> m = new Vector<>();
|
||||||
|
res_.add(m);
|
||||||
|
m.add(j);
|
||||||
|
}
|
||||||
|
//---
|
||||||
|
if (testDim > 1) RunConfiguration.gen_rec(from, to, res_, 1, testDim, cube == 1);
|
||||||
|
for (Vector<Integer> m : res_) {
|
||||||
|
Vector<String> ms = new Vector<>();
|
||||||
|
int proc = 1;
|
||||||
|
for (int i : m) {
|
||||||
|
ms.add(String.valueOf(i));
|
||||||
|
proc *= i;
|
||||||
|
}
|
||||||
|
if (proc <= max_proc_count)
|
||||||
|
res.add(String.join(" ", ms));
|
||||||
|
}
|
||||||
|
} else res.add("");
|
||||||
|
}
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
public String getParamsText() {
|
||||||
|
Vector<String> params = getParams();
|
||||||
|
if ((params.size() == 1) && params.get(0).isEmpty()) return "";
|
||||||
|
return String.join("\n", params);
|
||||||
|
}
|
||||||
|
public String getSummary() {
|
||||||
|
return description;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,17 +1,16 @@
|
|||||||
package TestingSystem.DVM.Configuration.UI;
|
package TestingSystem.DVM.Configuration;
|
||||||
import Common.Current;
|
import Common.Current;
|
||||||
import Common.Database.DBObject;
|
import Common.Database.DBObject;
|
||||||
import Common.Database.DBTable;
|
import Common.Database.iDBTable;
|
||||||
import Common.UI.DataSetControlForm;
|
import Common.UI.DataSetControlForm;
|
||||||
import Common.UI.Tables.TableRenderers;
|
import Common.UI.Tables.TableRenderers;
|
||||||
import Common.UI.VisualiserStringList;
|
import Common.UI.VisualiserStringList;
|
||||||
import Common.UI.Windows.Dialog.DBObjectDialog;
|
import Common.UI.Windows.Dialog.DBObjectDialog;
|
||||||
import Common.Utils.Utils;
|
import Common.Utils.Utils;
|
||||||
import TestingSystem.DVM.Configuration.Configuration;
|
import TestingSystem.DVM.Configuration.UI.ConfigurationFields;
|
||||||
import TestingSystem.DVM.Configuration.ConfigurationInterface;
|
public class ConfigurationDBTable extends iDBTable<Configuration> {
|
||||||
public class ConfigurationDBTable extends DBTable<String, Configuration> {
|
|
||||||
public ConfigurationDBTable() {
|
public ConfigurationDBTable() {
|
||||||
super(String.class, Configuration.class);
|
super(Configuration.class);
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public Current CurrentName() {
|
public Current CurrentName() {
|
||||||
@@ -34,12 +33,11 @@ public class ConfigurationDBTable extends DBTable<String, Configuration> {
|
|||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected void AdditionalInitColumns() {
|
protected void AdditionalInitColumns() {
|
||||||
columns.get(0).setVisible(false);
|
// columns.get(0).setVisible(false);
|
||||||
columns.get(4).setRenderer(TableRenderers.RendererMultiline);
|
columns.get(4).setRenderer(TableRenderers.RendererMultiline);
|
||||||
columns.get(5).setRenderer(TableRenderers.RendererMultiline);
|
columns.get(5).setRenderer(TableRenderers.RendererMultiline);
|
||||||
columns.get(12).setRenderer(TableRenderers.RendererMultiline);
|
columns.get(12).setRenderer(TableRenderers.RendererMultiline);
|
||||||
}
|
}
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
@@ -113,9 +111,9 @@ public class ConfigurationDBTable extends DBTable<String, Configuration> {
|
|||||||
public void fillFields() {
|
public void fillFields() {
|
||||||
fields.tfName.setText(Result.description);
|
fields.tfName.setText(Result.description);
|
||||||
//------->>>>
|
//------->>>>
|
||||||
((VisualiserStringList) (fields.flagsList)).fill(ConfigurationInterface.getFlags(Result));
|
((VisualiserStringList) (fields.flagsList)).fill(Result.getFlags());
|
||||||
((VisualiserStringList) (fields.environmentsList)).fill(ConfigurationInterface.getEnvironments(Result));
|
((VisualiserStringList) (fields.environmentsList)).fill(Result.getEnvironments());
|
||||||
((VisualiserStringList) (fields.parList)).fill(ConfigurationInterface.getParams(Result));
|
((VisualiserStringList) (fields.parList)).fill(Result.getParams());
|
||||||
//------->>>>
|
//------->>>>
|
||||||
fields.sCompilationMaxtime.setValue(Result.c_maxtime);
|
fields.sCompilationMaxtime.setValue(Result.c_maxtime);
|
||||||
//-
|
//-
|
||||||
@@ -1,69 +0,0 @@
|
|||||||
package TestingSystem.DVM.Configuration;
|
|
||||||
import Common.Utils.Utils;
|
|
||||||
import GlobalData.RunConfiguration.RunConfiguration;
|
|
||||||
|
|
||||||
import java.util.Vector;
|
|
||||||
public class ConfigurationInterface {
|
|
||||||
public static Vector<String> getFlags(TestingSystem.DVM.Configuration.Configuration object) {
|
|
||||||
return Utils.unpackStrings(object.flags);
|
|
||||||
}
|
|
||||||
public static Vector<String> getEnvironments(TestingSystem.DVM.Configuration.Configuration object) {
|
|
||||||
return Utils.unpackStrings(object.environments);
|
|
||||||
}
|
|
||||||
public static Vector<String> getParams(TestingSystem.DVM.Configuration.Configuration object) {
|
|
||||||
return Utils.unpackStrings(object.usr_par);
|
|
||||||
}
|
|
||||||
public static Vector<String> getMatrixes(TestingSystem.DVM.Configuration.Configuration object, int testDim) {
|
|
||||||
Vector<Vector<Integer>> res_ = new Vector<>();
|
|
||||||
Vector<String> res = new Vector<>();
|
|
||||||
if ((object.max_proc_count==0) || (object.min_dim_proc_count == 0 && object.max_dim_proc_count == 0)) {
|
|
||||||
res.add("");
|
|
||||||
} else {
|
|
||||||
if (testDim > 0) {
|
|
||||||
Vector<String> min_border = new Vector<>();
|
|
||||||
Vector<String> max_border = new Vector<>();
|
|
||||||
for (int i = 1; i <= testDim; ++i) {
|
|
||||||
min_border.add(String.valueOf(object.min_dim_proc_count));
|
|
||||||
max_border.add(String.valueOf(object.max_dim_proc_count));
|
|
||||||
}
|
|
||||||
Vector<Integer> from = RunConfiguration.getBounds(String.join(" ", min_border));
|
|
||||||
Vector<Integer> to = RunConfiguration.getBounds(String.join(" ", max_border));
|
|
||||||
if (from.size() != to.size()) {
|
|
||||||
System.out.println("Верхняя и нижняя границы матриц конфигурации имеют разные размерности");
|
|
||||||
return res;
|
|
||||||
}
|
|
||||||
if (from.size() != testDim) {
|
|
||||||
System.out.println("Границы матриц не совпадают с размерностью конфигурации");
|
|
||||||
return res;
|
|
||||||
}
|
|
||||||
//1 стадия. заполнение.
|
|
||||||
for (int j = from.get(0); j <= to.get(0); ++j) {
|
|
||||||
Vector<Integer> m = new Vector<>();
|
|
||||||
res_.add(m);
|
|
||||||
m.add(j);
|
|
||||||
}
|
|
||||||
//---
|
|
||||||
if (testDim > 1) RunConfiguration.gen_rec(from, to, res_, 1, testDim, object.cube == 1);
|
|
||||||
for (Vector<Integer> m : res_) {
|
|
||||||
Vector<String> ms = new Vector<>();
|
|
||||||
int proc = 1;
|
|
||||||
for (int i : m) {
|
|
||||||
ms.add(String.valueOf(i));
|
|
||||||
proc *= i;
|
|
||||||
}
|
|
||||||
if (proc <= object.max_proc_count)
|
|
||||||
res.add(String.join(" ", ms));
|
|
||||||
}
|
|
||||||
} else res.add("");
|
|
||||||
}
|
|
||||||
return res;
|
|
||||||
}
|
|
||||||
public static String getParamsText(Configuration object) {
|
|
||||||
Vector<String> params = getParams(object);
|
|
||||||
if ((params.size() == 1) && params.get(0).isEmpty()) return "";
|
|
||||||
return String.join("\n", params);
|
|
||||||
}
|
|
||||||
public static String getSummary(Configuration configuration) {
|
|
||||||
return configuration.description;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
10
src/Visual_DVM_2021/Passes/All/DeleteConfiguration.java
Normal file
10
src/Visual_DVM_2021/Passes/All/DeleteConfiguration.java
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
package Visual_DVM_2021.Passes.All;
|
||||||
|
import Common.Global;
|
||||||
|
import TestingSystem.Common.TestingServer;
|
||||||
|
import TestingSystem.DVM.Configuration.Configuration;
|
||||||
|
import Visual_DVM_2021.Passes.Server.DeleteServerObject;
|
||||||
|
public class DeleteConfiguration extends DeleteServerObject<TestingServer, Configuration> {
|
||||||
|
public DeleteConfiguration() {
|
||||||
|
super(Global.testingServer, Configuration.class);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
package Visual_DVM_2021.Passes.All;
|
|
||||||
import TestingSystem.DVM.Configuration.Configuration;
|
|
||||||
import Visual_DVM_2021.Passes.DeleteSelectedServerObjects;
|
|
||||||
public class DeleteSelectedConfigurations extends DeleteSelectedServerObjects {
|
|
||||||
public DeleteSelectedConfigurations() {
|
|
||||||
super(Configuration.class);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,29 +1,10 @@
|
|||||||
package Visual_DVM_2021.Passes.All;
|
package Visual_DVM_2021.Passes.All;
|
||||||
import Common.Current;
|
|
||||||
import Common.Database.Database;
|
|
||||||
import Common.Global;
|
import Common.Global;
|
||||||
|
import TestingSystem.Common.TestingServer;
|
||||||
import TestingSystem.DVM.Configuration.Configuration;
|
import TestingSystem.DVM.Configuration.Configuration;
|
||||||
import Visual_DVM_2021.Passes.EditObjectPass;
|
import Visual_DVM_2021.Passes.Server.EditServerObject;
|
||||||
import Visual_DVM_2021.Passes.PassCode_2021;
|
public class EditConfiguration extends EditServerObject<TestingServer, Configuration> {
|
||||||
public class EditConfiguration extends EditObjectPass<Configuration> {
|
|
||||||
public EditConfiguration() {
|
public EditConfiguration() {
|
||||||
super(Configuration.class);
|
super(Global.testingServer, Configuration.class);
|
||||||
}
|
|
||||||
@Override
|
|
||||||
protected boolean canStart(Object... args) throws Exception {
|
|
||||||
if (Current.Check(Log, Current.Configuration)) {
|
|
||||||
return getTable().ShowEditObjectDialog(target= Current.getConfiguration());
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
protected Database getDb() {
|
|
||||||
return Global.testingServer.db;
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
protected void performDone() throws Exception {
|
|
||||||
super.performDone();
|
|
||||||
//отправка.
|
|
||||||
passes.get(PassCode_2021.EditConfigurationOnServer).Do(target);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,16 +0,0 @@
|
|||||||
package Visual_DVM_2021.Passes.All;
|
|
||||||
import Repository.Server.ServerCode;
|
|
||||||
import Repository.Server.ServerExchangeUnit_2021;
|
|
||||||
import TestingSystem.DVM.Configuration.Configuration;
|
|
||||||
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
|
|
||||||
public class EditConfigurationOnServer extends TestingSystemPass<Configuration> {
|
|
||||||
@Override
|
|
||||||
protected boolean canStart(Object... args) throws Exception {
|
|
||||||
target = (Configuration) args[0];
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
protected void ServerAction() throws Exception {
|
|
||||||
Command(new ServerExchangeUnit_2021(ServerCode.EditObject, "", target));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,42 +1,10 @@
|
|||||||
package Visual_DVM_2021.Passes.All;
|
package Visual_DVM_2021.Passes.All;
|
||||||
import Common.Current;
|
import Common.Global;
|
||||||
import Repository.Server.ServerCode;
|
import TestingSystem.Common.TestingServer;
|
||||||
import Repository.Server.ServerExchangeUnit_2021;
|
|
||||||
import TestingSystem.DVM.Configuration.Configuration;
|
import TestingSystem.DVM.Configuration.Configuration;
|
||||||
import Visual_DVM_2021.Passes.PassCode_2021;
|
import Visual_DVM_2021.Passes.Server.PublishServerObject;
|
||||||
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
|
public class PublishConfiguration extends PublishServerObject<TestingServer, Configuration> {
|
||||||
public class PublishConfiguration extends TestingSystemPass<Configuration> {
|
public PublishConfiguration() {
|
||||||
@Override
|
super(Global.testingServer, Configuration.class);
|
||||||
public String getIconPath() {
|
|
||||||
return "/icons/RedAdd.png";
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
public String getButtonText() {
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
protected boolean canStart(Object... args) throws Exception {
|
|
||||||
if (Current.getAccount().CheckRegistered(Log)) {
|
|
||||||
target = new Configuration();
|
|
||||||
target.genName();
|
|
||||||
target.sender_name = Current.getAccount().name;
|
|
||||||
target.sender_address = Current.getAccount().email;
|
|
||||||
return server.db.configurations.ShowAddObjectDialog(target);
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
protected void ServerAction() throws Exception {
|
|
||||||
Command(new ServerExchangeUnit_2021(ServerCode.PublishObject, "", target));
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
protected void performFinish() throws Exception {
|
|
||||||
super.performFinish();
|
|
||||||
passes.get(PassCode_2021.SynchronizeTests).Do();
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
protected void showDone() throws Exception {
|
|
||||||
super.showDone();
|
|
||||||
server.db.configurations.ui_.Show(target.getPK());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,12 +7,11 @@ import GlobalData.Machine.MachineType;
|
|||||||
import GlobalData.User.UserState;
|
import GlobalData.User.UserState;
|
||||||
import Repository.Server.ServerCode;
|
import Repository.Server.ServerCode;
|
||||||
import Repository.Server.ServerExchangeUnit_2021;
|
import Repository.Server.ServerExchangeUnit_2021;
|
||||||
import TestingSystem.DVM.Configuration.ConfigurationInterface;
|
|
||||||
import TestingSystem.Common.Group.Group;
|
import TestingSystem.Common.Group.Group;
|
||||||
|
import TestingSystem.Common.Test.Test;
|
||||||
import TestingSystem.DVM.Tasks.TestCompilationTask;
|
import TestingSystem.DVM.Tasks.TestCompilationTask;
|
||||||
import TestingSystem.DVM.Tasks.TestRunTask;
|
import TestingSystem.DVM.Tasks.TestRunTask;
|
||||||
import TestingSystem.DVM.TasksPackage.TasksPackage;
|
import TestingSystem.DVM.TasksPackage.TasksPackage;
|
||||||
import TestingSystem.Common.Test.Test;
|
|
||||||
import Visual_DVM_2021.Passes.PassCode_2021;
|
import Visual_DVM_2021.Passes.PassCode_2021;
|
||||||
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
|
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
|
||||||
|
|
||||||
@@ -79,7 +78,7 @@ public class StartTests extends TestingSystemPass<TasksPackage> {
|
|||||||
Test test
|
Test test
|
||||||
) {
|
) {
|
||||||
Vector<TestCompilationTask> compilationTasks = new Vector<>();
|
Vector<TestCompilationTask> compilationTasks = new Vector<>();
|
||||||
for (String flags : ConfigurationInterface.getFlags(configuration)) {
|
for (String flags : configuration.getFlags()) {
|
||||||
TestCompilationTask testCompilationTask = new TestCompilationTask(
|
TestCompilationTask testCompilationTask = new TestCompilationTask(
|
||||||
configuration,
|
configuration,
|
||||||
group,
|
group,
|
||||||
@@ -87,8 +86,8 @@ public class StartTests extends TestingSystemPass<TasksPackage> {
|
|||||||
flags
|
flags
|
||||||
);
|
);
|
||||||
testCompilationTask.runTasks = new Vector<>();
|
testCompilationTask.runTasks = new Vector<>();
|
||||||
Vector<String> matrixes = ConfigurationInterface.getMatrixes(configuration, test.dim);
|
Vector<String> matrixes = configuration.getMatrixes(test.dim);
|
||||||
Vector<String> environments = ConfigurationInterface.getEnvironments(configuration);
|
Vector<String> environments = configuration.getEnvironments();
|
||||||
for (String environmentSet : environments) {
|
for (String environmentSet : environments) {
|
||||||
if (flags.trim().equalsIgnoreCase("-s")) {
|
if (flags.trim().equalsIgnoreCase("-s")) {
|
||||||
testCompilationTask.runTasks.add(new TestRunTask(
|
testCompilationTask.runTasks.add(new TestRunTask(
|
||||||
@@ -98,7 +97,7 @@ public class StartTests extends TestingSystemPass<TasksPackage> {
|
|||||||
"",
|
"",
|
||||||
flags,
|
flags,
|
||||||
environmentSet,
|
environmentSet,
|
||||||
ConfigurationInterface.getParamsText(configuration)
|
configuration.getParamsText()
|
||||||
));
|
));
|
||||||
} else
|
} else
|
||||||
for (String matrix : matrixes) {
|
for (String matrix : matrixes) {
|
||||||
@@ -109,7 +108,7 @@ public class StartTests extends TestingSystemPass<TasksPackage> {
|
|||||||
matrix,
|
matrix,
|
||||||
flags,
|
flags,
|
||||||
environmentSet,
|
environmentSet,
|
||||||
ConfigurationInterface.getParamsText(configuration)));
|
configuration.getParamsText()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
compilationTasks.add(testCompilationTask);
|
compilationTasks.add(testCompilationTask);
|
||||||
@@ -145,7 +144,7 @@ public class StartTests extends TestingSystemPass<TasksPackage> {
|
|||||||
//2 Проверяем выбраны ли группы.
|
//2 Проверяем выбраны ли группы.
|
||||||
configurations_lines.add("Конфигурации: ");
|
configurations_lines.add("Конфигурации: ");
|
||||||
for (TestingSystem.DVM.Configuration.Configuration configuration : server.db.configurations.getCheckedItems()) {
|
for (TestingSystem.DVM.Configuration.Configuration configuration : server.db.configurations.getCheckedItems()) {
|
||||||
configurations_lines.add(ConfigurationInterface.getSummary(configuration));
|
configurations_lines.add(configuration.getSummary());
|
||||||
groups_lines.add("Группы: ");
|
groups_lines.add("Группы: ");
|
||||||
for (Group group : server.db.groups.getCheckedItems()) {
|
for (Group group : server.db.groups.getCheckedItems()) {
|
||||||
groups_lines.add(group.getSummary());
|
groups_lines.add(group.getSummary());
|
||||||
|
|||||||
@@ -254,10 +254,8 @@ public enum PassCode_2021 {
|
|||||||
//-
|
//-
|
||||||
PublishConfiguration,
|
PublishConfiguration,
|
||||||
EditConfiguration,
|
EditConfiguration,
|
||||||
EditConfigurationOnServer,
|
|
||||||
//-
|
//-
|
||||||
StartTests,
|
StartTests,
|
||||||
DeleteSelectedConfigurations,
|
|
||||||
SwitchTestingEmail,
|
SwitchTestingEmail,
|
||||||
//-
|
//-
|
||||||
DownloadTaskTest,
|
DownloadTaskTest,
|
||||||
@@ -301,12 +299,15 @@ public enum PassCode_2021 {
|
|||||||
PublishServerSapfor,
|
PublishServerSapfor,
|
||||||
PublishTestProject,
|
PublishTestProject,
|
||||||
DeleteTest,
|
DeleteTest,
|
||||||
|
DeleteConfiguration,
|
||||||
//->
|
//->
|
||||||
TestPass;
|
TestPass;
|
||||||
public String getDescription() {
|
public String getDescription() {
|
||||||
switch (this) {
|
switch (this) {
|
||||||
case Undefined:
|
case Undefined:
|
||||||
return "?";
|
return "?";
|
||||||
|
case DeleteConfiguration:
|
||||||
|
return "Удалить конфигурацию";
|
||||||
case DeleteTest:
|
case DeleteTest:
|
||||||
return "Удалить тест";
|
return "Удалить тест";
|
||||||
case PublishServerSapfor:
|
case PublishServerSapfor:
|
||||||
@@ -437,16 +438,12 @@ public enum PassCode_2021 {
|
|||||||
return "Загрузить тест текущей задачи";
|
return "Загрузить тест текущей задачи";
|
||||||
case SwitchTestingEmail:
|
case SwitchTestingEmail:
|
||||||
return "Настроить отправку оповещений тестирования";
|
return "Настроить отправку оповещений тестирования";
|
||||||
case DeleteSelectedConfigurations:
|
|
||||||
return "Удалить отмеченные конфигурации";
|
|
||||||
case StartTests:
|
case StartTests:
|
||||||
return "Запуск тестов";
|
return "Запуск тестов";
|
||||||
case PublishConfiguration:
|
case PublishConfiguration:
|
||||||
return "Опубликовать конфигурацию тестирования";
|
return "Опубликовать конфигурацию тестирования";
|
||||||
case EditConfiguration:
|
case EditConfiguration:
|
||||||
return "Просмотр/Редактирование конфигурацию тестирования";
|
return "Просмотр/Редактирование конфигурацию тестирования";
|
||||||
case EditConfigurationOnServer:
|
|
||||||
return "Редактировать конфигурацию на сервере";
|
|
||||||
case SPF_GetMaxMinBlockDistribution:
|
case SPF_GetMaxMinBlockDistribution:
|
||||||
return "Определить размерность теста по DVM директивам";
|
return "Определить размерность теста по DVM директивам";
|
||||||
case PauseTesting:
|
case PauseTesting:
|
||||||
|
|||||||
Reference in New Issue
Block a user