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
2025-03-15 18:03:32 +03:00
parent 6a3be45b1a
commit b6b7bb3ae5
9 changed files with 203 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/_VisualDVM/Visual/Interface/TestingWindow.java
View File

@@ -11,6 +11,7 @@ public interface TestingWindow extends VisualizerForm {
void DropSapforComparison();
void ShowCurrentTestRunTask();
void ShowNoTestRunTask();
void CompareCurrentDVMTaskToEthalon(DVMRunTask ethalon, DVMRunTask task)throws Exception;
//-
void RefreshTabsNames();
//-
@@ -32,4 +33,5 @@ public interface TestingWindow extends VisualizerForm {
void ShowDVMPackage(DVMPackage master);
void ShowCurrentDVMTask();
void ShowNoCurrentDVMTask();
void FocusTestingTasksComparison();
}

150
src/_VisualDVM/Visual/Windows/TestingForm.form
View File

@@ -156,98 +156,132 @@
<properties/>
<border type="none"/>
<children>
<splitpane id="ba9b7" binding="SC50">
<tabbedpane id="51db9" binding="taskResultsTabs">
<constraints border-constraint="Center"/>
<properties>
<dividerLocation value="300"/>
<dividerSize value="3"/>
</properties>
<properties/>
<border type="none"/>
<children>
<grid id="49659" layout-manager="BorderLayout" hgap="0" vgap="0">
<grid id="bd851" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="left"/>
<tabbedpane title="Результаты"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<tabbedpane id="665df" binding="compilationTabs">
<splitpane id="6065f" binding="SC50">
<constraints border-constraint="Center"/>
<properties/>
<properties>
<dividerLocation value="300"/>
<dividerSize value="3"/>
</properties>
<border type="none"/>
<children>
<grid id="97d0" binding="compilationOutPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<grid id="cb911" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<tabbedpane title="" icon="icons/CompilationOutput.png">
<tooltip value="Поток вывода компиляции"/>
</tabbedpane>
<splitpane position="left"/>
</constraints>
<properties/>
<border type="none"/>
<children/>
<children>
<tabbedpane id="a9e1d" binding="compilationTabs">
<constraints border-constraint="Center"/>
<properties/>
<border type="none"/>
<children>
<grid id="22660" binding="compilationOutPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<tabbedpane title="" icon="icons/CompilationOutput.png">
<tooltip value="Поток вывода компиляции"/>
</tabbedpane>
</constraints>
<properties/>
<border type="none"/>
<children/>
</grid>
<grid id="a4d26" binding="compilationErrPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<tabbedpane title="" icon="icons/CompilationErrors.png">
<tooltip value="Поток ошибок компиляции"/>
</tabbedpane>
</constraints>
<properties/>
<border type="none"/>
<children/>
</grid>
</children>
</tabbedpane>
</children>
</grid>
<grid id="953c0" binding="compilationErrPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<grid id="8e77b" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<tabbedpane title="" icon="icons/CompilationErrors.png">
<tooltip value="Поток ошибок компиляции"/>
</tabbedpane>
<splitpane position="right"/>
</constraints>
<properties/>
<border type="none"/>
<children/>
<children>
<tabbedpane id="8ce6" binding="runTabs">
<constraints border-constraint="Center"/>
<properties/>
<border type="none"/>
<children>
<grid id="c0686" binding="runOutPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<tabbedpane title="" icon="icons/RunOutput.png">
<tooltip value="Поток вывода запуска"/>
</tabbedpane>
</constraints>
<properties/>
<border type="none"/>
<children/>
</grid>
<grid id="15c72" binding="runErrPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<tabbedpane title="" icon="icons/RunErrors.png">
<tooltip value="Поток ошибок запуска"/>
</tabbedpane>
</constraints>
<properties/>
<border type="none"/>
<children/>
</grid>
<grid id="d9373" binding="runStsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<tabbedpane title="" icon="icons/Sts.png">
<tooltip value="DVM статистика запуска"/>
</tabbedpane>
</constraints>
<properties/>
<border type="none"/>
<children/>
</grid>
</children>
</tabbedpane>
</children>
</grid>
</children>
</tabbedpane>
</splitpane>
</children>
</grid>
<grid id="d5bb4" layout-manager="BorderLayout" hgap="0" vgap="0">
<grid id="bd361" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="right"/>
<tabbedpane title="Сравнение"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<tabbedpane id="e06c2" binding="runTabs">
<splitpane id="e992c" binding="SC90">
<constraints border-constraint="Center"/>
<properties/>
<properties>
<dividerLocation value="400"/>
<dividerSize value="3"/>
</properties>
<border type="none"/>
<children>
<grid id="5f83b" binding="runOutPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<tabbedpane title="" icon="icons/RunOutput.png">
<tooltip value="Поток вывода запуска"/>
</tabbedpane>
</constraints>
<properties/>
<border type="none"/>
<children/>
</grid>
<grid id="b85ac" binding="runErrPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<tabbedpane title="" icon="icons/RunErrors.png">
<tooltip value="Поток ошибок запуска"/>
</tabbedpane>
</constraints>
<properties/>
<border type="none"/>
<children/>
</grid>
<grid id="d35c7" binding="runStsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<tabbedpane title="" icon="icons/Sts.png">
<tooltip value="DVM статистика запуска"/>
</tabbedpane>
</constraints>
<properties/>
<border type="none"/>
<children/>
</grid>
</children>
</tabbedpane>
<children/>
</splitpane>
</children>
</grid>
</children>
</splitpane>
</tabbedpane>
</children>
</grid>
</children>

37
src/_VisualDVM/Visual/Windows/TestingForm.java
View File

@@ -10,6 +10,7 @@ import _VisualDVM.GlobalData.Compiler.CompilerType;
import _VisualDVM.TestingSystem.Common.TestingServer;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
import _VisualDVM.TestingSystem.DVM.DVMTasks.UI.DVMRunTasksComparisonForm;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import _VisualDVM.Visual.Interface.TestingWindow;
@@ -24,15 +25,14 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
private final BaseEditor roText;
private final BaseEditor reText;
private final BaseEditor stsText;
//private final DVMRunTasksComparisonForm dvmTestingRunMaster; //сравнение тестов двм системы.
//private final DVMRunTasksComparisonForm dvmTestingRunSlave;
private final DVMRunTasksComparisonForm dvmTestingRunMaster; //сравнение тестов двм системы.
private final DVMRunTasksComparisonForm dvmTestingRunSlave;
//-
private final SapforPackagesComparisonForm sapforPackageTreeMaster; //сравнение деревьев пакетов SAPFOR.
private final SapforPackagesComparisonForm sapforPackageTreeSlave;
//--
private final SapforVersionsComparisonForm sapforVersionMaster; //сравнение версий тестов SAPFOR.
private final SapforVersionsComparisonForm sapforVersionSlave;
public JSplitPane SC50;
public JSplitPane SC65;
public JSplitPane SC66;
public JSplitPane SC64;
@@ -43,6 +43,8 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
public JSplitPane SC83;
public JSplitPane SC72;
public JSplitPane SC85;
public JSplitPane SC50;
public JSplitPane SC90;
private JPanel content;
//---
private JTabbedPane testingTabs;
@@ -71,13 +73,14 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
private JPanel sapforSettingsPanel;
private JPanel sapforSettingsCommandsPanel;
private JPanel dvmSettingsPanel;
private JTabbedPane compilationTabs;
private JTabbedPane runTabs;
private JTabbedPane taskResultsTabs;
private JPanel compilationOutPanel;
private JPanel compilationErrPanel;
private JPanel runOutPanel;
private JPanel runErrPanel;
private JPanel runStsPanel;
private JTabbedPane compilationTabs;
private JTabbedPane runTabs;
private JPanel testsRunTasksBackground;
private JCheckBox filterFinished;
private JButton bTest;
@@ -108,7 +111,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
content.add(Global.mainModule.getUI().getTestingMenuBar(), BorderLayout.NORTH);
LoadSplitters();
//-
// dvmTestingRunMaster = new DVMRunTasksComparisonForm(dvmTestingRunSlave = new DVMRunTasksComparisonForm(null));
dvmTestingRunMaster = new DVMRunTasksComparisonForm(dvmTestingRunSlave = new DVMRunTasksComparisonForm(null));
sapforPackageTreeMaster = new SapforPackagesComparisonForm(sapforPackageTreeSlave = new SapforPackagesComparisonForm(null));
sapforVersionMaster = new SapforVersionsComparisonForm(
sapforVersionSlave = new SapforVersionsComparisonForm(null, Current.SapforVersion),
@@ -116,6 +119,8 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
);
//--->>>
RefreshTabsNames();
SC90.setLeftComponent(dvmTestingRunMaster.getContent());
SC90.setRightComponent(dvmTestingRunSlave.getContent());
//-
compilationOutPanel.add(new JScrollPane(coText = new BaseEditor()));
compilationErrPanel.add(new JScrollPane(ceText = new BaseEditor()));
@@ -172,8 +177,8 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
}
@Override
public void DropTestRunTasksComparison() {
// dvmTestingRunMaster.RemoveObject();
// dvmTestingRunSlave.RemoveObject();
dvmTestingRunMaster.RemoveObject();
dvmTestingRunSlave.RemoveObject();
}
@Override
public void DropSapforComparison() {
@@ -184,13 +189,9 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
}
@Override
public void ShowCurrentTestRunTask() {
// if (dvmTestingRunMaster.isActive()) dvmTestingRunMaster.ShowTask();
// else dvmTestingRunSlave.ShowTask();
}
@Override
public void ShowNoTestRunTask() {
// dvmTestingRunMaster.Clear();
// dvmTestingRunSlave.Clear();
}
@Override
public void RefreshTabsNames() {
@@ -277,4 +278,16 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
reText.setText("");
stsText.setText("");
}
@Override
public void FocusTestingTasksComparison() {
taskResultsTabs.setSelectedIndex(1);
}
@Override
public void CompareCurrentDVMTaskToEthalon(DVMRunTask ethalon, DVMRunTask task) throws Exception {
dvmTestingRunMaster.ApplyObject(ethalon);
dvmTestingRunSlave.ApplyObject(task);
dvmTestingRunMaster.Compare();
// dvmTestingRunMaster.ChangeState(TasksComparisonState.RunOutput);
// dvmTestingRunSlave.ChangeState(TasksComparisonState.RunOutput);
}
}