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

Рефакторинг конструкторов объектов тестирования.

Browse Source
This commit is contained in:
02090095
2024-10-01 17:33:08 +03:00
parent b89283fc91
commit d18eb3327e
44 changed files with 1048 additions and 993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Common/Constants.java
View File

@@ -477,7 +477,7 @@ public class Constants {
public static String all_forbidden_characters_string = "";
public static Vector<String> admins_mails = new Vector_<>(
"vmk-post@yandex.ru",
"79854210702@ya.ru"
"vmk-post@yandex.ru"
// "79854210702@ya.ru"
);
}

12
src/Common/Current.java
View File

@@ -101,7 +101,6 @@ public enum Current {
//-
PackageVersion,
SapforConfiguration,
SapforConfigurationCommand,
SapforProfile,
SapforProfileSetting,
//--
@@ -109,7 +108,8 @@ public enum Current {
SubscriberWorkspace,
DVMRunTask,
SapforSettings,
SapforSettingsCommand
SapforSettingsCommand,
DVMSettings,
;
//-
private static final LinkedHashMap<Current, Object> objects = new LinkedHashMap<>();
@@ -383,10 +383,12 @@ public enum Current {
//--------------------------------------------
public String getDescription() {
switch (this) {
case DVMSettings:
return "Параметры тестирования DVM системы";
case SapforSettings:
return "Настройки системы SAPFOR";
return "Параметры тестирования системы SAPFOR";
case SapforSettingsCommand:
return "Команда настроек тестирования SAPFOR";
return "Команда SAPFOR";
case DVMRunTask:
return "Задача DVM тестирования";
case SapforPackage:
@@ -413,8 +415,6 @@ public enum Current {
return "Адресат";
case SelectedFunction:
return "Выбранный узел графа процедур";
case SapforConfigurationCommand:
return "Команда конфигурации тестирования SAPFOR";
case SapforConfiguration:
return "Конфигурация тестирования SAPFOR";
case PackageVersion:

3
src/Common/UI/UI.java
View File

@@ -70,6 +70,8 @@ import TestingSystem.DVM.DVMConfiguration.DVMConfigurationDBTable;
import TestingSystem.DVM.DVMConfiguration.DVMConfigurationsMenuBar;
import TestingSystem.DVM.DVMPackage.DVMPackageDBTable;
import TestingSystem.DVM.DVMPackage.DVMPackagesBar;
import TestingSystem.DVM.DVMSettings.DVMSettingsDBTable;
import TestingSystem.DVM.DVMSettings.UI.DVMSettingsBar;
import TestingSystem.DVM.DVMTasks.DVMRunTasksBar;
import TestingSystem.DVM.DVMTasks.DVMRunTasksSet;
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationDBTable;
@@ -259,6 +261,7 @@ public class UI {
menuBars.put(ServerSapforsDBTable.class, new ServerSapforsBar());
menuBars.put(SapforSettingsDBTable.class, new SapforSettingsBar());
menuBars.put(SapforSettingsCommandsDBTable.class, new SapforSettingsCommandsBar());
menuBars.put(DVMSettingsDBTable.class, new DVMSettingsBar());
//---->>
}
public static void CreateWindows() {

39
src/Common/UI/VisualCache/ConfigurationCache.java
View File

@@ -13,18 +13,17 @@ import TestingSystem.Common.Test.Test;
import java.util.LinkedHashMap;
import java.util.Vector;
public class ConfigurationCache extends VisualCache{
public class ConfigurationCache extends VisualCache {
public GroupsJson groupsJson = null;
public TestsJson testsJson = null;
public SettingsArrayJson settingsJson = null;
public String settingsSummary = null;
public Vector<String> groupsSummary= null;
public Vector<String> groupsSummary = null;
//--
public ConfigurationCache(Configuration configuration) {
if (configuration.packedGroupsJson.isEmpty()) {
groupsJson = new GroupsJson(); //просто пустой
}
else {
} else {
groupsJson = Utils.gson.fromJson(configuration.packedGroupsJson, GroupsJson.class);
}
//--
@@ -43,19 +42,19 @@ public class ConfigurationCache extends VisualCache{
}
//-
LinkedHashMap<String, Vector<String>> gmap = new LinkedHashMap<>();
for (GroupJson groupJson: groupsJson.array){
for (GroupJson groupJson : groupsJson.array) {
Vector<String> vector = null;
if (gmap.containsKey(groupJson.language)){
if (gmap.containsKey(groupJson.language)) {
vector = gmap.get(groupJson.language);
}else {
} else {
vector = new Vector<>();
gmap.put(groupJson.language, vector);
}
vector.add(groupJson.description);
}
groupsSummary = new Vector<>();
for (String language: gmap.keySet()){
groupsSummary.add(language+": "+String.join(";", gmap.get(language)));
for (String language : gmap.keySet()) {
groupsSummary.add(language + ": " + String.join(";", gmap.get(language)));
}
Vector<String> settingsDescriptionsVector = new Vector<>();
for (SettingsJson settingsJson : settingsJson.array)
@@ -65,23 +64,31 @@ public class ConfigurationCache extends VisualCache{
public int getTestsCount() {
return testsJson.array.size();
}
public String getSettingsDescriptions() {
return settingsSummary;
}
public Vector<Group> getGroups(){
public Vector<Group> getGroups() {
Vector<Group> groups = new Vector<>();
for (GroupJson groupJson : groupsJson.array){
for (GroupJson groupJson : groupsJson.array) {
if (Global.testingServer.db.groups.containsKey(groupJson.id))
groups.add(Global.testingServer.db.groups.get(groupJson.id));
}
return groups;
}
public Vector<Test> getTests(){
public Vector<Test> getTests() {
Vector<Test> tests = new Vector<>();
for (TestJson testJson : testsJson.array){
for (TestJson testJson : testsJson.array) {
if (Global.testingServer.db.tests.containsKey(testJson.id))
tests.add(Global.testingServer.db.tests.get(testJson.id));
}
return tests;
}
public Vector<Test> getGroupTests(Group group) {
Vector<Test> tests = new Vector<>();
for (TestJson testJson : testsJson.array) {
if (Global.testingServer.db.tests.containsKey(testJson.id)) {
Test test = Global.testingServer.db.tests.get(testJson.id);
if (test.group_id == group.id)
tests.add(test);
}
}
return tests;
}
}

20
src/Common/UI/VisualCache/DVMConfigurationCache.java Normal file
View File

@@ -0,0 +1,20 @@
package Common.UI.VisualCache;
import Common.Global;
import TestingSystem.Common.Configuration.Configuration;
import TestingSystem.Common.Settings.Json.SettingsJson;
import TestingSystem.DVM.DVMSettings.DVMSettings;
import java.util.Vector;
public class DVMConfigurationCache extends ConfigurationCache{
public DVMConfigurationCache(Configuration configuration) {
super(configuration);
}
public Vector<DVMSettings> getSettings(){
Vector<DVMSettings> res = new Vector<>();
for (SettingsJson settingsJson : settingsJson.array){
if (Global.testingServer.db.dvmSettings.containsKey(settingsJson.id))
res.add(Global.testingServer.db.dvmSettings.get(settingsJson.id));
}
return res;
}
}

2
src/Common/UI/VisualCache/VisualCaches.java
View File

@@ -24,7 +24,7 @@ public class VisualCaches {
if (object instanceof SapforConfiguration)
return new SapforConfigurationCache((Configuration) object);
if (object instanceof DVMConfiguration)
return new ConfigurationCache((Configuration) object);
return new DVMConfigurationCache((Configuration) object);
if (object instanceof TestingPackage)
return new PackageCache((TestingPackage) object);
return new VisualCache();