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
2023-11-17 00:04:21 +03:00
parent 1ff88fc5fb
commit beb1359544
132 changed files with 617 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java
View File

@@ -2,8 +2,8 @@ package Visual_DVM_2021.Passes.All;
import Common.Current;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import TestingSystem.TasksPackageToKill.TasksPackageToKill;
import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
import TestingSystem.Common.TasksPackageToKill.TasksPackageToKill;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
import java.util.Vector;

4
src/Visual_DVM_2021/Passes/All/AbortSelectedPackages.java
View File

@@ -2,8 +2,8 @@ package Visual_DVM_2021.Passes.All;
import Common.Current;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.TasksPackage.TasksPackage;
import TestingSystem.TasksPackageToKill.TasksPackageToKill;
import TestingSystem.DVM.TasksPackage.TasksPackage;
import TestingSystem.Common.TasksPackageToKill.TasksPackageToKill;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
import java.util.Vector;

6
src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java
View File

@@ -7,8 +7,8 @@ import ProjectData.Files.DBProjectFile;
import ProjectData.Project.db_project_info;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.Group.Group;
import TestingSystem.Test.Test;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.Test;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassException;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
@@ -96,7 +96,7 @@ public class ConvertCorrectnessTests extends TestingSystemPass<File> {
//архивация.
File archive = Utils.getTempFileName("test_archive");
if (passes.get(PassCode_2021.ZipFolderPass).Do(vizTestProject.Home.getAbsolutePath(), archive.getAbsolutePath())) {
test.project_archive_bytes = Utils.packFile(archive);
// test.project_archive_bytes = Utils.packFile(archive);
if (test.dim >= 0)
tests.add(test);
else UI.Info("для теста " + testFileName + " не удалось определить размерность");

6
src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
View File

@@ -4,9 +4,9 @@ import Common.Global;
import Common.UI.UI;
import Common.Utils.Utils;
import ProjectData.Project.db_project_info;
import TestingSystem.Group.Group;
import TestingSystem.Test.Test;
import TestingSystem.Test.TestType;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.Test;
import TestingSystem.Common.Test.TestType;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;

4
src/Visual_DVM_2021/Passes/All/DeleteGroup.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Global;
import TestingSystem.Group.Group;
import TestingSystem.TestingServer;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.TestingServer;
import Visual_DVM_2021.Passes.Server.DeleteServerObject;
public class DeleteGroup extends DeleteServerObject<TestingServer, Group> {
public DeleteGroup() {

2
src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java
View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import Visual_DVM_2021.Passes.DeleteSelectedServerObjects;
import java.util.Vector;

2
src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java
View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
import Visual_DVM_2021.Passes.DeleteSelectedServerObjects;
import java.util.Vector;

4
src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java
View File

@@ -2,8 +2,8 @@ package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.UI.UI;
import Common.Utils.Utils;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import TestingSystem.TasksPackage.TasksPackageState;
import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
import TestingSystem.DVM.TasksPackage.TasksPackageState;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
public class DeleteSapforTasksPackage extends TestingSystemPass<SapforTasksPackage> {

2
src/Visual_DVM_2021/Passes/All/DeleteSelectedConfigurations.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All;
import TestingSystem.Configuration.Configuration;
import TestingSystem.DVM.Configuration.Configuration;
import Visual_DVM_2021.Passes.DeleteSelectedServerObjects;
public class DeleteSelectedConfigurations extends DeleteSelectedServerObjects {
public DeleteSelectedConfigurations() {

2
src/Visual_DVM_2021/Passes/All/DeleteSelectedTests.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All;
import TestingSystem.Test.Test;
import TestingSystem.Common.Test.Test;
import Visual_DVM_2021.Passes.DeleteSelectedServerObjects;
public class DeleteSelectedTests extends DeleteSelectedServerObjects {
public DeleteSelectedTests() {

4
src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Global;
import SapforTestingSystem.ServerSapfor.ServerSapfor;
import TestingSystem.TestingServer;
import TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import TestingSystem.Common.TestingServer;
import Visual_DVM_2021.Passes.Server.DeleteServerObject;
public class DeleteServerSapfor extends DeleteServerObject<TestingServer, ServerSapfor> {
public DeleteServerSapfor() {

4
src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java
View File

@@ -3,8 +3,8 @@ import Common.Current;
import Common.Utils.Utils;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import TestingSystem.TasksPackage.TasksPackageState;
import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
import TestingSystem.DVM.TasksPackage.TasksPackageState;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;

4
src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import TestingSystem.Tasks.TestRunTask;
import TestingSystem.Test.Test;
import TestingSystem.DVM.Tasks.TestRunTask;
import TestingSystem.Common.Test.Test;
public class DownloadTaskTest extends DownloadTest {
@Override
protected boolean canStart(Object... args) throws Exception {

17
src/Visual_DVM_2021/Passes/All/DownloadTest.java
View File

@@ -5,8 +5,7 @@ import Common.UI.UI;
import Common.Utils.Utils;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.Test.Test;
import TestingSystem.Test.TestInterface;
import TestingSystem.Common.Test.Test;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
public class DownloadTest extends TestingSystemPass<Test> {
@@ -30,29 +29,29 @@ public class DownloadTest extends TestingSystemPass<Test> {
protected void performPreparation() throws Exception {
passes.get(PassCode_2021.CloseCurrentProject).Do();
Current.set(Current.Root, null); //чтобы гарантированно не существовало корня.
Utils.forceDeleteWithCheck(TestInterface.getArchive(target));
Utils.forceDeleteWithCheck(TestInterface.getHomePath(target));
Utils.forceDeleteWithCheck(target.getArchive());
Utils.forceDeleteWithCheck(target.getHomePath());
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.DownloadTest, String.valueOf(target.id)));
response.Unpack(TestInterface.getArchive(target));
response.Unpack(target.getArchive());
}
@Override
protected boolean validate() {
return TestInterface.getArchive(target).exists();
return target.getArchive().exists();
}
@Override
protected void performDone() throws Exception {
super.performDone();
if (passes.get(PassCode_2021.UnzipFolderPass).Do(
TestInterface.getArchive(target).getAbsolutePath(),
target.getArchive().getAbsolutePath(),
Global.visualiser.getWorkspace().getAbsolutePath(), false
))
if (UI.Question("Тестовый проект успешно загружен под именем\n" +
Utils.Brackets(TestInterface.getHomePath(target).getName()) +
Utils.Brackets(target.getHomePath().getName()) +
"\nОткрыть его"))
passes.get(PassCode_2021.OpenCurrentProject).Do(TestInterface.getHomePath(target));
passes.get(PassCode_2021.OpenCurrentProject).Do(target.getHomePath());
}
}

2
src/Visual_DVM_2021/Passes/All/EditConfiguration.java
View File

@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.Database.Database;
import Common.Global;
import TestingSystem.Configuration.Configuration;
import TestingSystem.DVM.Configuration.Configuration;
import Visual_DVM_2021.Passes.EditObjectPass;
import Visual_DVM_2021.Passes.PassCode_2021;
public class EditConfiguration extends EditObjectPass<Configuration> {

2
src/Visual_DVM_2021/Passes/All/EditConfigurationOnServer.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.Configuration.Configuration;
import TestingSystem.DVM.Configuration.Configuration;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
public class EditConfigurationOnServer extends TestingSystemPass<Configuration> {
@Override

4
src/Visual_DVM_2021/Passes/All/EditGroup.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Global;
import TestingSystem.Group.Group;
import TestingSystem.TestingServer;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.TestingServer;
import Visual_DVM_2021.Passes.Server.EditServerObject;
public class EditGroup extends EditServerObject<TestingServer, Group> {
public EditGroup() {

2
src/Visual_DVM_2021/Passes/All/EditSapforConfiguration.java
View File

@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.Database.Database;
import Common.Global;
import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import Visual_DVM_2021.Passes.EditObjectPass;
import Visual_DVM_2021.Passes.PassCode_2021;
public class EditSapforConfiguration extends EditObjectPass<SapforConfiguration> {

2
src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommand.java
View File

@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.Database.Database;
import Common.Global;
import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
import Visual_DVM_2021.Passes.EditObjectPass;
import Visual_DVM_2021.Passes.PassCode_2021;
public class EditSapforConfigurationCommand extends EditObjectPass<SapforConfigurationCommand> {

2
src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommandOnServer.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
public class EditSapforConfigurationCommandOnServer extends TestingSystemPass<SapforConfigurationCommand> {
@Override

2
src/Visual_DVM_2021/Passes/All/EditSapforConfigurationOnServer.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
public class EditSapforConfigurationOnServer extends TestingSystemPass<SapforConfiguration> {
@Override

2
src/Visual_DVM_2021/Passes/All/EditTest.java
View File

@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.Database.Database;
import Common.Global;
import TestingSystem.Test.Test;
import TestingSystem.Common.Test.Test;
import Visual_DVM_2021.Passes.EditObjectPass;
import Visual_DVM_2021.Passes.PassCode_2021;
public class EditTest extends EditObjectPass<Test> {

2
src/Visual_DVM_2021/Passes/All/EditTestOnServer.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.Test.Test;
import TestingSystem.Common.Test.Test;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
public class EditTestOnServer extends TestingSystemPass<Test> {
@Override

2
src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java
View File

@@ -6,7 +6,7 @@ import GlobalData.RemoteFile.RemoteFile;
import ProjectData.LanguageName;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import SapforTestingSystem.ServerSapfor.ServerSapfor;
import TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.SSH.ConnectionPass;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;

2
src/Visual_DVM_2021/Passes/All/PauseTesting.java
View File

@@ -3,7 +3,7 @@ import Common.Current;
import GlobalData.Settings.SettingName;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.TSetting.TSetting;
import TestingSystem.Common.TSetting.TSetting;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
public class PauseTesting extends TestingSystemPass<TSetting> {

2
src/Visual_DVM_2021/Passes/All/PlayTesting.java
View File

@@ -3,7 +3,7 @@ import Common.Current;
import GlobalData.Settings.SettingName;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.TSetting.TSetting;
import TestingSystem.Common.TSetting.TSetting;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
public class PlayTesting extends TestingSystemPass<TSetting> {

2
src/Visual_DVM_2021/Passes/All/PublishConfiguration.java
View File

@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
import Common.Current;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.Configuration.Configuration;
import TestingSystem.DVM.Configuration.Configuration;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
public class PublishConfiguration extends TestingSystemPass<Configuration> {

4
src/Visual_DVM_2021/Passes/All/PublishGroup.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Global;
import TestingSystem.Group.Group;
import TestingSystem.TestingServer;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.TestingServer;
import Visual_DVM_2021.Passes.Server.PublishServerObject;
public class PublishGroup extends PublishServerObject<TestingServer, Group> {
public PublishGroup() {

2
src/Visual_DVM_2021/Passes/All/PublishSapforConfiguration.java
View File

@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
import Common.Current;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
public class PublishSapforConfiguration extends TestingSystemPass<SapforConfiguration> {

2
src/Visual_DVM_2021/Passes/All/PublishSapforConfigurationCommand.java
View File

@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
import Common.Current;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
public class PublishSapforConfigurationCommand extends TestingSystemPass<SapforConfigurationCommand> {

4
src/Visual_DVM_2021/Passes/All/PublishServerSapfor.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Global;
import SapforTestingSystem.ServerSapfor.ServerSapfor;
import TestingSystem.TestingServer;
import TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import TestingSystem.Common.TestingServer;
import Visual_DVM_2021.Passes.Server.PublishServerObject;
public class PublishServerSapfor extends PublishServerObject<TestingServer, ServerSapfor> {
public PublishServerSapfor() {

33
src/Visual_DVM_2021/Passes/All/PublishTest.java
View File

@@ -1,23 +1,18 @@
package Visual_DVM_2021.Passes.All;
import Common.Constants;
import Common.Current;
import Common.Global;
import Common.UI.UI;
import Common.Utils.Utils;
import ProjectData.Project.db_project_info;
import TestingSystem.Test.Test;
import TestingSystem.TestingServer;
import TestingSystem.Common.Test.Test;
import TestingSystem.Common.TestingServer;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Server.PublishServerObject;
import org.apache.commons.io.FileUtils;
import java.io.File;
import java.nio.file.Paths;
public class PublishTest extends PublishServerObject<TestingServer, Test> {
public PublishTest() {
super(Global.testingServer, Test.class);
}
protected db_project_info project = null;
db_project_info project = null;
protected boolean setProject() {
if (Current.Check(Log, Current.Group, Current.Project)
&& UI.Question("Добавить текущий проект в глобальную базу тестов")) {
@@ -42,21 +37,29 @@ public class PublishTest extends PublishServerObject<TestingServer, Test> {
target.description = project.getLocalName() + " " + project.description;
target.dim = project.testMaxDim;
target.group_id = Current.getGroup().id;
if (super.fillObjectFields()) {
File src = Utils.getTempFileName("test");
return super.fillObjectFields();
}
return false;
}
@Override
protected void performDone() throws Exception {
super.performDone();
// passes.get()
}
//--
/*
if (super.fillObjectFields()) {
File src = Utils.getTempFileName("test"); //id самого теста неизвестен.
Utils.CheckAndCleanDirectory(src);
project.Clone(src, false);
FileUtils.copyFile(project.db.getFile(),
Paths.get(src.getAbsolutePath(),Constants.data, project.db.getFile().getName()).toFile());
//архивация.
File archive = Utils.getTempFileName("test_archive");
File archive = Utils.getTempFileName("test");
if (passes.get(PassCode_2021.ZipFolderPass).Do(src.getAbsolutePath(), archive.getAbsolutePath())) {
target.project_archive_bytes = Utils.packFile(archive);
return true;
}
}
}
return false;
}
//--
*/
}

16
src/Visual_DVM_2021/Passes/All/PublishTestProject.java Normal file
View File

@@ -0,0 +1,16 @@
package Visual_DVM_2021.Passes.All;
import ProjectData.Project.db_project_info;
import TestingSystem.Common.Test.Test;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
public class PublishTestProject extends TestingSystemPass<Test> {
protected db_project_info project = null;
@Override
protected boolean canStart(Object... args) throws Exception {
target = (Test) args[0];
project= (db_project_info) args[1];
return true;
}
@Override
protected void ServerAction() throws Exception {
}
}

4
src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java
View File

@@ -1,8 +1,8 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.UI.UI;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import TestingSystem.TasksPackage.TasksPackageState;
import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
import TestingSystem.DVM.TasksPackage.TasksPackageState;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
public class ShowSapforTaskPackage extends Pass_2021<SapforTasksPackage> {

12
src/Visual_DVM_2021/Passes/All/StartSapforTests.java
View File

@@ -7,12 +7,12 @@ import Common.Utils.Index;
import ProjectData.LanguageName;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import TestingSystem.Group.Group;
import TestingSystem.TasksPackage.TasksPackageState;
import TestingSystem.Test.Test;
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
import TestingSystem.Common.Group.Group;
import TestingSystem.DVM.TasksPackage.TasksPackageState;
import TestingSystem.Common.Test.Test;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;

19
src/Visual_DVM_2021/Passes/All/StartTests.java
View File

@@ -7,13 +7,12 @@ import GlobalData.Machine.MachineType;
import GlobalData.User.UserState;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.Configuration.ConfigurationInterface;
import TestingSystem.Group.Group;
import TestingSystem.Group.GroupInterface;
import TestingSystem.Tasks.TestCompilationTask;
import TestingSystem.Tasks.TestRunTask;
import TestingSystem.TasksPackage.TasksPackage;
import TestingSystem.Test.Test;
import TestingSystem.DVM.Configuration.ConfigurationInterface;
import TestingSystem.Common.Group.Group;
import TestingSystem.DVM.Tasks.TestCompilationTask;
import TestingSystem.DVM.Tasks.TestRunTask;
import TestingSystem.DVM.TasksPackage.TasksPackage;
import TestingSystem.Common.Test.Test;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
@@ -75,7 +74,7 @@ public class StartTests extends TestingSystemPass<TasksPackage> {
return false;
}
public static Vector<TestCompilationTask> createTasksCGT(
TestingSystem.Configuration.Configuration configuration,
TestingSystem.DVM.Configuration.Configuration configuration,
Group group,
Test test
) {
@@ -145,11 +144,11 @@ public class StartTests extends TestingSystemPass<TasksPackage> {
if (server.db.groups.getCheckedCount() > 0) {
//2 Проверяем выбраны ли группы.
configurations_lines.add("Конфигурации: ");
for (TestingSystem.Configuration.Configuration configuration : server.db.configurations.getCheckedItems()) {
for (TestingSystem.DVM.Configuration.Configuration configuration : server.db.configurations.getCheckedItems()) {
configurations_lines.add(ConfigurationInterface.getSummary(configuration));
groups_lines.add("Группы: ");
for (Group group : server.db.groups.getCheckedItems()) {
groups_lines.add(GroupInterface.getSummary(group));
groups_lines.add(group.getSummary());
Vector<Test> groupTests = new Vector<>();
Vector<Test> checkedGroupTests = new Vector<>();
for (Test test : server.db.tests.Data.values()) {

2
src/Visual_DVM_2021/Passes/All/SwitchTestingEmail.java
View File

@@ -3,7 +3,7 @@ import Common.Current;
import GlobalData.Settings.SettingName;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.TSetting.TSetting;
import TestingSystem.Common.TSetting.TSetting;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
public class SwitchTestingEmail extends TestingSystemPass<TSetting> {
@Override

2
src/Visual_DVM_2021/Passes/All/SynchronizeTestsTasks.java
View File

@@ -5,7 +5,7 @@ import Common.UI.UI;
import Common.Utils.Utils;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.TestingServer;
import TestingSystem.Common.TestingServer;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
import org.apache.commons.io.FileUtils;

2
src/Visual_DVM_2021/Passes/All/UnpackSapforTasksPackage.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Global;
import Common.Utils.Utils;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
import org.apache.commons.io.FileUtils;
import java.io.File;