no message
This commit is contained in:
@@ -1,8 +1,10 @@
|
||||
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;
|
||||
import _VisualDVM.TestingSystem.SAPFOR.SapforTask.ComparisonState;
|
||||
@@ -42,12 +44,15 @@ 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) {
|
||||
SapforTestingSet_json testingSet =
|
||||
new SapforTestingSet_json(((SapforConfigurationCache) VisualCaches.GetCache(sapforConfiguration)).getTests(), 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);
|
||||
testingSet.id = getMaxSetId();
|
||||
testingSets.add(testingSet);
|
||||
// формирование задач
|
||||
@@ -64,7 +69,6 @@ public class SapforPackage_json implements Serializable {
|
||||
}
|
||||
tasks.addAll(sortedTasks.values());
|
||||
}
|
||||
*/
|
||||
}
|
||||
public int getMaxSetId() {
|
||||
return max_set_id++;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
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;
|
||||
@@ -24,9 +25,8 @@ 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 (SapforSettings sapforSettings : ((SapforConfigurationCache) VisualCaches.GetCache(configuration)).getSettings())
|
||||
configurations.add(new SapforConfiguration_json(sapforSettings));
|
||||
*/
|
||||
for (int settings_id:Global.testingServer.db.getSapforConfigurationSettingsIds(configuration)) {
|
||||
configurations.add(new SapforConfiguration_json(Global.testingServer.db.sapforSettings.get(settings_id)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user