процесс рефакторинга. Так как нужно запускать тесты на многих флагах, понадобилось внести дополнительные объекты.

This commit is contained in:
2023-09-27 00:43:23 +03:00
parent 0026701347
commit 42338700f4
25 changed files with 297 additions and 193 deletions

View File

@@ -19,10 +19,8 @@ import ProjectData.SapforData.Functions.FuncInfo;
import ProjectData.SapforData.Regions.ParallelRegion;
import Repository.BugReport.BugReport;
import Repository.Subscribes.Subscriber;
import TestingSystem.Configuration.Configuration;
import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
import SapforTestingSystem.SapforTask.SapforTask_2023;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
import TestingSystem.Configuration.Configuration;
import TestingSystem.Tasks.TestCompilationTask;
import TestingSystem.Tasks.TestRunTask;
import TestingSystem.TasksPackage.TasksPackage;
@@ -35,6 +33,7 @@ import java.util.LinkedHashMap;
public enum Current {
Undefined,
//--
SapforScenario,
SapforEtalonTaskResult,//самый левый пакет
SapforTaskResult,
//--
@@ -270,8 +269,8 @@ public enum Current {
public static boolean HasSapforTasksPackage() {
return get(Current.SapforTasksPackage) != null;
}
public static SapforTasksPackage_2023 getSapforTasksPackage() {
return (SapforTasksPackage_2023) get(Current.SapforTasksPackage);
public static SapforTestingSystem.SapforTasksPackage.SapforTasksPackage getSapforTasksPackage() {
return (SapforTestingSystem.SapforTasksPackage.SapforTasksPackage) get(Current.SapforTasksPackage);
}
//-
public static DefaultMutableTreeNode getProjectNode() {
@@ -346,8 +345,8 @@ public enum Current {
public static boolean HasSapforTask() {
return get(Current.SapforTask) != null;
}
public static SapforTask_2023 getSapforTask() {
return (SapforTask_2023) get(Current.SapforTask);
public static SapforTestingSystem.SapforTask.SapforTask getSapforTask() {
return (SapforTestingSystem.SapforTask.SapforTask) get(Current.SapforTask);
}
public static ProjectData.ProjectView getProjectView() {
return (ProjectData.ProjectView) get(ProjectView);
@@ -375,17 +374,25 @@ public enum Current {
return (get(name) != null) && (((iDBObject) get(name)).id == id);
}
public static SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand getSapforConfigurationCommand() {
return (SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand) get(Current.SapforConfigurationCommand);
return (SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand) get(Current.SapforConfigurationCommand);
}
public static boolean HasSapforProfile() {
return get(Current.SapforProfile)!=null;
return get(Current.SapforProfile) != null;
}
public static GlobalData.SapforProfile.SapforProfile getSapforProfile(){
public static GlobalData.SapforProfile.SapforProfile getSapforProfile() {
return (GlobalData.SapforProfile.SapforProfile) get(Current.SapforProfile);
}
public static boolean HasSapforScenario() {
return get(Current.SapforScenario) != null;
}
public static SapforTestingSystem.SapforScenario.SapforScenario getSapforScenario() {
return (SapforTestingSystem.SapforScenario.SapforScenario) get(Current.SapforScenario);
}
//--------------------------------------------
public String getDescription() {
switch (this) {
case SapforScenario:
return "сценарий SAPFOR";
case SapforProfile:
return "Профиль SAPFOR";
case SapforProfileSetting:

View File

@@ -11,6 +11,8 @@ import java.nio.charset.Charset;
import java.util.LinkedHashMap;
import java.util.Stack;
import java.util.Vector;
//рудимент.
public class PackageModeSupervisor {
Thread interruptThread = new InterruptThread(5000, () -> {
System.exit(0);

View File

@@ -1,8 +1,7 @@
package Common.UI.Menus_2023.SapforTasksPackagesBar;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class SapforTasksPackagesBar extends DataMenuBar {
public SapforTasksPackagesBar() {
super("пакеты задач", PassCode_2021.DeleteSapforTasksPackage);
super("пакеты задач");
}
}

View File

@@ -68,6 +68,7 @@ import ProjectData.SapforData.Variants.VariantsSet;
import Repository.BugReport.BugReportsDBTable;
import Repository.Component.UI.ComponentsForm;
import Repository.Subscribes.SubsribersDBTable;
import SapforTestingSystem.SapforScenario.SapforScenariosDBTable;
import TestingSystem.Configuration.UI.ConfigurationDBTable;
import TestingSystem.Group.GroupsDBTable;
import SapforTestingSystem.SapforConfiguration.SapforConfigurationDBTable;
@@ -230,6 +231,7 @@ public class UI {
menuBars.put(SapforConfigurationDBTable.class, new SapforConfigurationsMenuBar());
menuBars.put(SapforConfigurationCommandsDBTable.class, new SapforConfigurationCommandsMenuBar());
menuBars.put(RemoteSapforsDBTable.class, new RemoteSapforsMenuBar());
menuBars.put(SapforScenariosDBTable.class, new DataMenuBar("сценарии"));
menuBars.put(SapforTasksPackagesDBTable.class, new SapforTasksPackagesBar());
menuBars.put(SapforTasksDBTable.class, new SapforTasksMenuBar());
//---->>