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

Исправление ключей у тестирования двм системы.

Browse Source
This commit is contained in:
02090095
2023-11-19 21:55:09 +03:00
parent fda62702fe
commit 928705e018
23 changed files with 191 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,13 +2,11 @@ package Visual_DVM_2021.Passes.All;
import Common.Current;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
import TestingSystem.Common.TasksPackageToKill.TasksPackageToKill;
import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
import java.util.Vector;
public class AbortSapforTaskPackage extends TestingSystemPass<SapforTasksPackage> {
Vector<TasksPackageToKill> packagesToKill;
TasksPackageToKill tasksPackageToKill = null;
@Override
public String getIconPath() {
return "/icons/Ban.PNG";
@@ -19,8 +17,8 @@ public class AbortSapforTaskPackage extends TestingSystemPass<SapforTasksPackage
}
@Override
protected boolean canStart(Object... args) throws Exception {
tasksPackageToKill = null;
if (Current.Check(Log, Current.SapforTasksPackage)) {
packagesToKill = new Vector<>();
target = Current.getSapforTasksPackage();
switch (target.state) {
case Done:
@@ -28,9 +26,8 @@ public class AbortSapforTaskPackage extends TestingSystemPass<SapforTasksPackage
Log.Writeln_("Пакет уже завершен.");
break;
default:
TasksPackageToKill tasksPackageToKill = new TasksPackageToKill();
tasksPackageToKill.packageName = String.valueOf(target.id);
packagesToKill.add(tasksPackageToKill);
tasksPackageToKill = new TasksPackageToKill();
tasksPackageToKill.packageId = target.id;
return true;
}
}
@@ -39,6 +36,6 @@ public class AbortSapforTaskPackage extends TestingSystemPass<SapforTasksPackage
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.PublishAccountObjects, Current.getAccount().email, packagesToKill));
Command(new ServerExchangeUnit_2021(ServerCode.PublishAccountAIObject, Current.getAccount().email, tasksPackageToKill));
}
}

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

@@ -1,45 +0,0 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.DVM.TasksPackage.TasksPackage;
import TestingSystem.Common.TasksPackageToKill.TasksPackageToKill;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
import java.util.Vector;
public class AbortSelectedPackages extends TestingSystemPass<Vector<TasksPackage>> {
Vector<TasksPackageToKill> packagesToKill;
@Override
public String getIconPath() {
return "/icons/Ban.PNG";
}
@Override
public String getButtonText() {
return "";
}
@Override
protected boolean canStart(Object... args) throws Exception {
target = server.account_db.packages.getCheckedItems();
packagesToKill = new Vector<>();
for (TasksPackage tasksPackage : target) {
switch (tasksPackage.state) {
case Done:
case Aborted:
break;
default:
TasksPackageToKill tasksPackageToKill = new TasksPackageToKill();
tasksPackageToKill.packageName = tasksPackage.id;
packagesToKill.add(tasksPackageToKill);
break;
}
}
if (packagesToKill.isEmpty()) {
Log.Writeln_("Не отмечено ни одного активного пакета для удаления");
}
return true;
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.PublishAccountObjects, Current.getAccount().email, packagesToKill));
}
}

42
src/Visual_DVM_2021/Passes/All/AbortTaskPackage.java Normal file
View File

@@ -0,0 +1,42 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.Common.TasksPackageToKill.TasksPackageToKill;
import TestingSystem.DVM.TasksPackage.TasksPackage;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
public class AbortTaskPackage extends TestingSystemPass<TasksPackage> {
TasksPackageToKill tasksPackageToKill = null;
@Override
public String getIconPath() {
return "/icons/Ban.PNG";
}
@Override
public String getButtonText() {
return "";
}
@Override
protected boolean canStart(Object... args) throws Exception {
tasksPackageToKill = null;
if (Current.Check(Log, Current.TasksPackage)) {
target = Current.getTasksPackage();
switch (target.state) {
case Done:
case Aborted:
Log.Writeln_("Пакет уже завершен.");
break;
default:
tasksPackageToKill = new TasksPackageToKill();
tasksPackageToKill.packageId = target.id;
return true;
}
}
;
return false;
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.PublishAccountAIObject, Current.getAccount().email, tasksPackageToKill));
}
}

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

@@ -5,20 +5,21 @@ import Common.UI.UI;
import GlobalData.Compiler.CompilerType;
import GlobalData.Machine.MachineType;
import GlobalData.User.UserState;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.Test;
import TestingSystem.DVM.Tasks.TestCompilationTask;
import TestingSystem.DVM.Tasks.TestRunTask;
import TestingSystem.DVM.TasksPackage.TasksPackage;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
import Visual_DVM_2021.Passes.Server.PublishServerAccountObject;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.Vector;
public class StartTests extends TestingSystemPass<TasksPackage> {
public class StartTests extends PublishServerAccountObject<TasksPackage> {
public StartTests() {
super(TasksPackage.class);
}
@Override
protected int getTimeout() {
return 0;
@@ -28,10 +29,6 @@ public class StartTests extends TestingSystemPass<TasksPackage> {
return "/icons/Start.png";
}
@Override
public String getButtonText() {
return "";
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (!Current.getAccount().CheckRegistered(Log)) {
return false;
@@ -201,31 +198,4 @@ public class StartTests extends TestingSystemPass<TasksPackage> {
target.needsEmail = Global.properties.EmailOnTestingProgress ? 1 : 0;
return !tasks.isEmpty();
}
@Override
protected void performPreparation() throws Exception {
}
@Override
protected void ServerAction() throws Exception {
target.genName();
Vector<TasksPackage> packages = new Vector<>();
packages.add(target);
Command(new ServerExchangeUnit_2021(ServerCode.PublishAccountObjects, Current.getAccount().email, packages));
}
@Override
protected void performDone() throws Exception {
passes.get(PassCode_2021.SynchronizeTestsTasks).Do();
/*
if (!TestingServer.checkTasks)
TestingServer.TimerOn();
*/
}
@Override
protected void showDone() throws Exception {
server.account_db.packages.ui_.Select(target.id);
// UI.getMainWindow().getTestingWindow().ShowAutoActualizeTestsState();
}
@Override
protected void FocusResult() {
UI.getMainWindow().getTestingWindow().FocusTestingTasks();
}
}

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

@@ -1,22 +0,0 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import GlobalData.Settings.SettingName;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.Common.TSetting.TSetting;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
public class SwitchTestingEmail extends TestingSystemPass<TSetting> {
@Override
protected boolean canStart(Object... args) throws Exception {
if (Current.getAccount().CheckRegistered(Log)) {
target = server.account_db.settings.get(SettingName.Email);
target.value = ((boolean) (args[0]))?1:0;
return true;
}
return false;
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.EditAccountObject, Current.getAccount().email, target));
}
}

9
src/Visual_DVM_2021/Passes/PassCode_2021.java
View File

@@ -256,12 +256,10 @@ public enum PassCode_2021 {
EditConfiguration,
//-
StartTests,
SwitchTestingEmail,
//-
DownloadTaskTest,
//-
GetTestsQueueSize,
AbortSelectedPackages,
ApplyCurrentFunction,
//->
// GetRemoteUserHome,
@@ -300,12 +298,15 @@ public enum PassCode_2021 {
PublishTestProject,
DeleteTest,
DeleteConfiguration,
AbortTaskPackage,
//->
TestPass;
public String getDescription() {
switch (this) {
case Undefined:
return "?";
case AbortTaskPackage:
return "Прерывать пакет тестирования DVM";
case DeleteConfiguration:
return "Удалить конфигурацию";
case DeleteTest:
@@ -430,14 +431,10 @@ public enum PassCode_2021 {
return "Публикация удалённой рабочей папки";
case ApplyCurrentFunction:
return "Назначить текущую функцию по имени";
case AbortSelectedPackages:
return "Прерывать отмеченные пакеты задач";
case GetTestsQueueSize:
return "Очередь перед текущим пакетом";
case DownloadTaskTest:
return "Загрузить тест текущей задачи";
case SwitchTestingEmail:
return "Настроить отправку оповещений тестирования";
case StartTests:
return "Запуск тестов";
case PublishConfiguration: