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

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

Browse Source
This commit is contained in:
02090095
2023-09-27 00:43:23 +03:00
parent 0026701347
commit 42338700f4
25 changed files with 297 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
.idea/workspace.xml generated
View File

@@ -7,11 +7,30 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/SapforTestingSystem/ThreadTask/ThreadTask.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/SapforTestingSystem/ThreadsPlanner/ThreadsPlanner.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforScenario/SapforScenario.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforScenario/SapforScenariosDBTable.java" 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/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java" 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/Common/ModesSupervisors/PackageModeSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/ModesSupervisors/PackageModeSupervisor.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/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/ScenarioResults_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/ScenarioResults_json.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTaskResult.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTaskResult.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask_2023.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage_2023.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AnalyseSapforPackageResults.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AnalyseSapforPackageResults.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenSapforTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenSapforTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PerformSapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PerformSapforTasksPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PerformScenario.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PerformScenario.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.java" 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/Visual_DVM_2021/UI/Main/SapforTasksComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforTasksComparisonForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

27
src/Common/Current.java
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:

2
src/Common/ModesSupervisors/PackageModeSupervisor.java
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);

3
src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java
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("пакеты задач");
}
}

2
src/Common/UI/UI.java
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());
//---->>

23
src/GlobalData/GlobalDatabase.java
View File

@@ -33,10 +33,11 @@ import GlobalData.Tasks.CompilationTask.CompilationTasksDBTable;
import GlobalData.Tasks.RunTask.RunTasksDBTable;
import GlobalData.User.UsersDBTable;
import Repository.Component.ComponentType;
import SapforTestingSystem.SapforScenario.SapforScenariosDBTable;
import SapforTestingSystem.SapforTask.SapforTaskResult;
import SapforTestingSystem.SapforTask.SapforTask_2023;
import SapforTestingSystem.SapforTask.SapforTask;
import SapforTestingSystem.SapforTask.SapforTasksDBTable;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackagesDBTable;
import TestingSystem.TaskKey.TaskKeysDBTable;
import Visual_DVM_2021.PassStats.PassStatsDBTable;
@@ -74,6 +75,7 @@ public class GlobalDatabase extends SQLiteDatabase {
//-
public TaskKeysDBTable tasksKeys;
//---------
public SapforScenariosDBTable sapforScenarios;
public SapforTasksPackagesDBTable sapforTasksPackages;
public SapforTasksDBTable sapforTasks = null;
public SapforProfilesDBTable sapforProfiles = null;
@@ -107,6 +109,7 @@ public class GlobalDatabase extends SQLiteDatabase {
addTable(grids = new GridsDBTable());
addTable(tasksKeys = new TaskKeysDBTable());
//--
addTable(sapforScenarios = new SapforScenariosDBTable());
addTable(sapforTasksPackages = new SapforTasksPackagesDBTable());
addTable(sapforTasks = new SapforTasksDBTable());
//--
@@ -156,16 +159,16 @@ public class GlobalDatabase extends SQLiteDatabase {
Global.properties.Update();
return res;
}
public LinkedHashMap<Long, SapforTask_2023> getSapforPackageTasks(int package_id) throws Exception {
LinkedHashMap<Long, SapforTask_2023> res = new LinkedHashMap<>();
for (SapforTask_2023 task : sapforTasks.Data.values()) {
public LinkedHashMap<Long, SapforTask> getSapforPackageTasks(int package_id) throws Exception {
LinkedHashMap<Long, SapforTask> res = new LinkedHashMap<>();
for (SapforTask task : sapforTasks.Data.values()) {
if (task.sapfortaskspackage_2023_id == package_id) {
res.put(task.id, task);
}
}
return res;
}
public DataSet<String, SapforTaskResult> getSapforPackagesMasterDataSet(SapforTasksPackage_2023 package_in) throws Exception {
public DataSet<String, SapforTaskResult> getSapforPackagesMasterDataSet(SapforTasksPackage package_in) throws Exception {
DataSet<String, SapforTaskResult> res = new DataSet<String, SapforTaskResult>(String.class, SapforTaskResult.class) {
@Override
protected DataSetControlForm createUI() {
@@ -204,13 +207,13 @@ public class GlobalDatabase extends SQLiteDatabase {
return Current.SapforEtalonTaskResult;
}
};
for (SapforTask_2023 task : sapforTasks.Data.values())
for (SapforTask task : sapforTasks.Data.values())
if (task.sapfortaskspackage_2023_id == package_in.id)
res.put(task.test_description, new SapforTaskResult(package_in, task));
return res;
}
//--
public DataSet<String, SapforTaskResult> getSapforPackagesSlaveDataSet(SapforTasksPackage_2023 package_in) throws Exception {
public DataSet<String, SapforTaskResult> getSapforPackagesSlaveDataSet(SapforTasksPackage package_in) throws Exception {
DataSet<String, SapforTaskResult> res = new DataSet<String, SapforTaskResult>(String.class, SapforTaskResult.class) {
@Override
protected DataSetControlForm createUI() {
@@ -222,7 +225,7 @@ public class GlobalDatabase extends SQLiteDatabase {
}
@Override
public void MouseAction2() throws Exception {
Pass_2021.passes.get(PassCode_2021.OpenSapforTest).Do(Current.SapforTaskResult);
Pass_2021.passes.get(PassCode_2021.OpenSapforTest).Do(Current.SapforTaskResult);
}
@Override
public void ShowCurrentObject() throws Exception {
@@ -253,7 +256,7 @@ public class GlobalDatabase extends SQLiteDatabase {
return Current.SapforTaskResult;
}
};
for (SapforTask_2023 task : sapforTasks.Data.values())
for (SapforTask task : sapforTasks.Data.values())
if (task.sapfortaskspackage_2023_id == package_in.id)
res.put(task.test_description, new SapforTaskResult(package_in, task));
return res;

4
src/SapforTestingSystem/Json/ScenarioResults_json.java
View File

@@ -1,10 +1,10 @@
package SapforTestingSystem.Json;
import SapforTestingSystem.SapforTask.SapforTask_2023;
import SapforTestingSystem.SapforTask.SapforTask;
import com.google.gson.annotations.Expose;
import java.util.List;
import java.util.Vector;
public class ScenarioResults_json {
@Expose
public List<SapforTask_2023> tasks = new Vector<>();
public List<SapforTask> tasks = new Vector<>();
}

23
src/SapforTestingSystem/SapforScenario/SapforScenario.java Normal file
View File

@@ -0,0 +1,23 @@
package SapforTestingSystem.SapforScenario;
import Common.Current;
import Common.Database.iDBObject;
import TestingSystem.TasksPackage.TasksPackageState;
import com.sun.org.glassfish.gmbal.Description;
public class SapforScenario extends iDBObject {
@Description("DEFAULT ''")
public String passesNames = ""; //имена преобразований через ;
@Description("DEFAULT ''")
public String testsNames = "";//имена тестов через ;
//---
public String sapfor_version = "?";
//---
public String workspace = "";
//---
public int tasksCount = 0;
//---
public double Time; //время выполнения.
public long StartDate = 0; //дата начала выполнения
public long ChangeDate = 0;//дата окончания выполнения
//-
public TasksPackageState state = TasksPackageState.Queued;
}

89
src/SapforTestingSystem/SapforScenario/SapforScenariosDBTable.java Normal file
View File

@@ -0,0 +1,89 @@
package SapforTestingSystem.SapforScenario;
import Common.Current;
import Common.Database.*;
import Common.UI.DataSetControlForm;
import SapforTestingSystem.SapforTask.SapforTask;
import java.util.Date;
import java.util.LinkedHashMap;
import static Common.UI.Tables.TableRenderers.RendererDate;
import static Common.UI.Tables.TableRenderers.RendererStatusEnum;
public class SapforScenariosDBTable extends iDBTable<SapforScenario> {
public SapforScenariosDBTable() {
super(SapforScenario.class);
}
@Override
public Current CurrentName() {
return Current.SapforScenario;
}
@Override
public String getSingleDescription() {
return "сценарий Sapfor";
}
@Override
public String getPluralDescription() {
return "сценарии Sapfor";
}
@Override
protected DataSetControlForm createUI() {
return new DataSetControlForm(this) {
@Override
protected void AdditionalInitColumns() {
columns.get(5).setRenderer(RendererDate);
columns.get(6).setRenderer(RendererDate);
columns.get(7).setRenderer(RendererStatusEnum);
}
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
// UI.getNewMainWindow().getTestingWindow().DropTestRunTasksComparison();
}
@Override
public void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
// UI.getNewMainWindow().getTestingWindow().DropTestRunTasksComparison();
}
};
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"SAPFOR",
"Проходы",
"Тесты",
"Задач",
"Начало",
"Изменено",
"Статус"
};
}
@Override
public Object getFieldAt(SapforScenario object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.sapfor_version;
case 2:
return object.passesNames;
case 3:
return object.testsNames;
case 4:
return object.tasksCount;
case 5:
return new Date(object.StartDate);
case 6:
return new Date(object.ChangeDate);
case 7:
return object.state;
default:
return null;
}
}
@Override
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
res.put(SapforTask.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
return res;
}
}

8
src/SapforTestingSystem/SapforTask/SapforTask_2023.java → src/SapforTestingSystem/SapforTask/SapforTask.java
View File

@@ -7,7 +7,7 @@ import com.google.gson.annotations.Expose;
import com.sun.org.glassfish.gmbal.Description;
import java.util.Vector;
public class SapforTask_2023 extends DBObject {
public class SapforTask extends DBObject {
//------------------------------------>>
@Description("PRIMARY KEY, UNIQUE")
@Expose
@@ -34,9 +34,9 @@ public class SapforTask_2023 extends DBObject {
@Expose
public int versions_tree_built = 0;
//-----------
public SapforTask_2023() {
public SapforTask() {
}
public SapforTask_2023(SapforTask_2023 src) {
public SapforTask(SapforTask src) {
this.SynchronizeFields(src);
}
@Override
@@ -46,7 +46,7 @@ public class SapforTask_2023 extends DBObject {
@Override
public void SynchronizeFields(DBObject object) {
super.SynchronizeFields(object);
SapforTask_2023 t = (SapforTask_2023) object;
SapforTask t = (SapforTask) object;
id = t.id;
sapfortaskspackage_2023_id = t.sapfortaskspackage_2023_id;
test_description = t.test_description;

8
src/SapforTestingSystem/SapforTask/SapforTaskResult.java
View File

@@ -1,15 +1,15 @@
package SapforTestingSystem.SapforTask;
import Common.Database.DBObject;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
public class SapforTaskResult extends DBObject {
public SapforTasksPackage_2023 sapforTasksPackage;
public SapforTask_2023 task;
public SapforTasksPackage sapforTasksPackage;
public SapforTask task;
public MatchState match_state = MatchState.Unknown;
@Override
public Object getPK() {
return task.test_description;
}
public SapforTaskResult(SapforTasksPackage_2023 package_in, SapforTask_2023 task_in) {
public SapforTaskResult(SapforTasksPackage package_in, SapforTask task_in) {
sapforTasksPackage = package_in;
task = task_in;
}

6
src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java
View File

@@ -6,9 +6,9 @@ import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import static Common.UI.Tables.TableRenderers.RendererStatusEnum;
public class SapforTasksDBTable extends DBTable<Long, SapforTask_2023> {
public class SapforTasksDBTable extends DBTable<Long, SapforTask> {
public SapforTasksDBTable() {
super(Long.class, SapforTask_2023.class);
super(Long.class, SapforTask.class);
}
@Override
public String getSingleDescription() {
@@ -43,7 +43,7 @@ public class SapforTasksDBTable extends DBTable<Long, SapforTask_2023> {
};
}
@Override
public Object getFieldAt(SapforTask_2023 object, int columnIndex) {
public Object getFieldAt(SapforTask object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.test_description;

43
src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage_2023.java → src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java
View File

@@ -1,15 +1,16 @@
package SapforTestingSystem.SapforTasksPackage;
import Common.Current;
import Common.Database.DBObject;
import Common.Database.iDBObject;
import Common.Utils.Utils;
import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
import TestingSystem.TasksPackage.TasksPackageState;
import TestingSystem.Test.Test;
import Visual_DVM_2021.Passes.PassCode_2021;
import com.sun.org.glassfish.gmbal.Description;
import java.util.Vector;
public class SapforTasksPackage_2023 extends iDBObject {
public String summary = "";
public class SapforTasksPackage extends iDBObject {
public int sapforscenario_id = Utils.Nan;
//----
public int FREE_FORM = 0; //"Свободный выходной стиль"; -f90
public int STATIC_SHADOW_ANALYSIS = 0;//"Оптимизация теневых обменов"; -sh
@@ -20,39 +21,15 @@ public class SapforTasksPackage_2023 extends iDBObject {
//---
@Description("DEFAULT ''")
public String flags = "";
@Description("DEFAULT ''")
public String passesNames = ""; //имена преобразований через ;
@Description("DEFAULT ''")
public String testsNames = "";//имена тестов через ;
//---
public String sapfor_version = "?";
//---
public String workspace = "";
//---
public int tasksCount = 0;
@Description("DEFAULT 0")
public int versions_tree_built = 0;
//---
public double Time; //время выполнения.
public long StartDate = 0; //дата начала выполнения
public long ChangeDate = 0;//дата окончания выполнения
@Description("DEFAULT ''")
public String sapforconfiguration_id = "";
//-
public TasksPackageState state = TasksPackageState.Queued;
//--
@Override
public void SynchronizeFields(DBObject src) {
super.SynchronizeFields(src);
SapforTasksPackage_2023 tasksPackage = (SapforTasksPackage_2023) src;
summary = tasksPackage.summary;
sapfor_version = tasksPackage.sapfor_version;
tasksCount = tasksPackage.tasksCount;
Time = tasksPackage.Time;
StartDate = tasksPackage.StartDate;
ChangeDate = tasksPackage.ChangeDate;
state = tasksPackage.state;
workspace = tasksPackage.workspace;
SapforTasksPackage tasksPackage = (SapforTasksPackage) src;
//---
flags = tasksPackage.flags;
//---
@@ -63,17 +40,21 @@ public class SapforTasksPackage_2023 extends iDBObject {
KEEP_SPF_DIRECTIVES = tasksPackage.KEEP_SPF_DIRECTIVES;
KEEP_DVM_DIRECTIVES = tasksPackage.KEEP_DVM_DIRECTIVES;
}
public SapforTasksPackage_2023(SapforTasksPackage_2023 src) {
public SapforTasksPackage(SapforTasksPackage src) {
this.SynchronizeFields(src);
}
public SapforTasksPackage_2023() {
public SapforTasksPackage() {
}
//----
@Description("IGNORE")
public Vector<Test> tests = null;
@Description("IGNORE")
public Vector<PassCode_2021> codes = null;
public SapforTasksPackage_2023(SapforConfiguration configuration_in, Vector<Test> tests_in) {
public SapforTasksPackage(SapforConfiguration configuration_in, Vector<Test> tests_in) {
}
@Override
public boolean isVisible() {
return Current.HasSapforScenario() && Current.getSapforScenario().id == sapforscenario_id;
}
}

44
src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java
View File

@@ -2,16 +2,12 @@ package SapforTestingSystem.SapforTasksPackage;
import Common.Current;
import Common.Database.*;
import Common.UI.DataSetControlForm;
import SapforTestingSystem.SapforTask.SapforTask_2023;
import SapforTestingSystem.SapforTask.SapforTask;
import java.util.Date;
import java.util.LinkedHashMap;
import static Common.UI.Tables.TableRenderers.RendererDate;
import static Common.UI.Tables.TableRenderers.RendererStatusEnum;
public class SapforTasksPackagesDBTable extends iDBTable<SapforTasksPackage_2023> {
public class SapforTasksPackagesDBTable extends iDBTable<SapforTasksPackage> {
public SapforTasksPackagesDBTable() {
super(SapforTasksPackage_2023.class);
super(SapforTasksPackage.class);
}
@Override
public Current CurrentName() {
@@ -28,12 +24,6 @@ public class SapforTasksPackagesDBTable extends iDBTable<SapforTasksPackage_2023
@Override
protected DataSetControlForm createUI() {
return new DataSetControlForm(this) {
@Override
protected void AdditionalInitColumns() {
columns.get(7).setRenderer(RendererDate);
columns.get(8).setRenderer(RendererDate);
columns.get(9).setRenderer(RendererStatusEnum);
}
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
@@ -53,44 +43,22 @@ public class SapforTasksPackagesDBTable extends iDBTable<SapforTasksPackage_2023
@Override
public String[] getUIColumnNames() {
return new String[]{
"SAPFOR",
"Флаги",
"Проходы",
"Тесты",
"Задач",
"Начало",
"Изменено",
"Статус"
};
}
@Override
public Object getFieldAt(SapforTasksPackage_2023 object, int columnIndex) {
public Object getFieldAt(SapforTasksPackage object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.sapfor_version;
case 3:
case 1:
return object.flags;
case 4:
return object.passesNames;
case 5:
return object.testsNames;
case 6:
return object.tasksCount;
case 7:
return new Date(object.StartDate);
case 8:
return new Date(object.ChangeDate);
case 9:
return object.state;
default:
return null;
}
}
@Override
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
res.put(SapforTask_2023.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
res.put(SapforTask.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
return res;
}
}

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

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Global;
import Common.Utils.Utils;
import SapforTestingSystem.SapforTask.SapforTask_2023;
import SapforTestingSystem.SapforTask.SapforTask;
import SapforTestingSystem.Json.ScenarioResults_json;
import Visual_DVM_2021.Passes.Pass_2021;
import org.apache.commons.io.FileUtils;
@@ -30,7 +30,7 @@ public class AnalyseSapforPackageResults extends Pass_2021<ScenarioResults_json>
}
@Override
protected void body() throws Exception {
for (SapforTask_2023 task: target.tasks) {
for (SapforTask task: target.tasks) {
task.id=Global.db.IncSapforMaxTaskId();
Global.db.Insert(task);
}

11
src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java
View File

@@ -3,14 +3,11 @@ import Common.Current;
import Common.Database.Database;
import Common.Global;
import Common.UI.UI;
import Common.Utils.Utils;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import Visual_DVM_2021.Passes.DeleteObjectPass;
import java.io.File;
public class DeleteSapforTasksPackage extends DeleteObjectPass<SapforTasksPackage_2023> {
public class DeleteSapforTasksPackage extends DeleteObjectPass<SapforTasksPackage> {
public DeleteSapforTasksPackage() {
super(SapforTasksPackage_2023.class);
super(SapforTasksPackage.class);
}
@Override
protected Database getDb() {
@@ -25,6 +22,6 @@ public class DeleteSapforTasksPackage extends DeleteObjectPass<SapforTasksPackag
@Override
protected void body() throws Exception {
super.body();
Utils.delete_with_check(new File(target.workspace));
// Utils.delete_with_check(new File(target.workspace));
}
}

8
src/Visual_DVM_2021/Passes/All/OpenSapforTest.java
View File

@@ -1,14 +1,12 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.Global;
import Common.Utils.Utils;
import ProjectData.Files.DBProjectFile;
import ProjectData.LanguageName;
import ProjectData.Messages.Errors.MessageError;
import ProjectData.Project.db_project_info;
import SapforTestingSystem.SapforTask.SapforTaskResult;
import SapforTestingSystem.SapforTask.SapforTask_2023;
import SapforTestingSystem.Json.SapforVersion_json;
import SapforTestingSystem.SapforTask.SapforTaskResult;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import org.apache.commons.io.FileUtils;
@@ -204,9 +202,10 @@ public class OpenSapforTest extends Pass_2021<SapforTaskResult> {
}
@Override
protected void body() throws Exception {
/*
File resultsFile = Paths.get(target.sapforTasksPackage.workspace, target.task.test_description, db_project_info.data, "results.txt").toFile();
String resultsText = FileUtils.readFileToString(resultsFile);
SapforTask_2023 savedTask = Utils.gson.fromJson(resultsText, SapforTask_2023.class);
SapforTask savedTask = Utils.gson.fromJson(resultsText, SapforTask.class);
//--->>
if (target.task.versions_tree_built == 0) {
ShowMessage1("Построение дерева версий..");
@@ -221,6 +220,7 @@ public class OpenSapforTest extends Pass_2021<SapforTaskResult> {
last_version = savedTask.variants.lastElement().version;
} else if (!savedTask.versions.isEmpty())
last_version = savedTask.versions.lastElement().version;
*/
}
@Override
protected boolean validate() {

6
src/Visual_DVM_2021/Passes/All/PerformSapforTasksPackage.java
View File

@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
import Common.Utils.Utils;
import GlobalData.Tasks.TaskState;
import ProjectData.Project.db_project_info;
import SapforTestingSystem.SapforTask.SapforTask_2023;
import SapforTestingSystem.SapforTask.SapforTask;
import SapforTestingSystem.Json.SapforVersion_json;
import SapforTestingSystem.Json.ScenarioResults_json;
import SapforTestingSystem.Json.Scenario_json;
@@ -35,7 +35,7 @@ public class PerformSapforTasksPackage extends Pass_2021<Scenario_json> {
//--
ScenarioResults_json results;
//-
SapforTask_2023 taskResult = null;
SapforTask taskResult = null;
//--
@Override
protected boolean canStart(Object... args) throws Exception {
@@ -56,7 +56,7 @@ public class PerformSapforTasksPackage extends Pass_2021<Scenario_json> {
//--
parentTask = new File(packageWorkspace, test);
//--
taskResult = new SapforTask_2023();
taskResult = new SapforTask();
taskResult.test_description = test;
taskResult.sapfortaskspackage_2023_id = Integer.parseInt(packageWorkspace.getName());
taskResult.versions.add(new SapforVersion_json(parentTask.getAbsolutePath(), "исходная"));

23
src/Visual_DVM_2021/Passes/All/PerformScenario.java
View File

@@ -3,12 +3,11 @@ import Common.Global;
import Common.Utils.Utils;
import GlobalData.Tasks.TaskState;
import ProjectData.Project.db_project_info;
import SapforTestingSystem.SapforTask.SapforTask_2023;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
import SapforTestingSystem.Json.SapforVersion_json;
import SapforTestingSystem.Json.ScenarioResults_json;
import SapforTestingSystem.Json.Scenario_json;
import TestingSystem.TasksPackage.TasksPackageState;
import SapforTestingSystem.SapforTask.SapforTask;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassException;
import Visual_DVM_2021.Passes.Pass_2021;
@@ -19,11 +18,10 @@ import java.nio.charset.Charset;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.Comparator;
import java.util.Date;
import java.util.Vector;
//создание дерева версий одного теста по заданному сценарию.
public class PerformScenario extends Pass_2021<Scenario_json> {
SapforTasksPackage_2023 tasks_package;
SapforTasksPackage tasks_package;
File scenarioFile;
//---
File parentTask;
@@ -40,7 +38,7 @@ public class PerformScenario extends Pass_2021<Scenario_json> {
//--
ScenarioResults_json results;
//-
SapforTask_2023 taskResult = null;
SapforTask taskResult = null;
//--
@Override
protected boolean needsAnimation() {
@@ -50,9 +48,9 @@ public class PerformScenario extends Pass_2021<Scenario_json> {
@Override
protected boolean canStart(Object... args) throws Exception {
//--
tasks_package = (SapforTasksPackage_2023) args[0];
tasks_package = (SapforTasksPackage) args[0];
//---
scenarioFile = new File(tasks_package.workspace, "scenario.txt");
// scenarioFile = new File(tasks_package.workspace, "scenario.txt");
String packed = FileUtils.readFileToString(scenarioFile, Charset.defaultCharset());
target = Utils.gson.fromJson(packed, Scenario_json.class);
//---
@@ -60,7 +58,7 @@ public class PerformScenario extends Pass_2021<Scenario_json> {
return true;
}
protected void saveResults() throws Exception {
for (SapforTask_2023 task : results.tasks) {
for (SapforTask task : results.tasks) {
if (!task.versions.isEmpty()) {
File taskResultFile = Paths.get(task.versions.firstElement().version, db_project_info.data, "results.txt").toFile();
FileUtils.write(taskResultFile, Utils.jsonToPrettyFormat(Utils.gson.toJson(task)));
@@ -68,18 +66,15 @@ public class PerformScenario extends Pass_2021<Scenario_json> {
task.id = Global.db.IncSapforMaxTaskId();
Global.db.Insert(task);
}
tasks_package.ChangeDate = new Date().getTime();
tasks_package.state = TasksPackageState.Done;
Global.db.Update(tasks_package);
}
@Override
protected void body() throws Exception {
for (String test : target.tests) {
ShowMessage1(test);
//--
parentTask = new File(tasks_package.workspace, test);
// parentTask = new File(tasks_package.workspace, test);
//--
taskResult = new SapforTask_2023();
taskResult = new SapforTask();
taskResult.test_description = test;
taskResult.sapfortaskspackage_2023_id = tasks_package.id;
taskResult.versions.add(new SapforVersion_json(parentTask.getAbsolutePath(), "исходная"));

66
src/Visual_DVM_2021/Passes/All/StartSapforTests.java
View File

@@ -1,32 +1,24 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.Global;
import Common.GlobalProperties;
import Common.UI.UI;
import Common.Utils.Utils;
import GlobalData.Settings.SettingName;
import ProjectData.LanguageName;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.Group.Group;
import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
import SapforTestingSystem.SapforConfiguration.SapforConfigurationInterface;
import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
import SapforTestingSystem.Json.Scenario_json;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import TestingSystem.Group.Group;
import TestingSystem.Test.Test;
import TestingSystem.Test.TestInterface;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.TestingSystemPass;
import org.apache.commons.io.FileUtils;
import java.io.File;
import java.nio.file.Paths;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.Vector;
public class StartSapforTests extends Pass_2021<Vector<SapforTasksPackage_2023>> {
public class StartSapforTests extends Pass_2021<Vector<SapforTasksPackage>> {
protected int allTasksCount = 0;
//--
protected LinkedHashMap<String, Vector<String>> groupsTests = null;
@@ -208,43 +200,43 @@ public class StartSapforTests extends Pass_2021<Vector<SapforTasksPackage_2023>>
);
}
}
/*
ShowMessage1("Создание рабочих пространств...");
for (SapforConfiguration configuration : Global.testingServer.db.sapforConfigurations.getCheckedItems()) {
SapforTasksPackage_2023 sapforTasksPackage_2023 = new SapforTasksPackage_2023();
SapforTasksPackage sapforTasksPackage_ = new SapforTasksPackage();
//--
sapforTasksPackage_2023.StartDate = new Date().getTime();
sapforTasksPackage_2023.sapfor_version = String.valueOf(Current.getSapfor().version);
sapforTasksPackage_2023.tasksCount = allTasksCount;
sapforTasksPackage_2023.sapforconfiguration_id = configuration.id;
sapforTasksPackage_2023.flags = SapforConfigurationInterface.getFlags(configuration);
sapforTasksPackage_2023.passesNames = SapforConfigurationInterface.getTransformationsNames(configuration);
sapforTasksPackage_.sapfor_version = String.valueOf(Current.getSapfor().version);
sapforTasksPackage_.tasksCount = allTasksCount;
sapforTasksPackage_.sapforconfiguration_id = configuration.id;
sapforTasksPackage_.flags = SapforConfigurationInterface.getFlags(configuration);
sapforTasksPackage_.passesNames = SapforConfigurationInterface.getTransformationsNames(configuration);
//--
sapforTasksPackage_2023.STATIC_SHADOW_ANALYSIS = configuration.STATIC_SHADOW_ANALYSIS;//"Оптимизация теневых обменов"; -sh
sapforTasksPackage_2023.FREE_FORM = configuration.FREE_FORM;
sapforTasksPackage_2023.MAX_SHADOW_WIDTH = configuration.MAX_SHADOW_WIDTH; // "Максимальный размер теневых граней"; (%) -shwidth значение поля
sapforTasksPackage_2023.KEEP_SPF_DIRECTIVES = configuration.KEEP_SPF_DIRECTIVES; //"Сохранять SPF директивы при построении параллельных вариантов"; -keepSPF
sapforTasksPackage_2023.KEEP_DVM_DIRECTIVES = configuration.KEEP_DVM_DIRECTIVES;// "Учитывать DVM директивы"; -keepDVM
sapforTasksPackage_.STATIC_SHADOW_ANALYSIS = configuration.STATIC_SHADOW_ANALYSIS;//"Оптимизация теневых обменов"; -sh
sapforTasksPackage_.FREE_FORM = configuration.FREE_FORM;
sapforTasksPackage_.MAX_SHADOW_WIDTH = configuration.MAX_SHADOW_WIDTH; // "Максимальный размер теневых граней"; (%) -shwidth значение поля
sapforTasksPackage_.KEEP_SPF_DIRECTIVES = configuration.KEEP_SPF_DIRECTIVES; //"Сохранять SPF директивы при построении параллельных вариантов"; -keepSPF
sapforTasksPackage_.KEEP_DVM_DIRECTIVES = configuration.KEEP_DVM_DIRECTIVES;// "Учитывать DVM директивы"; -keepDVM
//--
Global.db.Insert(sapforTasksPackage_2023);
sapforTasksPackage_2023.workspace = Paths.get(
Global.db.Insert(sapforTasksPackage_);
sapforTasksPackage_.workspace = Paths.get(
Global.db.settings.get(SettingName.Workspace).Value,
String.valueOf(sapforTasksPackage_2023.id)
String.valueOf(sapforTasksPackage_.id)
).toFile().getAbsolutePath();
//---
Utils.CheckAndCleanDirectory(new File(sapforTasksPackage_2023.workspace));
sapfor = new File(sapforTasksPackage_2023.workspace, "SAPFOR_F.exe"); //развилка на линукс
Utils.CheckAndCleanDirectory(new File(sapforTasksPackage_.workspace));
sapfor = new File(sapforTasksPackage_.workspace, "SAPFOR_F.exe"); //развилка на линукс
ShowMessage2("Копирование SAPFOR");
FileUtils.copyFile(Current.getSapfor().getFile(), sapfor);
ShowMessage2("Копирование визуализатора");
File visualiser = new File(sapforTasksPackage_2023.workspace, "VisualSapfor.jar");
File visualiser = new File(sapforTasksPackage_.workspace, "VisualSapfor.jar");
FileUtils.copyFile(Global.visualiser.getFile(), visualiser);
GlobalProperties properties = new GlobalProperties();
properties.Mode = Current.Mode.Package;
File propertiesFile = new File(sapforTasksPackage_2023.workspace, "properties");
File propertiesFile = new File(sapforTasksPackage_.workspace, "properties");
FileUtils.write(propertiesFile, Utils.jsonToPrettyFormat(Utils.gson.toJson(properties)));
ShowMessage2("");
//-
File scenarioFile = new File(sapforTasksPackage_2023.workspace, "scenario.txt");
File scenarioFile = new File(sapforTasksPackage_.workspace, "scenario.txt");
Scenario_json scenario_json = new Scenario_json();
scenario_json.tests.addAll(testsNames);
//создать папки для сценариев.
@@ -256,7 +248,7 @@ public class StartSapforTests extends Pass_2021<Vector<SapforTasksPackage_2023>>
Test test = Global.testingServer.db.tests.get(testId);
ShowMessage2(test.description);
//--
File taskWorkspace = new File(sapforTasksPackage_2023.workspace, test.description);
File taskWorkspace = new File(sapforTasksPackage_.workspace, test.description);
Utils.CheckAndCleanDirectory(taskWorkspace);
//--
Utils.copyDirectory(new File(Global.TestsDirectory, test.id), taskWorkspace);
@@ -269,10 +261,11 @@ public class StartSapforTests extends Pass_2021<Vector<SapforTasksPackage_2023>>
//---
FileUtils.write(scenarioFile, Utils.jsonToPrettyFormat(Utils.gson.toJson(scenario_json)));
//---
sapforTasksPackage_2023.testsNames = String.join(";", testsNames);
Global.db.Update(sapforTasksPackage_2023);
target.add(sapforTasksPackage_2023);
sapforTasksPackage_.testsNames = String.join(";", testsNames);
Global.db.Update(sapforTasksPackage_);
target.add(sapforTasksPackage_);
}
*/
//--
}
@Override
@@ -281,13 +274,14 @@ public class StartSapforTests extends Pass_2021<Vector<SapforTasksPackage_2023>>
}
@Override
protected void performDone() throws Exception {
/*
//тут должен быть планировщик и очередь пакетов. отдельной нитью.
for (SapforTasksPackage_2023 sapforTasksPackage_2023 : target) {
File workspaceFile = new File(sapforTasksPackage_2023.workspace);
// Utils.startScript(workspaceFile, workspaceFile, "start", "java -jar VisualSapfor.jar");
Utils.startScript_(workspaceFile, workspaceFile, "start", "java -jar VisualSapfor.jar");
}
*/
}
@Override
protected void showDone() throws Exception {

4
src/Visual_DVM_2021/UI/Interface/TestingWindow.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.UI.Interface;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
public interface TestingWindow extends VisualizerForm {
void ShowAll();
void RestoreLastCredentials();
@@ -52,5 +52,5 @@ public interface TestingWindow extends VisualizerForm {
void ShowLastRunTask();
//-
void RemoveSapforPackageFromComparison(SapforTasksPackage_2023 package_2023);
void RemoveSapforPackageFromComparison(SapforTasksPackage package_2023);
}

6
src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
View File

@@ -8,7 +8,7 @@ import Common.UI.Menus_2023.VisualiserMenuBar;
import Common.UI.UI;
import Common.Utils.TextLog;
import SapforTestingSystem.SapforTask.SapforTaskResult;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import TestingSystem.Test.ProjectFiles_json;
import Visual_DVM_2021.Passes.Pass_2021;
@@ -33,7 +33,7 @@ public class SapforPackagesComparisonForm {
SapforPackagesComparisonForm slave = null;
SapforPackagesComparisonForm master = null;
//-->>
protected SapforTasksPackage_2023 object = null;
protected SapforTasksPackage object = null;
//-->>
protected DataSet<String, SapforTaskResult> packageTasks;
protected DataSetControlForm Body;
@@ -228,7 +228,7 @@ public class SapforPackagesComparisonForm {
};
pass.Do();
}
public void CheckObject(SapforTasksPackage_2023 object_in) {
public void CheckObject(SapforTasksPackage object_in) {
if ((object != null) && object_in.id == (object.id)) {
RemoveObject();
}

8
src/Visual_DVM_2021/UI/Main/SapforTasksComparisonForm.java
View File

@@ -1,10 +1,10 @@
package Visual_DVM_2021.UI.Main;
import Common.Current;
import SapforTestingSystem.SapforTask.SapforTask_2023;
import SapforTestingSystem.SapforTask.SapforTask;
//упразднить.
public class SapforTasksComparisonForm extends TasksComparisonForm<SapforTask_2023> {
public SapforTasksComparisonForm(ComparisonForm<SapforTask_2023> slave_in) {
super(SapforTask_2023.class, slave_in);
public class SapforTasksComparisonForm extends TasksComparisonForm<SapforTask> {
public SapforTasksComparisonForm(ComparisonForm<SapforTask> slave_in) {
super(SapforTask.class, slave_in);
}
@Override
protected Current getCurrentObjectName() {

34
src/Visual_DVM_2021/UI/Main/TestingForm.form
View File

@@ -774,7 +774,7 @@
<splitpane id="8543b" binding="SC53">
<constraints border-constraint="Center"/>
<properties>
<dividerLocation value="86"/>
<dividerLocation value="100"/>
<dividerSize value="3"/>
<orientation value="0"/>
</properties>
@@ -824,16 +824,38 @@
</properties>
<border type="none"/>
<children>
<grid id="7cddb" binding="sapforPackagesPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<splitpane id="d5aac" binding="SC62">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
<preferred-size width="200" height="200"/>
</grid>
</constraints>
<properties>
<minimumSize width="0" height="200"/>
<dividerLocation value="200"/>
<dividerSize value="3"/>
</properties>
<border type="none"/>
<children/>
</grid>
<children>
<grid id="a5ba7" binding="sapforPackagesPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="right"/>
</constraints>
<properties>
<minimumSize width="0" height="200"/>
</properties>
<border type="none"/>
<children/>
</grid>
<grid id="eec01" binding="sapforScenariosPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="left"/>
</constraints>
<properties/>
<border type="none"/>
<children/>
</grid>
</children>
</splitpane>
</children>
</grid>
</children>

11
src/Visual_DVM_2021/UI/Main/TestingForm.java
View File

@@ -7,10 +7,10 @@ import Common.UI.UI;
import Common.Utils.Utils;
import GlobalData.Compiler.CompilerType;
import GlobalData.Credentials.Credentials;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import TestingSystem.Configuration.UI.ConfigurationDBTable;
import TestingSystem.Group.Group;
import TestingSystem.MachineMaxKernels.MachineMaxKernels;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
import TestingSystem.TasksPackage.TasksPackageDBTable;
import TestingSystem.Test.Test;
import Visual_DVM_2021.UI.Interface.FormWithSplitters;
@@ -45,6 +45,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
public JSplitPane SC58;
public JSplitPane SC59;
public JSplitPane SC19;
public JSplitPane SC62;
//-
//---
private JPanel machinesPanel;
@@ -86,6 +87,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
private JLabel sapforTasksPackagesLabel;
private JLabel sapforTasksLabel;
private JPanel groupsBackground;
private JPanel sapforScenariosPanel;
private JPanel testsRunTasksBackground;
private JCheckBox filterFinished;
private JButton bTest;
@@ -148,6 +150,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
//--
Global.testingServer.db.sapforConfigurations.mountUI(sapforConfigurationsPanel);
Global.testingServer.db.sapforConfigurationCommands.mountUI(sapforConfigurationCommandsPanel);
Global.db.sapforScenarios.mountUI(sapforScenariosPanel);
Global.db.sapforTasksPackages.mountUI(sapforPackagesPanel);
//Global.db.sapforTasks.mountUI(sapforTasksPanel);
// Global.testingServer.account_db.sapforTasksPackages.mountUI(sapforPackagesPanel);
@@ -183,7 +186,8 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
Global.testingServer.db.groups.ShowUI();
Global.testingServer.account_db.packages.ShowUI();
Global.testingServer.db.sapforConfigurations.ShowUI();
Global.db.sapforTasksPackages.ShowUI();
Global.db.sapforScenarios.ShowUI();
// Global.db.sapforTasksPackages.ShowUI();
}
//-
@Override
@@ -467,9 +471,8 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
public void ShowLastRunTask() {
singleRunTaskMaster.ApplyObject();
}
@Override
public void RemoveSapforPackageFromComparison(SapforTasksPackage_2023 package_2023) {
public void RemoveSapforPackageFromComparison(SapforTasksPackage package_2023) {
sapforTestingMaster.CheckObject(package_2023);
sapforTestingSlave.CheckObject(package_2023);
}