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

рефакторинг конфигураций тестирования сапфор. кнфигурация сделана как пара - набор тестов+ наборы настроек. наборы настроек стали отдельным объектом

Browse Source
This commit is contained in:
02090095
2024-09-28 21:47:17 +03:00
parent 4547fd10bd
commit b89283fc91
50 changed files with 338 additions and 590 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java
View File

@@ -1,10 +0,0 @@
package Visual_DVM_2021.Passes.All;
import Common.Global;
import TestingSystem.Common.TestingServer;
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
import Visual_DVM_2021.Passes.Server.DeleteServerObjects;
public class DeleteSapforConfigurationCommand extends DeleteServerObjects<TestingServer, SapforConfigurationCommand> {
public DeleteSapforConfigurationCommand() {
super(Global.testingServer, SapforConfigurationCommand.class);
}
}

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

@@ -1,11 +0,0 @@
package Visual_DVM_2021.Passes.All;
import Common.Global;
import TestingSystem.Common.TestingServer;
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
import Visual_DVM_2021.Passes.Server.EditServerObject;
public class EditSapforConfigurationCommand extends EditServerObject<TestingServer,SapforConfigurationCommand> {
public EditSapforConfigurationCommand() {
super(Global.testingServer,SapforConfigurationCommand.class);
}
}

1
src/Visual_DVM_2021/Passes/All/EditSapforSettingsCommand.java
View File

@@ -1,7 +1,6 @@
package Visual_DVM_2021.Passes.All;
import Common.Global;
import TestingSystem.Common.TestingServer;
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
import TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
import Visual_DVM_2021.Passes.Server.EditServerObject;
public class EditSapforSettingsCommand extends EditServerObject<TestingServer, SapforSettingsCommand> {

20
src/Visual_DVM_2021/Passes/All/PublishSapforConfigurationCommand.java
View File

@@ -1,20 +0,0 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.Global;
import TestingSystem.Common.TestingServer;
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
import Visual_DVM_2021.Passes.Server.PublishServerObject;
public class PublishSapforConfigurationCommand extends PublishServerObject<TestingServer, SapforConfigurationCommand> {
public PublishSapforConfigurationCommand() {
super(Global.testingServer, SapforConfigurationCommand.class);
}
@Override
public boolean fillObjectFields() throws Exception {
target.sapforconfiguration_id = Current.getSapforConfiguration().id;
return super.fillObjectFields();
}
@Override
protected boolean canStart(Object... args) throws Exception {
return Current.Check(Log, Current.SapforConfiguration)&&super.canStart(args);
}
}

1
src/Visual_DVM_2021/Passes/All/PublishSapforSettingsCommand.java
View File

@@ -2,7 +2,6 @@ package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.Global;
import TestingSystem.Common.TestingServer;
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
import TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
import Visual_DVM_2021.Passes.Server.PublishServerObject;
public class PublishSapforSettingsCommand extends PublishServerObject<TestingServer, SapforSettingsCommand> {

12
src/Visual_DVM_2021/Passes/All/SaveCurrentDVMConfiguration.java
View File

@@ -1,17 +1,11 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.Global;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.Test;
import TestingSystem.Common.TestingServer;
import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import TestingSystem.DVM.DVMSettings.DVMSettings;
import Visual_DVM_2021.Passes.SaveCurrentConfiguration;
import Visual_DVM_2021.Passes.Server.EditServerObject;
import java.util.Vector;
public class SaveCurrentDVMConfiguration extends SaveCurrentConfiguration<DVMConfiguration> {
public class SaveCurrentDVMConfiguration extends SaveCurrentConfiguration<DVMConfiguration, DVMSettings> {
public SaveCurrentDVMConfiguration() {
super(DVMConfiguration.class);
super(DVMConfiguration.class, DVMSettings.class);
}
@Override
public Current currentName() {

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

@@ -1,11 +1,11 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import Visual_DVM_2021.Passes.SaveCurrentConfiguration;
public class SaveCurrentSAPFORConfiguration extends SaveCurrentConfiguration<SapforConfiguration> {
public class SaveCurrentSAPFORConfiguration extends SaveCurrentConfiguration<SapforConfiguration, SapforSettings> {
public SaveCurrentSAPFORConfiguration() {
super(SapforConfiguration.class);
super(SapforConfiguration.class, SapforSettings.class);
}
@Override
public Current currentName() {

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

@@ -1,9 +1,30 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.Global;
import Common.UI.VisualCache.ConfigurationCache;
import Common.UI.VisualCache.SapforConfigurationCache;
import Common.UI.VisualCache.VisualCaches;
import TestingSystem.Common.Settings.Settings;
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import Visual_DVM_2021.Passes.ShowCurrentConfigurationTests;
public class ShowCurrentSAPFORConfigurationTests extends ShowCurrentConfigurationTests {
import java.util.Vector;
public class ShowCurrentSAPFORConfigurationTests extends ShowCurrentConfigurationTests<SapforConfiguration> {
@Override
public Current currentName() {
return Current.SapforConfiguration;
}
@Override
protected void showDone() throws Exception {
super.showDone();
SapforConfigurationCache cache = (SapforConfigurationCache) VisualCaches.GetCache(target);
Vector<SapforSettings> settings = cache.getSettings();
for (SapforSettings s: settings)
s.Select(true);
//--
if (!settings.isEmpty()){
Global.testingServer.db.sapforSettings.ShowUI(settings.lastElement().id);
}
}
}

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

@@ -274,10 +274,6 @@ public enum PassCode_2021 {
EditSapforConfiguration,
DeleteSapforConfiguration,
//-
PublishSapforConfigurationCommand,
EditSapforConfigurationCommand,
DeleteSapforConfigurationCommand,
//->
OpenSapforEtalonVersion,
OpenSapforVersion,
PublishServerSapfor,
@@ -538,12 +534,6 @@ public enum PassCode_2021 {
return "Установить тип для отмеченных файлов";
case DeleteDownloadedBugReports:
return "Удалить загруженные отчёты об ошибках";
case DeleteSapforConfigurationCommand:
return "Удалить команду конфигурации тестирования Sapfor";
case EditSapforConfigurationCommand:
return "Редактировать команду конфигурации тестирования Sapfor";
case PublishSapforConfigurationCommand:
return "Опубликовать команду конфигурации тестирования Sapfor";
case PublishSapforConfiguration:
return "Опубликовать конфигурацию тестирования SAPFOR";
case EditSapforConfiguration:

17
src/Visual_DVM_2021/Passes/SaveCurrentConfiguration.java
View File

@@ -1,23 +1,23 @@
package Visual_DVM_2021.Passes;
import Common.Current;
import Common.Global;
import Common.UI.UI;
import Common.UI.VisualCache.ConfigurationCache;
import Common.UI.VisualCache.VisualCaches;
import Common.Utils.Utils;
import TestingSystem.Common.Configuration.Configuration;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Settings.Settings;
import TestingSystem.Common.Test.Test;
import TestingSystem.Common.TestingServer;
import Visual_DVM_2021.Passes.Server.EditServerObject;
import java.util.Vector;
public abstract class SaveCurrentConfiguration<C extends Configuration> extends EditServerObject<TestingServer, C> {
public abstract class SaveCurrentConfiguration<C extends Configuration, S extends Settings> extends EditServerObject<TestingServer, C> {
Vector<Group> groups;
Vector<Test> tests;
Class<S> s;
Vector<Settings> settings;
//--
public SaveCurrentConfiguration(Class<C> d_in) {
public SaveCurrentConfiguration(Class<C> d_in, Class<S> s_in) {
super(Global.testingServer, d_in);
s =s_in;
}
@Override
public String getIconPath() {
@@ -31,12 +31,16 @@ public abstract class SaveCurrentConfiguration<C extends Configuration> extends
//--
groups = new Vector<>();
tests = new Vector<>();
settings= new Vector<>();
//---
for (Group group : Global.testingServer.db.groups.getCheckedItems()) {
groups.add(group);
Vector<Test> groupTests = Global.testingServer.db.tests.getSelectedGroupTests(group);
tests.addAll(groupTests);
}
for (Object setting: Global.testingServer.db.tables.get(s).getCheckedItems()){
settings.add((Settings) setting);
}
return true;
}
@Override
@@ -44,6 +48,7 @@ public abstract class SaveCurrentConfiguration<C extends Configuration> extends
//занесение информации об участвующих группах конфигурациях и тестах
target.saveGroupsAsJson(groups);
target.saveTestsAsJson(tests);
target.saveSettingsAsJson(settings);
//--
super.ServerAction();
}

4
src/Visual_DVM_2021/Passes/ShowCurrentConfigurationTests.java
View File

@@ -8,7 +8,7 @@ import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.Test;
import java.util.Vector;
public abstract class ShowCurrentConfigurationTests extends Pass_2021<Configuration> {
public abstract class ShowCurrentConfigurationTests<C extends Configuration> extends Pass_2021<C> {
@Override
public String getIconPath() {
return "/icons/ShowPassword.png";
@@ -22,7 +22,7 @@ public abstract class ShowCurrentConfigurationTests extends Pass_2021<Configurat
protected boolean canStart(Object... args) throws Exception {
target = null;
if (Current.Check(Log, currentName())) {
target = (Configuration) Current.get(currentName());
target = (C) Current.get(currentName());
return true;
}
return false;

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

@@ -396,32 +396,12 @@
<properties/>
<border type="none"/>
<children>
<splitpane id="c70f1" binding="SC81">
<grid id="6109f" binding="sapforConfigurationsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints border-constraint="Center"/>
<properties>
<dividerLocation value="500"/>
<dividerSize value="3"/>
</properties>
<properties/>
<border type="none"/>
<children>
<grid id="2f93b" binding="sapforConfigurationsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="left"/>
</constraints>
<properties/>
<border type="none"/>
<children/>
</grid>
<grid id="3f00d" binding="sapforConfigurationCommandsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="right"/>
</constraints>
<properties/>
<border type="none"/>
<children/>
</grid>
</children>
</splitpane>
<children/>
</grid>
</children>
</grid>
<grid id="1ee44" layout-manager="BorderLayout" hgap="0" vgap="0">

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

@@ -35,7 +35,6 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
public JSplitPane SC18;
public JSplitPane SC19;
public JSplitPane SC80;
public JSplitPane SC81;
public JSplitPane SC83;
//---
private JTabbedPane testingTabs;
@@ -54,7 +53,6 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
private JPanel sapforConfigurationsPanel;
private JLabel sapforConfigurationsLabel;
private JLabel sapforConfigurationsCommandsLabel;
private JPanel sapforConfigurationCommandsPanel;
private JPanel sapforScenariosPanel;
private JPanel serverSapforsPanel;
private JPanel sapforPackagesPanel;
@@ -134,7 +132,6 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
Global.testingServer.db.dvmPackages.mountUI(dvmPackagesPanel);
Global.testingServer.db.dvmRunTasks.mountUI(dvmRunTasksPanel);
Global.testingServer.db.sapforConfigurations.mountUI(sapforConfigurationsPanel);
Global.testingServer.db.sapforConfigurationCommands.mountUI(sapforConfigurationCommandsPanel);
Global.testingServer.db.serverSapfors.mountUI(serverSapforsPanel);
Global.testingServer.db.sapforPackages.mountUI(sapforPackagesPanel);
Global.testingServer.db.sapforSettings.mountUI(sapforSettingsPanel);

9
src/Visual_DVM_2021/UI/Main/buffer_.form
View File

@@ -6,6 +6,13 @@
</constraints>
<properties/>
<border type="none"/>
<children/>
<children>
<grid id="a1635" binding="sapforConfigurationsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints border-constraint="Center"/>
<properties/>
<border type="none"/>
<children/>
</grid>
</children>
</grid>
</form>

1
src/Visual_DVM_2021/UI/Main/buffer_.java
View File

@@ -2,5 +2,6 @@ package Visual_DVM_2021.UI.Main;
import javax.swing.*;
public class buffer_ {
private JPanel panel1;
private JPanel sapforConfigurationsPanel;
//Скачать пакет задач
}