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 20:11:24 +03:00
parent 01fcc59597
commit 3a83f14ad7
11 changed files with 34 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
.idea/workspace.xml generated
View File

@@ -7,15 +7,17 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/RepositoryServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Test/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/Test.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTestProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTestProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/EditServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/EditServerObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/ServerObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/ServerObjectPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PerformSapforTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/TaskThread.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TaskThread.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/ThreadsPlanner/ThreadsPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/ThreadsPlanner/ThreadsPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PackageModeSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PackageModeSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedTests.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditTestOnServer.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

2
src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java
View File

@@ -7,6 +7,6 @@ public class TestsMenuBar extends DataMenuBar {
PassCode_2021.DownloadTest,
PassCode_2021.PublishTest,
PassCode_2021.EditTest,
PassCode_2021.DeleteSelectedTests);
PassCode_2021.DeleteTest);
}
}

3
src/SapforTestingSystem/TaskThread.java → src/TestingSystem/Common/TaskThread.java
View File

@@ -1,5 +1,6 @@
package SapforTestingSystem;
package TestingSystem.Common;
import TestingSystem.SAPFOR.Json.SapforConfiguration_json;
import TestingSystem.SAPFOR.PerformSapforTask;
import TestingSystem.SAPFOR.SapforTask.SapforTask;
import java.io.File;

2
src/SapforTestingSystem/ThreadsPlanner/ThreadsPlanner.java → src/TestingSystem/Common/ThreadsPlanner/ThreadsPlanner.java
View File

@@ -1,4 +1,4 @@
package SapforTestingSystem.ThreadsPlanner;
package TestingSystem.Common.ThreadsPlanner;
import Common.Global;
import Common.Utils.InterruptThread;

4
src/TestingSystem/SAPFOR/PackageModeSupervisor.java
View File

@@ -7,8 +7,8 @@ import TestingSystem.SAPFOR.Json.SapforTasksPackage_json;
import TestingSystem.SAPFOR.Json.SapforTasksResults_json;
import TestingSystem.SAPFOR.Json.SapforTest_json;
import TestingSystem.SAPFOR.SapforTask.SapforTask;
import SapforTestingSystem.TaskThread;
import SapforTestingSystem.ThreadsPlanner.ThreadsPlanner;
import TestingSystem.Common.TaskThread;
import TestingSystem.Common.ThreadsPlanner.ThreadsPlanner;
import Visual_DVM_2021.Passes.PassCode_2021;
import org.apache.commons.io.FileUtils;

2
src/SapforTestingSystem/PerformSapforTask.java → src/TestingSystem/SAPFOR/PerformSapforTask.java
View File

@@ -1,4 +1,4 @@
package SapforTestingSystem;
package TestingSystem.SAPFOR;
import Common.Constants;
import Common.Global;
import Common.Utils.Utils;

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

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

10
src/Visual_DVM_2021/Passes/All/DeleteTest.java Normal file
View File

@@ -0,0 +1,10 @@
package Visual_DVM_2021.Passes.All;
import Common.Global;
import TestingSystem.Common.Test.Test;
import TestingSystem.Common.TestingServer;
import Visual_DVM_2021.Passes.Server.DeleteServerObject;
public class DeleteTest extends DeleteServerObject<TestingServer, Test> {
public DeleteTest() {
super(Global.testingServer, Test.class);
}
}

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

@@ -1,34 +1,10 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.Database.Database;
import Common.Global;
import TestingSystem.Common.Test.Test;
import Visual_DVM_2021.Passes.EditObjectPass;
import Visual_DVM_2021.Passes.PassCode_2021;
public class EditTest extends EditObjectPass<Test> {
import TestingSystem.Common.TestingServer;
import Visual_DVM_2021.Passes.Server.EditServerObject;
public class EditTest extends EditServerObject<TestingServer, Test> {
public EditTest() {
super(Test.class);
}
@Override
protected Database getDb() {
return Global.testingServer.db;
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (Current.Check(Log, Current.Test)){
target = Current.getTest();
if (!Current.getAccount().CheckAccessRights(target.sender_address, Log)){
return false;
}
return getTable().ShowEditObjectDialog(target);
}
return false;
}
@Override
protected void performDone() throws Exception {
super.performDone();
//отправка.
passes.get(PassCode_2021.EditTestOnServer).Do(target);
super(Global.testingServer, Test.class);
}
}

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

@@ -1,16 +0,0 @@
package Visual_DVM_2021.Passes.All;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.Common.Test.Test;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
public class EditTestOnServer extends TestingSystemPass<Test> {
@Override
protected boolean canStart(Object... args) throws Exception {
target = (Test) args[0];
return true;
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.EditObject, "", target));
}
}

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

@@ -217,7 +217,6 @@ public enum PassCode_2021 {
ArchivesBackupPass,
PublishTest,
DownloadTest,
EditTestOnServer,
SynchronizeTests,
//-
MakeScreenShot,
@@ -258,7 +257,6 @@ public enum PassCode_2021 {
EditConfigurationOnServer,
//-
StartTests,
DeleteSelectedTests,
DeleteSelectedConfigurations,
SwitchTestingEmail,
//-
@@ -305,13 +303,15 @@ public enum PassCode_2021 {
OpenSapforVersion,
PublishServerSapfor,
PublishTestProject,
DeleteTest,
//->
TestPass;
public String getDescription() {
switch (this) {
case Undefined:
return "?";
case DeleteTest:
return "Удалить тест";
case PublishServerSapfor:
return "Опубликовать собранную версию SAPFOR";
case PublishTestProject:
@@ -448,8 +448,6 @@ public enum PassCode_2021 {
return "Настроить отправку оповещений тестирования";
case DeleteSelectedConfigurations:
return "Удалить отмеченные конфигурации";
case DeleteSelectedTests:
return "Удалить отмеченные тесты";
case StartTests:
return "Запуск тестов";
case PublishConfiguration:
@@ -544,8 +542,6 @@ public enum PassCode_2021 {
return "Загрузить тест";
case PublishTest:
return "Опубликовать тест";
case EditTestOnServer:
return "Редактировать тест на сервере";
case ArchivesBackupPass:
return "Бэкап архивов журнала ошибок";
case ShowInstruction: