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
2023-11-17 21:26:01 +03:00
parent 32166efa68
commit 82a5e9c147
19 changed files with 155 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
.idea/workspace.xml generated
View File

@@ -7,7 +7,25 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.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/TestingSystem/Common/Group/Group.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/Group.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationInterface.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommand.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandInterface.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommand.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommandOnServer.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationOnServer.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishSapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishSapforConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishSapforConfigurationCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishSapforConfigurationCommand.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/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

47
src/TestingSystem/Common/Group/Group.java
View File

@@ -27,6 +27,30 @@ public class Group extends riDBObject {
return (!GroupsDBTable.filterMyOnly || Current.getAccount().email.equals(sender_address)) && return (!GroupsDBTable.filterMyOnly || Current.getAccount().email.equals(sender_address)) &&
Global.testingServer.db.groups.applyFilters(this); Global.testingServer.db.groups.applyFilters(this);
} }
public String getSummary() {
return description + " " + language.getDescription();
}
//-
@Override
public void SynchronizeFields(DBObject src) {
super.SynchronizeFields(src);
Group g = (Group) src;
type = g.type;
language = g.language;
}
public Group(Group group) {
this.SynchronizeFields(group);
}
public Group() {
}
@Override
public void select(boolean flag) {
super.select(flag);
if (Current.hasUI())
UI.getMainWindow().ShowCheckedTestsCount();
}
//--
//- //-
public static void generateForLanguage( public static void generateForLanguage(
String dvm_drv, String dvm_drv,
@@ -92,27 +116,4 @@ public class Group extends riDBObject {
"\t" + Utils.MFVar("LINK_COMMAND") + " " + Utils.MFVar("LINK_FLAGS") + " " + String.join(" ", objects) + " -o " + binary, "\t" + Utils.MFVar("LINK_COMMAND") + " " + Utils.MFVar("LINK_FLAGS") + " " + String.join(" ", objects) + " -o " + binary,
String.join(" ", bodies)); String.join(" ", bodies));
} }
public String getSummary() {
return description + " " + language.getDescription();
}
//-
@Override
public void SynchronizeFields(DBObject src) {
super.SynchronizeFields(src);
Group g = (Group) src;
type = g.type;
language = g.language;
}
public Group(Group group) {
this.SynchronizeFields(group);
}
public Group() {
}
@Override
public void select(boolean flag) {
super.select(flag);
if (Current.hasUI())
UI.getMainWindow().ShowCheckedTestsCount();
}
} }

60
src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
View File

@@ -1,11 +1,59 @@
package TestingSystem.SAPFOR.SapforConfiguration; package TestingSystem.SAPFOR.SapforConfiguration;
import Common.Database.rDBObject; import Common.Database.DBObject;
public class SapforConfiguration extends rDBObject { import Common.Database.riDBObject;
import Common.Global;
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
import Visual_DVM_2021.Passes.PassCode_2021;
import java.util.Vector;
public class SapforConfiguration extends riDBObject {
//настройки. //настройки.
public int maxtime = 300; //лимит времени преобразования. public int maxtime = 300; //лимит времени преобразования. (пока не используется)
public int FREE_FORM = 0; //"Свободный выходной стиль"; -f90 public int FREE_FORM = 0; //"Свободный выходной стиль"; -f90
public int STATIC_SHADOW_ANALYSIS=0;//"Оптимизация теневых обменов"; -sh public int STATIC_SHADOW_ANALYSIS = 0;//"Оптимизация теневых обменов"; -sh
public int MAX_SHADOW_WIDTH=50; // "Максимальный размер теневых граней"; (%) -shwidth значение поля public int MAX_SHADOW_WIDTH = 50; // "Максимальный размер теневых граней"; (%) -shwidth значение поля
public int KEEP_SPF_DIRECTIVES=0; //"Сохранять SPF директивы при построении параллельных вариантов"; -keepSPF public int KEEP_SPF_DIRECTIVES = 0; //"Сохранять SPF директивы при построении параллельных вариантов"; -keepSPF
public int KEEP_DVM_DIRECTIVES = 0;// "Учитывать DVM директивы"; -keepDVM public int KEEP_DVM_DIRECTIVES = 0;// "Учитывать DVM директивы"; -keepDVM
//----
public String getFlags() {
Vector<String> res = new Vector<>();
if (FREE_FORM > 0)
res.add("-f90");
if (STATIC_SHADOW_ANALYSIS > 0)
res.add("-sh");
if (MAX_SHADOW_WIDTH > 0)
res.add("-shwidth " + MAX_SHADOW_WIDTH);
if (KEEP_DVM_DIRECTIVES > 0)
res.add("-keepDVM");
if (KEEP_SPF_DIRECTIVES > 0)
res.add("-keepSPF");
return String.join(" ", res);
}
//-
public Vector<PassCode_2021> getPassCodes() {
Vector<PassCode_2021> res = new Vector<>();
for (SapforConfigurationCommand command : Global.testingServer.db.sapforConfigurationCommands.Data.values()) {
if (command.sapforconfiguration_id == id) {
res.add(command.passCode);
}
}
return res;
}
//--
@Override
public void SynchronizeFields(DBObject src) {
super.SynchronizeFields(src);
SapforConfiguration c = (SapforConfiguration) src;
maxtime = c.maxtime;
FREE_FORM = c.FREE_FORM;
STATIC_SHADOW_ANALYSIS = c.STATIC_SHADOW_ANALYSIS;
MAX_SHADOW_WIDTH = c.MAX_SHADOW_WIDTH;
KEEP_SPF_DIRECTIVES = c.KEEP_SPF_DIRECTIVES;
KEEP_DVM_DIRECTIVES = c.KEEP_DVM_DIRECTIVES;
}
public SapforConfiguration(SapforConfiguration sapforConfiguration) {
this.SynchronizeFields(sapforConfiguration);
}
public SapforConfiguration() {
}
} }

18
src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
View File

@@ -8,9 +8,9 @@ import TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfigurationFields;
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand; import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
public class SapforConfigurationDBTable extends DBTable<String, SapforConfiguration> { public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
public SapforConfigurationDBTable() { public SapforConfigurationDBTable() {
super(String.class, SapforConfiguration.class); super(SapforConfiguration.class);
} }
@Override @Override
public Current CurrentName() { public Current CurrentName() {
@@ -33,17 +33,7 @@ public class SapforConfigurationDBTable extends DBTable<String, SapforConfigurat
} }
@Override @Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(0).setVisible(false); //columns.get(0).setVisible(false);
}
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
// Global.db.sapforTasksPackages.ShowUI();
}
@Override
public void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
// Global.db.sapforTasksPackages.ClearUI();
} }
}; };
} }
@@ -63,7 +53,7 @@ public class SapforConfigurationDBTable extends DBTable<String, SapforConfigurat
case 3: case 3:
return object.sender_name; return object.sender_name;
case 4: case 4:
return SapforConfigurationInterface.getFlags(object); return object.getFlags();
default: default:
return null; return null;
} }

62
src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationInterface.java
View File

@@ -1,62 +0,0 @@
package TestingSystem.SAPFOR.SapforConfiguration;
import Common.Global;
import Common.Utils.TextLog;
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
import Visual_DVM_2021.Passes.PassCode_2021;
import java.util.Vector;
public class SapforConfigurationInterface {
public static String getFlags(SapforConfiguration object) {
Vector<String> res = new Vector<>();
if (object.FREE_FORM > 0)
res.add("-f90");
if (object.STATIC_SHADOW_ANALYSIS > 0)
res.add("-sh");
if (object.MAX_SHADOW_WIDTH > 0)
res.add("-shwidth " + object.MAX_SHADOW_WIDTH);
if (object.KEEP_DVM_DIRECTIVES > 0)
res.add("-keepDVM");
if (object.KEEP_SPF_DIRECTIVES > 0)
res.add("-keepSPF");
return String.join(" ", res);
}
public static Vector<PassCode_2021> getPassCodes(SapforConfiguration object) {
Vector<PassCode_2021> res = new Vector<>();
for (SapforConfigurationCommand command : Global.testingServer.db.sapforConfigurationCommands.Data.values()) {
if (command.sapforconfiguration_id.equals(object.id)) {
res.add(command.passCode);
}
}
return res;
}
//todo вывести.
public static boolean validateCommands(SapforConfiguration sapforConfiguration, TextLog log) {
//1. получить список всех команд.
Vector<SapforConfigurationCommand> commands = new Vector<>();
int count = 0;
for (SapforConfigurationCommand command : Global.testingServer.db.sapforConfigurationCommands.Data.values()) {
if (command.sapforconfiguration_id.equals(sapforConfiguration.id)) {
commands.add(command);
if (command.passCode.equals(PassCode_2021.CreateParallelVariants))
count++;
}
}
if ((count == 0) || commands.isEmpty())
return true;
//--
if (count > 2) {
log.Writeln_("Неверная конфигурация:" + sapforConfiguration.id + ": построение параллельных вариантов возможно единожды.");
return false;
}
//--
if (count == 1) {
if (commands.size() == 1) return true;
if (!commands.lastElement().passCode.equals(PassCode_2021.CreateParallelVariants)) {
log.Writeln_("Неверная конфигурация:" + sapforConfiguration.id + ": построение параллельных вариантов может быть только завершающей командой!");
return false;
}
;
}
return true;
}
}

12
src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommand.java
View File

@@ -1,13 +1,15 @@
package TestingSystem.SAPFOR.SapforConfigurationCommand; package TestingSystem.SAPFOR.SapforConfigurationCommand;
import Common.Database.rDBObject; import Common.Constants;
import Common.Current;
import Common.Database.riDBObject;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import com.sun.org.glassfish.gmbal.Description; import com.sun.org.glassfish.gmbal.Description;
public class SapforConfigurationCommand extends rDBObject { public class SapforConfigurationCommand extends riDBObject {
@Description("DEFAULT ''") @Description("DEFAULT -1")
public String sapforconfiguration_id = ""; public int sapforconfiguration_id = Constants.Nan;
public PassCode_2021 passCode = PassCode_2021.SPF_RemoveDvmDirectives; public PassCode_2021 passCode = PassCode_2021.SPF_RemoveDvmDirectives;
@Override @Override
public boolean isVisible() { public boolean isVisible() {
return SapforConfigurationCommandInterface.isVisible(this); return Current.HasSapforConfiguration() && (Current.getSapforConfiguration().id == sapforconfiguration_id);
} }
} }

7
src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandInterface.java
View File

@@ -1,7 +0,0 @@
package TestingSystem.SAPFOR.SapforConfigurationCommand;
import Common.Current;
public class SapforConfigurationCommandInterface {
public static boolean isVisible(SapforConfigurationCommand object) {
return Current.HasSapforConfiguration() && (Current.getSapforConfiguration().id.equals(object.sapforconfiguration_id));
}
}

15
src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java
View File

@@ -1,14 +1,14 @@
package TestingSystem.SAPFOR.SapforConfigurationCommand; package TestingSystem.SAPFOR.SapforConfigurationCommand;
import Common.Current; import Common.Current;
import Common.Database.DBTable; import Common.Database.iDBTable;
import Common.UI.DataSetControlForm; import Common.UI.DataSetControlForm;
import Common.UI.UI; import Common.UI.UI;
import Common.UI.Windows.Dialog.DBObjectDialog; import Common.UI.Windows.Dialog.DBObjectDialog;
import TestingSystem.SAPFOR.SapforConfigurationCommand.UI.SapforConfigurationCommandFields; import TestingSystem.SAPFOR.SapforConfigurationCommand.UI.SapforConfigurationCommandFields;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
public class SapforConfigurationCommandsDBTable extends DBTable<String, SapforConfigurationCommand> { public class SapforConfigurationCommandsDBTable extends iDBTable<SapforConfigurationCommand> {
public SapforConfigurationCommandsDBTable() { public SapforConfigurationCommandsDBTable() {
super(String.class, SapforConfigurationCommand.class); super(SapforConfigurationCommand.class);
} }
@Override @Override
public String getSingleDescription() { public String getSingleDescription() {
@@ -62,15 +62,6 @@ public class SapforConfigurationCommandsDBTable extends DBTable<String, SapforCo
Result.passCode = (PassCode_2021) fields.cbPassCode.getSelectedItem(); Result.passCode = (PassCode_2021) fields.cbPassCode.getSelectedItem();
Result.sapforconfiguration_id = Current.getSapforConfiguration().id; Result.sapforconfiguration_id = Current.getSapforConfiguration().id;
} }
@Override
public void validateFields() {
/*
Vector<ScenarioCommand> commands = new Vector<>(Current.getSapforConfiguration().getCommands().values());
if (!commands.isEmpty()&&commands.get(commands.size()-1).passCode.equals(PassCode_2021.CreateParallelVariantsCoverageForScenario)){
Log.Writeln_("После построения покрытия вариантов запрещено добавлять другие команды в сценарий.");
}
*/
}
}; };
} }
} }

15
src/TestingSystem/SAPFOR/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
View File

@@ -5,18 +5,17 @@ import Common.Global;
import Common.GlobalProperties; import Common.GlobalProperties;
import Common.Utils.Utils; import Common.Utils.Utils;
import Repository.Server.ServerCode; import Repository.Server.ServerCode;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.Test;
import TestingSystem.Common.TestingPlanner;
import TestingSystem.DVM.TasksPackage.TasksPackageState;
import TestingSystem.SAPFOR.Json.SapforConfiguration_json; import TestingSystem.SAPFOR.Json.SapforConfiguration_json;
import TestingSystem.SAPFOR.Json.SapforTasksPackage_json; import TestingSystem.SAPFOR.Json.SapforTasksPackage_json;
import TestingSystem.SAPFOR.Json.SapforTasksResults_json; import TestingSystem.SAPFOR.Json.SapforTasksResults_json;
import TestingSystem.SAPFOR.Json.SapforTest_json; import TestingSystem.SAPFOR.Json.SapforTest_json;
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration; import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationInterface;
import TestingSystem.SAPFOR.SapforTask.SapforTask; import TestingSystem.SAPFOR.SapforTask.SapforTask;
import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage; import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
import TestingSystem.Common.Group.Group;
import TestingSystem.DVM.TasksPackage.TasksPackageState;
import TestingSystem.Common.Test.Test;
import TestingSystem.Common.TestingPlanner;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import javafx.util.Pair; import javafx.util.Pair;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
@@ -39,7 +38,7 @@ public class SapforTasksPackageSupervisor {
Vector<Object> tests_ = (Vector<Object>) planner.ServerCommand(ServerCode.GetObjectsCopiesByPK, "", new Pair<>(Test.class, testsIds)); Vector<Object> tests_ = (Vector<Object>) planner.ServerCommand(ServerCode.GetObjectsCopiesByPK, "", new Pair<>(Test.class, testsIds));
Vector<Object> configurations_ = (Vector<Object>) planner.ServerCommand(ServerCode.GetObjectsCopiesByPK, "", new Pair<>(SapforConfiguration.class, configurationsIds)); Vector<Object> configurations_ = (Vector<Object>) planner.ServerCommand(ServerCode.GetObjectsCopiesByPK, "", new Pair<>(SapforConfiguration.class, configurationsIds));
LinkedHashMap<Integer, Test> tests = new LinkedHashMap<>(); LinkedHashMap<Integer, Test> tests = new LinkedHashMap<>();
LinkedHashMap<String, SapforConfiguration> configurations = new LinkedHashMap<>(); LinkedHashMap<Integer, SapforConfiguration> configurations = new LinkedHashMap<>();
Vector<Integer> groupsIds = new Vector<>(); Vector<Integer> groupsIds = new Vector<>();
LinkedHashMap<Integer, Group> groups = new LinkedHashMap<>(); LinkedHashMap<Integer, Group> groups = new LinkedHashMap<>();
//-- //--
@@ -107,9 +106,9 @@ public class SapforTasksPackageSupervisor {
//-- //--
SapforConfiguration_json configuration_json = new SapforConfiguration_json(); SapforConfiguration_json configuration_json = new SapforConfiguration_json();
configuration_json.id = String.valueOf(configuration_id); configuration_json.id = String.valueOf(configuration_id);
configuration_json.flags = SapforConfigurationInterface.getFlags(configuration); configuration_json.flags = configuration.getFlags();
configuration_json.codes.add(PassCode_2021.SPF_CorrectCodeStylePass); //всегда добавляется. configuration_json.codes.add(PassCode_2021.SPF_CorrectCodeStylePass); //всегда добавляется.
configuration_json.codes.addAll(SapforConfigurationInterface.getPassCodes(configuration)); configuration_json.codes.addAll(configuration.getPassCodes());
//--->> //--->>
package_json.configurations.add(configuration_json); package_json.configurations.add(configuration_json);
//-->> //-->>

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

@@ -1,20 +1,10 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Current; import Common.Global;
import TestingSystem.Common.TestingServer;
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration; import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import Visual_DVM_2021.Passes.DeleteSelectedServerObjects; import Visual_DVM_2021.Passes.Server.DeleteServerObject;
public class DeleteSapforConfiguration extends DeleteServerObject<TestingServer, SapforConfiguration> {
import java.util.Vector;
public class DeleteSapforConfiguration extends DeleteSelectedServerObjects {
public DeleteSapforConfiguration() { public DeleteSapforConfiguration() {
super(SapforConfiguration.class); super(Global.testingServer, SapforConfiguration.class);
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (Current.Check(Log, Current.SapforConfiguration)){
target= new Vector<>();
target.add(Current.getSapforConfiguration());
return true;
}
return false;
} }
} }

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

@@ -1,20 +1,10 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Current; import Common.Global;
import TestingSystem.Common.TestingServer;
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand; import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
import Visual_DVM_2021.Passes.DeleteSelectedServerObjects; import Visual_DVM_2021.Passes.Server.DeleteServerObject;
public class DeleteSapforConfigurationCommand extends DeleteServerObject<TestingServer, SapforConfigurationCommand> {
import java.util.Vector;
public class DeleteSapforConfigurationCommand extends DeleteSelectedServerObjects {
public DeleteSapforConfigurationCommand() { public DeleteSapforConfigurationCommand() {
super(SapforConfigurationCommand.class); super(Global.testingServer, SapforConfigurationCommand.class);
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (Current.Check(Log, Current.SapforConfigurationCommand)){
target= new Vector<>();
target.add(Current.getSapforConfigurationCommand());
return true;
}
return false;
} }
} }

27
src/Visual_DVM_2021/Passes/All/EditSapforConfiguration.java
View File

@@ -1,29 +1,10 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.Database.Database;
import Common.Global; import Common.Global;
import TestingSystem.Common.TestingServer;
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration; import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import Visual_DVM_2021.Passes.EditObjectPass; import Visual_DVM_2021.Passes.Server.EditServerObject;
import Visual_DVM_2021.Passes.PassCode_2021; public class EditSapforConfiguration extends EditServerObject<TestingServer,SapforConfiguration> {
public class EditSapforConfiguration extends EditObjectPass<SapforConfiguration> {
public EditSapforConfiguration() { public EditSapforConfiguration() {
super(SapforConfiguration.class); super(Global.testingServer, SapforConfiguration.class);
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (Current.Check(Log, Current.SapforConfiguration)) {
return getTable().ShowEditObjectDialog(target = Current.getSapforConfiguration());
}
return false;
}
@Override
protected void performDone() throws Exception {
super.performDone();
//отправка.
passes.get(PassCode_2021.EditSapforConfigurationOnServer).Do(target);
}
@Override
protected Database getDb() {
return Global.testingServer.db;
} }
} }

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

@@ -1,38 +1,11 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.Database.Database;
import Common.Global; import Common.Global;
import TestingSystem.Common.TestingServer;
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand; import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
import Visual_DVM_2021.Passes.EditObjectPass; import Visual_DVM_2021.Passes.Server.EditServerObject;
import Visual_DVM_2021.Passes.PassCode_2021; public class EditSapforConfigurationCommand extends EditServerObject<TestingServer,SapforConfigurationCommand> {
public class EditSapforConfigurationCommand extends EditObjectPass<SapforConfigurationCommand> {
public EditSapforConfigurationCommand() { public EditSapforConfigurationCommand() {
super(SapforConfigurationCommand.class); super(Global.testingServer,SapforConfigurationCommand.class);
}
@Override
public String getIconPath() {
return "/icons/Edit.png";
}
@Override
public String getButtonText() {
return "";
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (Current.Check(Log, Current.SapforConfigurationCommand)) {
return getTable().ShowEditObjectDialog(target = (SapforConfigurationCommand) Current.get(Current.SapforConfigurationCommand));
}
return false;
}
@Override
protected void performDone() throws Exception {
super.performDone();
//отправка.
passes.get(PassCode_2021.EditSapforConfigurationCommandOnServer).Do(target);
}
@Override
protected Database getDb() {
return Global.testingServer.db;
} }
} }

16
src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommandOnServer.java
View File

@@ -1,16 +0,0 @@
package Visual_DVM_2021.Passes.All;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
public class EditSapforConfigurationCommandOnServer extends TestingSystemPass<SapforConfigurationCommand> {
@Override
protected boolean canStart(Object... args) throws Exception {
target = (SapforConfigurationCommand) args[0];
return true;
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.EditObject, "", target));
}
}

16
src/Visual_DVM_2021/Passes/All/EditSapforConfigurationOnServer.java
View File

@@ -1,16 +0,0 @@
package Visual_DVM_2021.Passes.All;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
public class EditSapforConfigurationOnServer extends TestingSystemPass<SapforConfiguration> {
@Override
protected boolean canStart(Object... args) throws Exception {
target = (SapforConfiguration) args[0];
return true;
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.EditObject, "", target));
}
}

44
src/Visual_DVM_2021/Passes/All/PublishSapforConfiguration.java
View File

@@ -1,42 +1,10 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Current; import Common.Global;
import Repository.Server.ServerCode; import TestingSystem.Common.TestingServer;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration; import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.Server.PublishServerObject;
import Visual_DVM_2021.Passes.Server.TestingSystemPass; public class PublishSapforConfiguration extends PublishServerObject<TestingServer, SapforConfiguration> {
public class PublishSapforConfiguration extends TestingSystemPass<SapforConfiguration> { public PublishSapforConfiguration() {
@Override super(Global.testingServer, SapforConfiguration.class);
public String getIconPath() {
return "/icons/RedAdd.png";
}
@Override
public String getButtonText() {
return "";
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (Current.getAccount().CheckRegistered(Log)) {
target = new SapforConfiguration();
target.genName();
target.sender_name = Current.getAccount().name;
target.sender_address = Current.getAccount().email;
return server.db.sapforConfigurations.ShowAddObjectDialog(target);
}
return false;
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.PublishObject, "", target));
}
@Override
protected void performFinish() throws Exception {
super.performFinish();
passes.get(PassCode_2021.SynchronizeTests).Do();
}
@Override
protected void showDone() throws Exception {
super.showDone();
server.db.sapforConfigurations.ui_.Show(target.getPK());
} }
} }

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

@@ -1,43 +1,16 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Current; import Common.Current;
import Repository.Server.ServerCode; import Common.Global;
import Repository.Server.ServerExchangeUnit_2021; import TestingSystem.Common.TestingServer;
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand; import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.Server.PublishServerObject;
import Visual_DVM_2021.Passes.Server.TestingSystemPass; public class PublishSapforConfigurationCommand extends PublishServerObject<TestingServer, SapforConfigurationCommand> {
public class PublishSapforConfigurationCommand extends TestingSystemPass<SapforConfigurationCommand> { public PublishSapforConfigurationCommand() {
@Override super(Global.testingServer, SapforConfigurationCommand.class);
public String getIconPath() {
return "/icons/RedAdd.png";
} }
@Override @Override
public String getButtonText() { public boolean fillObjectFields() throws Exception {
return ""; target.sapforconfiguration_id=Current.getSapforConfiguration().id;
} return super.fillObjectFields();
@Override
protected boolean canStart(Object... args) throws Exception {
if (Current.getAccount().CheckRegistered(Log)&& Current.Check(Log, Current.SapforConfiguration)) {
target = new SapforConfigurationCommand();
target.genName();
target.sender_name = Current.getAccount().name;
target.sender_address = Current.getAccount().email;
target.sapforconfiguration_id=Current.getSapforConfiguration().id;
return server.db.sapforConfigurationCommands.ShowAddObjectDialog(target);
}
return false;
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.PublishObject, "", target));
}
@Override
protected void performFinish() throws Exception {
super.performFinish();
passes.get(PassCode_2021.SynchronizeTests).Do();
}
@Override
protected void showDone() throws Exception {
super.showDone();
server.db.sapforConfigurationCommands.ui_.Show(target.getPK());
} }
} }

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

@@ -111,7 +111,7 @@ public class StartSapforTests extends TestingSystemPass<SapforTasksPackage> {
terminalCodesCount.put(code, new Index()); terminalCodesCount.put(code, new Index());
//-- //--
for (SapforConfigurationCommand command : Global.testingServer.db.sapforConfigurationCommands.Data.values()) { for (SapforConfigurationCommand command : Global.testingServer.db.sapforConfigurationCommands.Data.values()) {
if (command.sapforconfiguration_id.equals(sapforConfiguration.id)) { if (command.sapforconfiguration_id==sapforConfiguration.id) {
codes.add(command.passCode); codes.add(command.passCode);
//--- //---
for (PassCode_2021 t_code : Constants.terminalSapforTestingCodes) { for (PassCode_2021 t_code : Constants.terminalSapforTestingCodes) {
@@ -209,7 +209,7 @@ public class StartSapforTests extends TestingSystemPass<SapforTasksPackage> {
testsIds.add(String.valueOf(test.id)); testsIds.add(String.valueOf(test.id));
//-- //--
for (SapforConfiguration configuration : Global.testingServer.db.sapforConfigurations.getCheckedItems()) for (SapforConfiguration configuration : Global.testingServer.db.sapforConfigurations.getCheckedItems())
configurationsIds.add(configuration.id); configurationsIds.add(String.valueOf(configuration.id));
//-- //--
target.tasksCount = allTasksCount; target.tasksCount = allTasksCount;
target.testsIds = String.join("\n", testsIds); target.testsIds = String.join("\n", testsIds);

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

@@ -289,12 +289,10 @@ public enum PassCode_2021 {
//-- //--
PublishSapforConfiguration, PublishSapforConfiguration,
EditSapforConfiguration, EditSapforConfiguration,
EditSapforConfigurationOnServer,
DeleteSapforConfiguration, DeleteSapforConfiguration,
//- //-
PublishSapforConfigurationCommand, PublishSapforConfigurationCommand,
EditSapforConfigurationCommand, EditSapforConfigurationCommand,
EditSapforConfigurationCommandOnServer,
DeleteSapforConfigurationCommand, DeleteSapforConfigurationCommand,
//-> //->
DownloadSapforTasksPackage, DownloadSapforTasksPackage,
@@ -389,9 +387,7 @@ public enum PassCode_2021 {
case DeleteDownloadedBugReports: case DeleteDownloadedBugReports:
return "Удалить загруженные отчёты об ошибках"; return "Удалить загруженные отчёты об ошибках";
case DeleteSapforConfigurationCommand: case DeleteSapforConfigurationCommand:
return "Удалить выбранные команды конфигурации тестирования Sapfor на сервере"; return "Удалить команду конфигурации тестирования Sapfor";
case EditSapforConfigurationCommandOnServer:
return "Редактировать команду конфигурации тестирования Sapfor на сервере";
case EditSapforConfigurationCommand: case EditSapforConfigurationCommand:
return "Редактировать команду конфигурации тестирования Sapfor"; return "Редактировать команду конфигурации тестирования Sapfor";
case PublishSapforConfigurationCommand: case PublishSapforConfigurationCommand:
@@ -400,10 +396,8 @@ public enum PassCode_2021 {
return "Опубликовать конфигурацию тестирования SAPFOR"; return "Опубликовать конфигурацию тестирования SAPFOR";
case EditSapforConfiguration: case EditSapforConfiguration:
return "Редактировать конфигурацию тестирования SAPFOR"; return "Редактировать конфигурацию тестирования SAPFOR";
case EditSapforConfigurationOnServer:
return "Редактировать конфигурацию тестирования SAPFOR на сервере";
case DeleteSapforConfiguration: case DeleteSapforConfiguration:
return "Удалить выбранные конфигурации тестирования SAPFOR на сервере"; return "Удалить конфигурацию тестирования SAPFOR";
case ExcludeSelectedFiles: case ExcludeSelectedFiles:
return "Исключить из рассмотрения отмеченные файлы"; return "Исключить из рассмотрения отмеченные файлы";
case IncludeSelectedFiles: case IncludeSelectedFiles: