чистка лишних импортов.и фикс бага с сохранением тестов

This commit is contained in:
2025-03-23 14:28:20 +03:00
parent 811acba5a7
commit b763c2c266
69 changed files with 134 additions and 246 deletions

View File

@@ -2,8 +2,6 @@ package _VisualDVM.TestingSystem.SAPFOR.Json;
import Common.CommonConstants;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.ServerObjectsCache.SapforConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
@@ -44,12 +42,11 @@ public class SapforPackage_json implements Serializable {
public SapforPackage_json() {
}
public SapforPackage_json(ServerSapfor serverSapfor, Vector<SapforConfiguration> configurations, int kernels_in) {
sapfor_drv = serverSapfor.call_command;
kernels = kernels_in;
for (SapforConfiguration sapforConfiguration : configurations) {
Vector<Test> tests = new Vector<Test>();
for (int test_id: Global.testingServer.db.getSapforConfigurationTestsIds(sapforConfiguration)){
Vector<Test> tests = new Vector<Test>();
for (int test_id : Global.testingServer.db.getSapforConfigurationTestsIds(sapforConfiguration)) {
tests.add(Global.testingServer.db.tests.get(test_id));
}
SapforTestingSet_json testingSet = new SapforTestingSet_json(tests, sapforConfiguration);

View File

@@ -1,11 +1,8 @@
package _VisualDVM.TestingSystem.SAPFOR.Json;
import Common.CommonConstants;
import _VisualDVM.Global;
import _VisualDVM.ServerObjectsCache.SapforConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import com.google.gson.annotations.Expose;
import java.io.Serializable;
@@ -25,7 +22,7 @@ public class SapforTestingSet_json implements Serializable {
public SapforTestingSet_json(Vector<Test> tests_in, SapforConfiguration configuration) {
for (Test test : tests_in)
tests.add(new SapforTest_json(test));
for (int settings_id:Global.testingServer.db.getSapforConfigurationSettingsIds(configuration)) {
for (int settings_id : Global.testingServer.db.getSapforConfigurationSettingsIds(configuration)) {
configurations.add(new SapforConfiguration_json(Global.testingServer.db.sapforSettings.get(settings_id)));
}
}