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

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);
}