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 16:03:39 +03:00
parent d4d8d255fb
commit 3e55bdec38
5 changed files with 23 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
.idea/workspace.xml generated
View File

@@ -8,31 +8,9 @@
<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/Current.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Current.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.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/Common/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.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/DVMConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/DVMConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/UI/ConfigurationFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/UI/ConfigurationFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartCurrentDVMConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteConfiguration.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/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/SaveCurrentDVMConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveCurrentDVMConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveCurrentDVMPackage.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCurrentDVMConfigurationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCurrentDVMConfigurationTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCurrentDVMPackage.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartCurrentDVMConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartCurrentDVMConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartDVMPackage.java" beforeDir="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" /> <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" />

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

@@ -13,7 +13,7 @@ public class DVMConfigurationsMenuBar extends DataMenuBar {
PassCode_2021.SaveCurrentDVMConfiguration, PassCode_2021.SaveCurrentDVMConfiguration,
PassCode_2021.DeleteConfiguration, PassCode_2021.DeleteConfiguration,
PassCode_2021.StartCurrentDVMConfiguration PassCode_2021.StartSelectedDVMConfigurations
); );
} }
} }

16
src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
View File

@@ -11,21 +11,11 @@ public class DVMPackagesBar extends DataMenuBar {
super("пакеты задач DVM"); super("пакеты задач DVM");
addPasses(PassCode_2021.SynchronizeTests); addPasses(PassCode_2021.SynchronizeTests);
addSeparator(); addSeparator();
//addMenus(new AddDVMPackageMenu()); addPasses(PassCode_2021.AbortDVMPackage );
addPasses(PassCode_2021.AddDVMPackage
// PassCode_2021.AddTasksToDVMPackage
);
addSeparator();
// addPasses(PassCode_2021.CloneDVMPackage);
addSeparator();
addPasses(PassCode_2021.DeleteDVMPackage);
addSeparator();
addPasses(PassCode_2021.AbortDVMPackage);
addSeparator(); addSeparator();
addPasses(PassCode_2021.DownloadDVMPackage, addPasses(PassCode_2021.DownloadDVMPackage,
PassCode_2021.ExportDVMPackageToExcel); PassCode_2021.ExportDVMPackageToExcel,
PassCode_2021.DeleteDVMPackage);
add(new JSeparator()); add(new JSeparator());
add(new MenuBarButton() { add(new MenuBarButton() {
{ {

28
src/Visual_DVM_2021/Passes/All/StartCurrentDVMConfiguration.java → src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java
View File

@@ -18,14 +18,14 @@ import Visual_DVM_2021.Passes.Server.PublishServerObject;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Vector; import java.util.Vector;
public class StartCurrentDVMConfiguration extends PublishServerObject<TestingServer, DVMPackage> { public class StartSelectedDVMConfigurations extends PublishServerObject<TestingServer, DVMPackage> {
Vector<DVMConfiguration> configurations; Vector<DVMConfiguration> configurations;
Vector<Group> groups; Vector<Group> groups;
Vector<Test> tests; Vector<Test> tests;
LinkedHashMap<Integer, Vector<Test>> testByGroups; LinkedHashMap<Integer, Vector<Test>> testByGroups;
Vector<DVMCompilationTask> tasks; Vector<DVMCompilationTask> tasks;
int tasks_count; int tasks_count;
public StartCurrentDVMConfiguration() { public StartSelectedDVMConfigurations() {
super(Global.testingServer, DVMPackage.class); super(Global.testingServer, DVMPackage.class);
} }
//пока пусть будет одна конфигурация и один пакет. //пока пусть будет одна конфигурация и один пакет.
@@ -103,7 +103,7 @@ public class StartCurrentDVMConfiguration extends PublishServerObject<TestingSer
//-- //--
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
configurations = new Vector<>(); configurations = Global.testingServer.db.dvm_configurations.getCheckedOrCurrent();
groups = new Vector<>(); groups = new Vector<>();
tests = new Vector<>(); tests = new Vector<>();
testByGroups = new LinkedHashMap<>(); testByGroups = new LinkedHashMap<>();
@@ -113,7 +113,8 @@ public class StartCurrentDVMConfiguration extends PublishServerObject<TestingSer
if (!Current.getAccount().CheckRegistered(Log)) { if (!Current.getAccount().CheckRegistered(Log)) {
return false; return false;
} }
if (!Current.Check(Log, Current.DVMConfiguration)) { if (configurations.isEmpty()){
Log.Writeln_("Не отмечено ни одной конфигурации, или отсутствует текущая конфигурация.");
return false; return false;
} }
if (Current.Check(Log, Current.Machine, Current.User, Current.Compiler)) { if (Current.Check(Log, Current.Machine, Current.User, Current.Compiler)) {
@@ -139,16 +140,15 @@ public class StartCurrentDVMConfiguration extends PublishServerObject<TestingSer
Current.getCompiler() Current.getCompiler()
); );
//---- //----
DVMConfiguration configuration = Current.getDVMConfiguration(); for (DVMConfiguration configuration: configurations) {
configurations.add(configuration); groups = configuration.getGroups();
//-- tests = configuration.getTests(groups, testByGroups);
groups = configuration.getGroups(); //--
tests = configuration.getTests(groups, testByGroups); for (Group group : groups) {
//-- Vector<Test> groupTests = testByGroups.get(group.id);
for (Group group : groups) { for (Test test : groupTests)
Vector<Test> groupTests = testByGroups.get(group.id); tasks.addAll(createTasksCGT(configuration, group, test));
for (Test test : groupTests) }
tasks.addAll(createTasksCGT(configuration, group, test));
} }
return UI.Question("Будет запущено " + tasks_count + " задач. Продолжить"); return UI.Question("Будет запущено " + tasks_count + " задач. Продолжить");
} }

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

@@ -343,15 +343,15 @@ public enum PassCode_2021 {
GetOldBugReports, GetOldBugReports,
ShowCurrentDVMConfigurationTests, ShowCurrentDVMConfigurationTests,
SaveCurrentDVMConfiguration, SaveCurrentDVMConfiguration,
StartCurrentDVMConfiguration, StartSelectedDVMConfigurations,
; ;
//-- //--
public String getDescription() { public String getDescription() {
switch (this) { switch (this) {
case Undefined: case Undefined:
return "?"; return "?";
case StartCurrentDVMConfiguration: case StartSelectedDVMConfigurations:
return "Запустить текущую конфигурацию тестирования DVM системы"; return "Запустить отмеченные конфигурации тестирования DVM системы";
case ShowCurrentDVMConfigurationTests: case ShowCurrentDVMConfigurationTests:
return "Отметить группы и тесты, участвующие в текущей конфигурации DVM системы"; return "Отметить группы и тесты, участвующие в текущей конфигурации DVM системы";
case SaveCurrentDVMConfiguration: case SaveCurrentDVMConfiguration: