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

fix. исправил падение при несуществующих тестах.

Browse Source
This commit is contained in:
02090095
2023-11-15 01:57:03 +03:00
parent cf65448a13
commit 5a30f7d22d
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
View File

@@ -44,12 +44,9 @@ public class SapforTasksPackageSupervisor {
LinkedHashMap<String, Group> groups = new LinkedHashMap<>(); LinkedHashMap<String, Group> groups = new LinkedHashMap<>();
//-- //--
System.out.println(sapforTasksPackage.id + " — TestsSynchronize"); System.out.println(sapforTasksPackage.id + " — TestsSynchronize");
System.out.println("configurations size =" + configurations_.size());
System.out.println("tests size =" + tests_.size());
for (String test_id : testsIds) { for (String test_id : testsIds) {
System.out.println(Utils.Brackets(test_id)); System.out.println(Utils.Brackets(test_id));
} }
System.out.println("=======");
for (Object o : tests_) { for (Object o : tests_) {
Test test = (Test) o; Test test = (Test) o;
tests.put(test.id, test); tests.put(test.id, test);
@@ -58,7 +55,7 @@ public class SapforTasksPackageSupervisor {
} }
//-- //--
Vector<Object> groups_ = (Vector<Object>) planner.ServerCommand(ServerCode.GetObjectsCopiesByPK, "", new Pair<>(Group.class, groupsIds)); Vector<Object> groups_ = (Vector<Object>) planner.ServerCommand(ServerCode.GetObjectsCopiesByPK, "", new Pair<>(Group.class, groupsIds));
System.out.println("groups size =" + groups_.size());
for (Object o : groups_) { for (Object o : groups_) {
Group group = (Group) o; Group group = (Group) o;
groups.put(group.id, group); groups.put(group.id, group);
@@ -66,9 +63,11 @@ public class SapforTasksPackageSupervisor {
//-- //--
for (Object o : configurations_) { for (Object o : configurations_) {
SapforConfiguration sapforConfiguration = (SapforConfiguration) o; SapforConfiguration sapforConfiguration = (SapforConfiguration) o;
System.out.println(sapforConfiguration.id);
configurations.put(sapforConfiguration.id, sapforConfiguration); configurations.put(sapforConfiguration.id, sapforConfiguration);
} }
//---
//-- //--
SapforTasksPackage_json package_json = new SapforTasksPackage_json(); SapforTasksPackage_json package_json = new SapforTasksPackage_json();
package_json.kernels = sapforTasksPackage.kernels; package_json.kernels = sapforTasksPackage.kernels;
@@ -96,8 +95,8 @@ public class SapforTasksPackageSupervisor {
//-->> //-->>
File configurationWorkspace = new File(packageWorkspace, configuration_id); File configurationWorkspace = new File(packageWorkspace, configuration_id);
FileUtils.forceMkdir(configurationWorkspace); FileUtils.forceMkdir(configurationWorkspace);
for (String test_id : testsIds) { //--->>>
Test test = tests.get(test_id); for (Test test : tests.values()) {
File test_root = new File(configurationWorkspace, test.description); File test_root = new File(configurationWorkspace, test.description);
Utils.CheckAndCleanDirectory(test_root); Utils.CheckAndCleanDirectory(test_root);
FileUtils.copyDirectory(new File(Global.TestsDirectory, test.id), test_root); FileUtils.copyDirectory(new File(Global.TestsDirectory, test.id), test_root);