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

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

Browse Source
This commit is contained in:
02090095
2025-03-23 14:28:20 +03:00
parent 811acba5a7
commit b763c2c266
69 changed files with 134 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java
View File

@@ -3,16 +3,12 @@ import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject;
import Common.Utils.TextLog;
import Common.Utils.Utils_;
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Settings.Json.SettingsArrayJson;
import _VisualDVM.TestingSystem.Common.Settings.Json.SettingsJson;
import _VisualDVM.TestingSystem.Common.Settings.Settings;
import _VisualDVM.TestingSystem.Common.Test.Test;
import com.sun.org.glassfish.gmbal.Description;
import javax.swing.*;
import java.util.List;
import java.util.Vector;
public class Configuration extends riDBObject {
//конфигурация = данные для пакета.
@@ -41,7 +37,7 @@ public class Configuration extends riDBObject {
return autoTesting != 0 ? "Да" : "Нет";
}
public String printGroupsOnly() {
return groupsOnly !=0 ? "Да" : "Нет";
return groupsOnly != 0 ? "Да" : "Нет";
}
public void SwitchAuto() {
autoTesting = (autoTesting == 0) ? 1 : 0;
@@ -55,7 +51,6 @@ public class Configuration extends riDBObject {
public void saveTests(Vector<Test> tests) {
}
public void saveSettings(Vector<Settings> settings_in) {
}
//--
@Override

1
src/_VisualDVM/TestingSystem/Common/Group/Group.java
View File

@@ -6,7 +6,6 @@ import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Files.ProjectFile;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.TestingSystem.Common.Test.TestType;
import _VisualDVM.Utils;
import com.sun.org.glassfish.gmbal.Description;

2
src/_VisualDVM/TestingSystem/Common/Test/Test.java
View File

@@ -93,7 +93,7 @@ public class Test extends riDBObject {
//--
return true;
}
public Vector<File> getServerFiles(){
public Vector<File> getServerFiles() {
File path = getServerPath();
Vector<File> res = new Vector<>();
for (TestFile testFile : Global.testingServer.db.getVectorByFK(this, TestFile.class))

26
src/_VisualDVM/TestingSystem/Common/TestFile/TestFile.java
View File

@@ -13,6 +13,19 @@ public class TestFile extends projectFile_ {
public int id;
public int test_id = CommonConstants.Nan;
public String name; //имя относительно корневой папки проекта. не ключ.
public TestFile() {
}
public TestFile(Test test) {
test_id = test.id;
}
public TestFile(File file_in) {
super(file_in);
name = file_in.getName();
}
public TestFile(Test test, File file_in) {
this(file_in);
test_id = test.id;
}
@Override
public Object getPK() {
return id;
@@ -29,17 +42,4 @@ public class TestFile extends projectFile_ {
test_id = src_.test_id;
name = src_.name;
}
public TestFile() {
}
public TestFile(Test test) {
test_id = test.id;
}
public TestFile(File file_in){
super(file_in);
name = file_in.getName();
}
public TestFile(Test test, File file_in){
this(file_in);
test_id = test.id;
}
}

4
src/_VisualDVM/TestingSystem/Common/TestFile/TestFilesDBTable.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.TestingSystem.Common.TestFile;
import Common.Database.Tables.DBTable;
public class TestFilesDBTable extends DBTable<Integer,TestFile> {
public class TestFilesDBTable extends DBTable<Integer, TestFile> {
public TestFilesDBTable() {
super(Integer.class,TestFile.class);
super(Integer.class, TestFile.class);
}
}

1
src/_VisualDVM/TestingSystem/Common/TestingPlanner.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.TestingSystem.Common;
import Common.CommonConstants;
import Common.Utils.Loggable;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.Machine.MachineType;

21
src/_VisualDVM/TestingSystem/Common/TestingServer.java
View File

@@ -159,40 +159,39 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
}
@Override
protected void afterEditAction(DBObject object) throws Exception {
if (object instanceof DVMConfiguration){
if (object instanceof DVMConfiguration) {
DVMConfiguration dvmConfiguration = (DVMConfiguration) object;
//--
if (dvmConfiguration.groups!=null)
if (dvmConfiguration.groups != null)
db.dvmConfigurationGroups.ActualizeData(
db.getVectorByFK(dvmConfiguration, DVMConfigurationGroup.class),
dvmConfiguration.groups);
if (dvmConfiguration.tests!=null)
if (dvmConfiguration.tests != null)
db.dvmConfigurationTests.ActualizeData(
db.getVectorByFK(dvmConfiguration, DVMConfigurationTest.class),
dvmConfiguration.tests);
if (dvmConfiguration.settings!=null)
if (dvmConfiguration.settings != null)
db.dvmConfigurationSettings.ActualizeData(
db.getVectorByFK(dvmConfiguration, DVMConfigurationSettings.class),
dvmConfiguration.settings);
dvmConfiguration.settings);
//--
}else if (object instanceof SapforConfiguration){
} else if (object instanceof SapforConfiguration) {
SapforConfiguration sapforConfiguration = (SapforConfiguration) object;
if (sapforConfiguration.groups!=null)
if (sapforConfiguration.groups != null)
db.sapforConfigurationGroups.ActualizeData(
db.getVectorByFK(sapforConfiguration, SapforConfigurationGroup.class),
sapforConfiguration.groups
);
if (sapforConfiguration.tests!=null)
if (sapforConfiguration.tests != null)
db.sapforConfigurationTests.ActualizeData(
db.getVectorByFK(sapforConfiguration, SapforConfigurationTest.class),
sapforConfiguration.tests
);
if (sapforConfiguration.settings!=null)
if (sapforConfiguration.settings != null)
db.sapforConfigurationSettings.ActualizeData(
db.getVectorByFK(sapforConfiguration, SapforConfigurationSettings.class),
sapforConfiguration.settings
);
}
}
@Override
@@ -693,7 +692,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
}
void GetDVMPackageCredentials() throws Exception {
int package_id = (int) request.object;
checkExistense(package_id,DVMPackage.class);
checkExistense(package_id, DVMPackage.class);
DVMPackageCredentials res = machines_db.dvmPackagesCredentials.getForPackageId(package_id);
if (res == null)
throw new RepositoryRefuseException("Не найдено учетных данных для пакета " + Utils_.Brackets(package_id));

14
src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java
View File

@@ -14,11 +14,6 @@ import java.util.Vector;
//конфгурация тестирования ДВМ
public class DVMConfiguration extends Configuration {
public int c_maxtime = 40;
public DVMConfiguration(DVMConfiguration src) {
this.SynchronizeFields(src);
}
public DVMConfiguration() {
}
//--
@Description("IGNORE")
public Vector<DVMConfigurationGroup> groups = null;
@@ -26,6 +21,11 @@ public class DVMConfiguration extends Configuration {
public Vector<DVMConfigurationTest> tests = null;
@Description("IGNORE")
public Vector<DVMConfigurationSettings> settings = null;
public DVMConfiguration(DVMConfiguration src) {
this.SynchronizeFields(src);
}
public DVMConfiguration() {
}
//--
@Override
public void SynchronizeFields(DBObject src) {
@@ -42,13 +42,13 @@ public class DVMConfiguration extends Configuration {
@Override
public void saveTests(Vector<Test> tests_in) {
tests = new Vector<>();
for (Test test:tests_in)
for (Test test : tests_in)
tests.add(new DVMConfigurationTest(this, test));
}
@Override
public void saveSettings(Vector<Settings> settings_in) {
settings = new Vector<>();
for (Settings dvmSettings: settings_in){
for (Settings dvmSettings : settings_in) {
settings.add(new DVMConfigurationSettings(this, (DVMSettings) dvmSettings));
}
}

2
src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationFields.java
View File

@@ -10,9 +10,9 @@ public class DVMConfigurationFields implements DialogFields {
public JSpinner sCompilationMaxtime;
public JSpinner sRunMaxtime;
public JSpinner sKernels;
public JCheckBox cbGroupsOnly;
//-
private JPanel content;
public JCheckBox cbGroupsOnly;
public DVMConfigurationFields() {
sCompilationMaxtime.setModel(new SpinnerNumberModel(40,
5, 3600, 1

1
src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java
View File

@@ -57,7 +57,6 @@ public class DVMConfigurationsForm extends RDataSetControlForm<DVMConfiguration>
return RendererMultiline.class;
}
},
new ColumnInfo<DVMConfiguration>("тестов") {
@Override
public Object getFieldAt(DVMConfiguration object) {

12
src/_VisualDVM/TestingSystem/DVM/DVMConfigurationGroup/DVMConfigurationGroup.java
View File

@@ -7,6 +7,12 @@ import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
public class DVMConfigurationGroup extends iDBObject {
public int dvmconfiguration_id = CommonConstants.Nan;
public int group_id = CommonConstants.Nan;
public DVMConfigurationGroup() {
}
public DVMConfigurationGroup(DVMConfiguration configuration, Group group) {
dvmconfiguration_id = configuration.id;
group_id = group.id;
}
@Override
public void SynchronizeFields(DBObject src) {
super.SynchronizeFields(src);
@@ -14,10 +20,4 @@ public class DVMConfigurationGroup extends iDBObject {
dvmconfiguration_id = src_.dvmconfiguration_id;
group_id = src_.group_id;
}
public DVMConfigurationGroup() {
}
public DVMConfigurationGroup(DVMConfiguration configuration, Group group) {
dvmconfiguration_id = configuration.id;
group_id = group.id;
}
}

2
src/_VisualDVM/TestingSystem/DVM/DVMConfigurationGroup/DVMConfigurationGroupsDBTable.java
View File

@@ -6,6 +6,6 @@ public class DVMConfigurationGroupsDBTable extends iDBTable<DVMConfigurationGrou
}
@Override
public boolean isEqual(DVMConfigurationGroup o1, DVMConfigurationGroup o2) {
return o1.dvmconfiguration_id == o2.dvmconfiguration_id && o1.group_id == o2.group_id;
return o1.dvmconfiguration_id == o2.dvmconfiguration_id && o1.group_id == o2.group_id;
}
}

1
src/_VisualDVM/TestingSystem/DVM/DVMConfigurationSettings/DVMConfigurationSettings.java
View File

@@ -3,7 +3,6 @@ import Common.CommonConstants;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.iDBObject;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import _VisualDVM.TestingSystem.DVM.DVMConfigurationTest.DVMConfigurationTest;
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
public class DVMConfigurationSettings extends iDBObject {
public int dvmconfiguration_id = CommonConstants.Nan;

2
src/_VisualDVM/TestingSystem/DVM/DVMConfigurationSettings/DVMConfigurationSettingsDBTable.java
View File

@@ -6,6 +6,6 @@ public class DVMConfigurationSettingsDBTable extends iDBTable<DVMConfigurationSe
}
@Override
public boolean isEqual(DVMConfigurationSettings o1, DVMConfigurationSettings o2) {
return o1.dvmconfiguration_id==o2.dvmconfiguration_id&&o1.dvmsettings_id==o2.dvmsettings_id;
return o1.dvmconfiguration_id == o2.dvmconfiguration_id && o1.dvmsettings_id == o2.dvmsettings_id;
}
}

6
src/_VisualDVM/TestingSystem/DVM/DVMConfigurationTest/DVMConfigurationTest.java
View File

@@ -4,15 +4,13 @@ import Common.Database.Objects.DBObject;
import Common.Database.Objects.iDBObject;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import _VisualDVM.TestingSystem.DVM.DVMConfigurationGroup.DVMConfigurationGroup;
public class DVMConfigurationTest extends iDBObject {
public int dvmconfiguration_id = CommonConstants.Nan;
public int test_id = CommonConstants.Nan;
public DVMConfigurationTest(){
public DVMConfigurationTest() {
}
public DVMConfigurationTest(DVMConfiguration dvmConfiguration, Test test) {
dvmconfiguration_id= dvmConfiguration.id;
dvmconfiguration_id = dvmConfiguration.id;
test_id = test.id;
}
@Override

2
src/_VisualDVM/TestingSystem/DVM/DVMConfigurationTest/DVMConfigurationTestsDBTable.java
View File

@@ -6,6 +6,6 @@ public class DVMConfigurationTestsDBTable extends iDBTable<DVMConfigurationTest>
}
@Override
public boolean isEqual(DVMConfigurationTest o1, DVMConfigurationTest o2) {
return o1.dvmconfiguration_id==o2.dvmconfiguration_id && o2.test_id==o2.test_id;
return o1.dvmconfiguration_id == o2.dvmconfiguration_id && o1.test_id == o2.test_id;
}
}

5
src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java
View File

@@ -11,7 +11,6 @@ import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.Machine.MachineType;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.GlobalData.User.User;
import _VisualDVM.ServerObjectsCache.DVMConfigurationCache;
import _VisualDVM.ServerObjectsCache.DVMSettingsCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.Common.Group.Group;
@@ -85,7 +84,7 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
Vector<DVMCompilationTask> compilationTasks = new Vector<DVMCompilationTask>();
for (DVMConfiguration configuration : configurations) {
//--
LinkedHashMap<Integer,Vector<Integer>> groupsTestsIds= Global.testingServer.db.getDVMConfigurationGroupsTestsIds(configuration);
LinkedHashMap<Integer, Vector<Integer>> groupsTestsIds = Global.testingServer.db.getDVMConfigurationGroupsTestsIds(configuration);
Vector<Integer> settingsIds = Global.testingServer.db.getDVMConfigurationSettingsIds(configuration);
for (int group_id : groupsTestsIds.keySet()) {
Group group = Global.testingServer.db.groups.get(group_id);
@@ -98,7 +97,7 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
DVMRunTask ethalon = null; //эталон. последовательная задача -s без окружения и матрицы.
//--
for (int settings_id : settingsIds) {
DVMSettings dvmSettings=Global.testingServer.db.dvmSettings.get(settings_id);
DVMSettings dvmSettings = Global.testingServer.db.dvmSettings.get(settings_id);
//---
DVMSettingsCache settingsCache = (DVMSettingsCache) VisualCaches.GetCache(dvmSettings);
Vector<Pair<String, String>> params = settingsCache.getTasksParameters();

1
src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage_json.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.TestingSystem.DVM.DVMPackage;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMCompilationTask;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
import com.google.gson.annotations.Expose;
import java.io.Serializable;

1
src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java
View File

@@ -5,7 +5,6 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import _VisualDVM.TestingSystem.Common.TestFile.TestFile;
import _VisualDVM.TestingSystem.DVM.DVMConfigurationSettings.DVMConfigurationSettings;
import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsForm;

4
src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java
View File

@@ -14,8 +14,8 @@ public class DVMCompilationTask extends DVMTask {
public DVMCompilationTask() {
}
//--
public DVMCompilationTask(Index index,DVMConfiguration configuration, String flags_in, Group group, Test test) {
super(index,configuration, group, test, flags_in);
public DVMCompilationTask(Index index, DVMConfiguration configuration, String flags_in, Group group, Test test) {
super(index, configuration, group, test, flags_in);
maxtime = configuration.c_maxtime;
}
//--

3
src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTask.java
View File

@@ -9,7 +9,6 @@ import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.TestingSystem.Common.Test.TestType;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
import _VisualDVM.Utils;
import com.google.gson.annotations.Expose;
@@ -49,7 +48,7 @@ public class DVMRunTask extends DVMTask {
String environments_in,
int kernels_in
) {
super(index,configuration, group, test, flags_in);
super(index, configuration, group, test, flags_in);
//--------------------------
dvmcompilationtask_id = dvmCompilationTask.id;
//инфа о компиляции.

5
src/_VisualDVM/TestingSystem/DVM/DVMTestingPlanner.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.TestingSystem.DVM;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.ProjectData.Files.ProjectFile;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.Repository.Server.ServerCode;
@@ -9,16 +8,12 @@ import _VisualDVM.TestingSystem.Common.TasksPackageState;
import _VisualDVM.TestingSystem.Common.TestingPlanner;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMCompilationTask;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMTask;
import _VisualDVM.Utils;
import org.apache.commons.io.FileUtils;
import java.io.File;
import java.io.FileFilter;
import java.nio.charset.Charset;
import java.nio.file.Paths;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Vector;
public abstract class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
public DVMTestingPlanner(String[] args) {

17
src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java
View File

@@ -3,18 +3,15 @@ import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.Passes.All.UnzipFolderPass;
import _VisualDVM.TestingSystem.Common.TasksPackageState;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMCompilationTask;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
import _VisualDVM.Utils;
import javafx.util.Pair;
import org.apache.commons.io.FileUtils;
import java.io.File;
import java.nio.file.Paths;
import java.util.*;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Vector;
public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
RemoteFile packageRemoteWorkspace = null;
public RemoteDVMTestingPlanner(String... args) {
@@ -174,10 +171,10 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
@Override
protected void DownloadResults() throws Exception {
Utils_.CheckDirectory(packageLocalWorkspace);
RemoteFile killedFile = new RemoteFile(packageRemoteWorkspace,"kill");
if (user.connection.Exists(killedFile)){
RemoteFile killedFile = new RemoteFile(packageRemoteWorkspace, "kill");
if (user.connection.Exists(killedFile)) {
UpdatePackageState(TasksPackageState.Aborted);
}else {
} else {
RemoteFile remote_results_archive = new RemoteFile(packageRemoteWorkspace, "results.zip");
File results_archive = new File(packageLocalWorkspace, "results.zip");
user.connection.performScript(packageRemoteWorkspace, "zip -r " + Utils_.DQuotes("results.zip") + " " + Utils_.DQuotes("results"));
@@ -190,7 +187,7 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
UpdatePackageState(TasksPackageState.Analysis);
}
//---
if (testingPackage.eraseWorkspace!=0 && user.connection.Exists(packageRemoteWorkspace))
if (testingPackage.eraseWorkspace != 0 && user.connection.Exists(packageRemoteWorkspace))
user.connection.RMDIR(packageRemoteWorkspace.full_name);
}
@Override

2
src/_VisualDVM/TestingSystem/DVM/UserConnection.java
View File

@@ -493,7 +493,7 @@ public class UserConnection {
commands_.add("cd " + Utils_.DQuotes(directory.full_name));
for (int i = 0; i < commands.length; ++i) {
if (i == commands.length - 1) {
commands_.add(commands[i] + " 1>" + Utils_.DQuotes(outFileName) +" 2>err.txt");
commands_.add(commands[i] + " 1>" + Utils_.DQuotes(outFileName) + " 2>err.txt");
} else {
commands_.add(commands[i]);
}

7
src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforPackage_json.java
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);

5
src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforTestingSet_json.java
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)));
}
}

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

@@ -14,7 +14,6 @@ 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")
@@ -25,6 +24,11 @@ public class SapforConfiguration extends Configuration {
public Vector<SapforConfigurationTest> tests = null;
@Description("IGNORE")
public Vector<SapforConfigurationSettings> settings = null;
public SapforConfiguration(SapforConfiguration sapforConfiguration) {
this.SynchronizeFields(sapforConfiguration);
}
public SapforConfiguration() {
}
//--
public String printEthalon() {
return (ethalon_id == CommonConstants.Nan) ? "—" : String.valueOf(ethalon_id);
@@ -37,13 +41,13 @@ public class SapforConfiguration extends Configuration {
@Override
public void saveTests(Vector<Test> tests_in) {
tests = new Vector<>();
for (Test test:tests_in)
for (Test test : tests_in)
tests.add(new SapforConfigurationTest(this, test));
}
@Override
public void saveSettings(Vector<Settings> settings_in) {
settings =new Vector<>();
for (Settings sapforSettings: settings_in)
settings = new Vector<>();
for (Settings sapforSettings : settings_in)
settings.add(new SapforConfigurationSettings(this, (SapforSettings) sapforSettings));
}
@Override
@@ -52,28 +56,21 @@ public class SapforConfiguration extends Configuration {
SapforConfiguration c = (SapforConfiguration) src;
ethalon_id = c.ethalon_id;
}
public SapforConfiguration(SapforConfiguration sapforConfiguration) {
this.SynchronizeFields(sapforConfiguration);
}
public SapforConfiguration() {
}
@Override
public boolean validate(TextLog Log) {
Vector<Integer> groups_ids = Global.testingServer.db.getSapforConfigurationGroupsIds(this);
Vector<Integer> tests_ids = Global.testingServer.db.getSapforConfigurationTestsIds(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 (int group_id: groups_ids){
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 (int settings_id: settings_ids) {
for (int settings_id : settings_ids) {
Global.testingServer.db.sapforSettings.get(settings_id).validate(Log);
}
//2. Проверка входящих групп на единственный язык фортран
@@ -85,7 +82,7 @@ public class SapforConfiguration extends Configuration {
}
//-
Vector<String> testsDescriptions = new Vector<>();
for (int test_id: tests_ids) {
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);

1
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
View File

@@ -53,5 +53,4 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
return sapforConfiguration;
return null;
}
}

4
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfigurationGroup/SapforConfigurationGroup.java
View File

@@ -3,7 +3,6 @@ import Common.CommonConstants;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.iDBObject;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.DVM.DVMConfigurationGroup.DVMConfigurationGroup;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
public class SapforConfigurationGroup extends iDBObject {
public int sapforconfiguration_id = CommonConstants.Nan;
@@ -12,8 +11,7 @@ public class SapforConfigurationGroup extends iDBObject {
sapforconfiguration_id = configuration.id;
group_id = group.id;
}
public SapforConfigurationGroup(){
public SapforConfigurationGroup() {
}
@Override
public void SynchronizeFields(DBObject src) {

2
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfigurationGroup/SapforConfigurationGroupsDBTable.java
View File

@@ -6,7 +6,7 @@ public class SapforConfigurationGroupsDBTable extends iDBTable<SapforConfigurati
}
@Override
public boolean isEqual(SapforConfigurationGroup o1, SapforConfigurationGroup o2) {
return o1.sapforconfiguration_id==o2.sapforconfiguration_id&&o1.group_id==o2.group_id;
return o1.sapforconfiguration_id == o2.sapforconfiguration_id && o1.group_id == o2.group_id;
}
}

3
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfigurationSettings/SapforConfigurationSettings.java
View File

@@ -6,7 +6,8 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
public class SapforConfigurationSettings extends iDBObject {
public int sapforconfiguration_id = CommonConstants.Nan;
public int sapforsettings_id = CommonConstants.Nan;
public SapforConfigurationSettings(){}
public SapforConfigurationSettings() {
}
public SapforConfigurationSettings(SapforConfiguration sapforConfiguration, SapforSettings settings) {
sapforconfiguration_id = sapforConfiguration.id;
sapforsettings_id = settings.id;

2
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfigurationSettings/SapforConfigurationSettingsDBTable.java
View File

@@ -6,6 +6,6 @@ public class SapforConfigurationSettingsDBTable extends iDBTable<SapforConfigura
}
@Override
public boolean isEqual(SapforConfigurationSettings o1, SapforConfigurationSettings o2) {
return o1.sapforconfiguration_id==o2.sapforconfiguration_id && o1.sapforsettings_id==o2.sapforsettings_id;
return o1.sapforconfiguration_id == o2.sapforconfiguration_id && o1.sapforsettings_id == o2.sapforsettings_id;
}
}

4
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfigurationTest/SapforConfigurationTest.java
View File

@@ -3,13 +3,11 @@ import Common.CommonConstants;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.iDBObject;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.TestingSystem.DVM.DVMConfigurationTest.DVMConfigurationTest;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
public class SapforConfigurationTest extends iDBObject {
public int sapforconfiguration_id = CommonConstants.Nan;
public int test_id = CommonConstants.Nan;
public SapforConfigurationTest(){
public SapforConfigurationTest() {
}
public SapforConfigurationTest(SapforConfiguration sapforConfiguration, Test test) {
sapforconfiguration_id = sapforConfiguration.id;

4
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfigurationTest/SapforConfigurationTestsDBTable.java
View File

@@ -1,11 +1,11 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationTest;
import Common.Database.Tables.iDBTable;
public class SapforConfigurationTestsDBTable extends iDBTable<SapforConfigurationTest>{
public class SapforConfigurationTestsDBTable extends iDBTable<SapforConfigurationTest> {
public SapforConfigurationTestsDBTable() {
super(SapforConfigurationTest.class);
}
@Override
public boolean isEqual(SapforConfigurationTest o1, SapforConfigurationTest o2) {
return o1.sapforconfiguration_id==o2.sapforconfiguration_id && o1.test_id==o2.test_id;
return o1.sapforconfiguration_id == o2.sapforconfiguration_id && o1.test_id == o2.test_id;
}
}