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

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

@@ -5,15 +5,20 @@ import TestingSystem.Common.Configuration.Configuration;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Group.Json.GroupJson;
import TestingSystem.Common.Group.Json.GroupsJson;
import TestingSystem.Common.Settings.Json.SettingsArrayJson;
import TestingSystem.Common.Settings.Json.SettingsJson;
import TestingSystem.Common.Test.Json.TestJson;
import TestingSystem.Common.Test.Json.TestsJson;
import TestingSystem.Common.Test.Test;
import java.util.LinkedHashMap;
import java.util.Vector;
public class ConfigurationCache extends VisualCache{
public GroupsJson groupsJson = null;
public String groupsDescriptions = null;
public TestsJson testsJson = null;
public SettingsArrayJson settingsJson = null;
public String settingsSummary = null;
public Vector<String> groupsSummary= null;
//--
public ConfigurationCache(Configuration configuration) {
if (configuration.packedGroupsJson.isEmpty()) {
@@ -30,16 +35,38 @@ public class ConfigurationCache extends VisualCache{
testsJson = Utils.gson.fromJson(configuration.packedTestsJson, TestsJson.class);
}
//-
Vector<String> groupsDescriptionsVector = new Vector<>();
for (GroupJson groupJson : groupsJson.array)
groupsDescriptionsVector.add(groupJson.description);
groupsDescriptions= String.join(";", groupsDescriptionsVector);
if (settingsJson == null) {
if (configuration.packedSettingsJson.isEmpty())
settingsJson = new SettingsArrayJson(); //просто пустой
else
settingsJson = Utils.gson.fromJson(configuration.packedSettingsJson, SettingsArrayJson.class);
}
//-
LinkedHashMap<String, Vector<String>> gmap = new LinkedHashMap<>();
for (GroupJson groupJson: groupsJson.array){
Vector<String> vector = null;
if (gmap.containsKey(groupJson.language)){
vector = gmap.get(groupJson.language);
}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)));
}
Vector<String> settingsDescriptionsVector = new Vector<>();
for (SettingsJson settingsJson : settingsJson.array)
settingsDescriptionsVector.add(settingsJson.description);
settingsSummary = String.join(";", settingsDescriptionsVector);
}
public int getTestsCount() {
return testsJson.array.size();
}
public String getGroupsDescriptions() {
return groupsDescriptions;
public String getSettingsDescriptions() {
return settingsSummary;
}
public Vector<Group> getGroups(){
Vector<Group> groups = new Vector<>();