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

no message

Browse Source
This commit is contained in:
02090095
2025-03-23 13:06:44 +03:00
parent f6cc447481
commit bc1faa1a06
5 changed files with 33 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforPackage_json.java
View File

@@ -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++;

8
src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforTestingSet_json.java
View File

@@ -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)));
}
}
}

36
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
View File

@@ -3,6 +3,7 @@ import Common.CommonConstants;
import Common.Database.Objects.DBObject;
import Common.Utils.TextLog;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Settings.Settings;
@@ -13,6 +14,7 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationTest.SapforConfigurati
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import com.sun.org.glassfish.gmbal.Description;
import java.util.LinkedHashMap;
import java.util.Vector;
public class SapforConfiguration extends Configuration {
@Description("DEFAULT -1")
@@ -57,22 +59,22 @@ public class SapforConfiguration extends Configuration {
}
@Override
public boolean validate(TextLog Log) {
Vector<Integer> groups_ids = Global.testingServer.db.getSapforConfigurationGroupsIds();
Vector<Integer>tests_ids = ;
Vector<Group> groups = cache.getGroups();
Vector<SapforSettings> settingsArray = cache.getSettings();
Vector<Test> tests = cache.getTests();
Vector<Integer> groups_ids = Global.testingServer.db.getSapforConfigurationGroupsIds(this);
Vector<Integer> tests_ids = Global.testingServer.db.getSapforConfigurationTestsIds(this) ;
Vector<Integer> settings_ids = Global.testingServer.db.getSapforConfigurationSettingsIds(this);
//--
Vector<Group> groups = new Vector<>();
Vector<LanguageName> groupsLanguages = new Vector<>();
for (Group group : groups) {
if (!groupsLanguages.contains(group.language))
groupsLanguages.add(group.language);
for (int group_id: groups_ids){
LanguageName languageName = Global.testingServer.db.groups.get(group_id).language;
if (!groupsLanguages.contains(languageName))
groupsLanguages.add(languageName);
}
//---
//1. проверка цепочек команд на корректность
for (SapforSettings sapforSettings : settingsArray) {
sapforSettings.validate(Log);
for (int settings_id: settings_ids) {
Global.testingServer.db.sapforSettings.get(settings_id).validate(Log);
}
//2. Проверка входящих групп на единственный язык фортран
if (groupsLanguages.size() > 1) {
@@ -82,13 +84,13 @@ public class SapforConfiguration extends Configuration {
Log.Writeln_("Поддерживается пакетный режим только для языка Fortran");
}
//-
LinkedHashMap<String, Test> testsByDescriptions = new LinkedHashMap<>();
for (Test test : tests) {
String l_description = test.description.toLowerCase();
if (testsByDescriptions.containsKey(l_description)) {
Log.Writeln_("В конфигурацию тестирования SAPFOR не могут входить тесты с одинаковыми именами (без учета регистра):" + test.description.toLowerCase());
Vector<String> testsDescriptions = new Vector<>();
for (int test_id: tests_ids) {
String l_description = Global.testingServer.db.tests.get(test_id).description.toLowerCase();
if (testsDescriptions.contains(l_description)) {
Log.Writeln_("В конфигурацию тестирования SAPFOR не могут входить тесты с одинаковыми именами (без учета регистра):" + l_description);
} else {
testsByDescriptions.put(l_description, test);
testsDescriptions.add(l_description);
}
}
//-