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-09-21 20:55:14 +03:00
parent e4131fc071
commit 7cc64ae0d2
45 changed files with 164 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
.idea/workspace.xml generated
View File

@@ -8,7 +8,50 @@
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Current.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Current.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Global.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/ModesSupervisors/PackageModeSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/ModesSupervisors/PackageModeSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforConfiguration/SapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfiguration/SapforConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforConfiguration/SapforConfigurationInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationInterface.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforConfiguration/UI/SapforConfigurationFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforConfiguration/UI/SapforConfigurationFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforConfigurationCommand/SapforConfigurationCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommand.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforConfigurationCommand/SapforConfigurationCommandInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommandInterface.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforTask/MatchState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/MatchState.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforTask/SapforTaskResult.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTaskResult.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforTask/SapforTask_2023.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask_2023.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforTask/SapforTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforTasksPackage/SapforTasksPackage_2023.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage_2023.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforTasksPackage/SapforTasksPackagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforVersion_json.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/ScenarioResults_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/ScenarioResults_json.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Sapfor/Scenario_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/Scenario_json.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestsDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AnalyseSapforPackageResults.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AnalyseSapforPackageResults.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommand.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommandOnServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommandOnServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationOnServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationOnServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenSapforTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenSapforTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PerformSapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PerformSapforTasksPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PerformScenario.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PerformScenario.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishSapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishSapforConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishSapforConfigurationCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishSapforConfigurationCommand.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforTasksComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforTasksComparisonForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

12
src/Common/Current.java
View File

@@ -20,9 +20,9 @@ import ProjectData.SapforData.Regions.ParallelRegion;
import Repository.BugReport.BugReport;
import Repository.Subscribes.Subscriber;
import TestingSystem.Configuration.Configuration;
import TestingSystem.Sapfor.SapforConfiguration.SapforConfiguration;
import TestingSystem.Sapfor.SapforTask.SapforTask_2023;
import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackage_2023;
import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
import SapforTestingSystem.SapforTask.SapforTask_2023;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
import TestingSystem.Tasks.TestCompilationTask;
import TestingSystem.Tasks.TestRunTask;
import TestingSystem.TasksPackage.TasksPackage;
@@ -236,7 +236,7 @@ public enum Current {
return (Configuration) get(Current.Configuration);
}
public static SapforConfiguration getSapforConfiguration() {
return (TestingSystem.Sapfor.SapforConfiguration.SapforConfiguration) get(Current.SapforConfiguration);
return (SapforTestingSystem.SapforConfiguration.SapforConfiguration) get(Current.SapforConfiguration);
}
//--
public static Test getTest() {
@@ -374,8 +374,8 @@ public enum Current {
public static boolean CheckID(Current name, int id) {
return (get(name) != null) && (((iDBObject) get(name)).id == id);
}
public static TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommand getSapforConfigurationCommand() {
return (TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommand) get(Current.SapforConfigurationCommand);
public static SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand getSapforConfigurationCommand() {
return (SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand) get(Current.SapforConfigurationCommand);
}
public static boolean HasSapforProfile() {
return get(Current.SapforProfile)!=null;

2
src/Common/Global.java
View File

@@ -382,7 +382,7 @@ public class Global {
}
};
Log.ClearLog();
new PackageModeSupervisor().Start();
new PackageModeSupervisor().Do();
break;
case Undefined:
break;

49
src/Common/ModesSupervisors/PackageModeSupervisor.java
View File

@@ -2,19 +2,20 @@ package Common.ModesSupervisors;
import Common.Global;
import Common.Utils.InterruptThread;
import Common.Utils.Utils;
import TestingSystem.Sapfor.Scenario_json;
import SapforTestingSystem.Json.Scenario_json;
import org.apache.commons.io.FileUtils;
import java.io.File;
import java.nio.charset.Charset;
import java.util.Stack;
import java.util.Vector;
public class PackageModeSupervisor {
Thread interruptThread = new InterruptThread(5000, () -> {
System.exit(0);
return null;
});
//--->>
int free_kernels = 4;
int busy_kernels = 0;
int kernels = 4;
//--->>
Scenario_json scenario;
//--->>
@@ -23,21 +24,49 @@ public class PackageModeSupervisor {
File sapfor_drv;
File scenarioFile;
//--->>
public void Start() {
try {
interruptThread.start();
Vector<String> activeTests = new Vector<>();
Stack<String> waitingTests = new Stack<>();
//--->>
public void init() throws Exception {
packageWorkspace = new File(Global.Home);
scenarioFile = new File(packageWorkspace, "scenario.txt");
sapfor_drv = new File(packageWorkspace, "SAPFOR_F.exe");
//--->>
String packed = FileUtils.readFileToString(scenarioFile, Charset.defaultCharset());
scenario = Utils.gson.fromJson(packed, Scenario_json.class);
//--->>
for (String test : scenario.tests)
waitingTests.push(test);
}
public boolean isFinished(String test){
return true;
}
//--->>
public void checkActiveTests() throws Exception {
Vector<String> finishedTests = new Vector<>();
for (String test: activeTests){
if (isFinished(test))
finishedTests.add(test);
}
for (String test: finishedTests){
activeTests.remove(test);
}
}
public void startWaitingTests() throws Exception {
}
//--->>
public void Do() {
try {
interruptThread.start();
//--->>
init();
//--->>
do {
checkActiveTests();
startWaitingTests();
Thread.sleep(1000);
} while (!activeTests.isEmpty() && !waitingTests.isEmpty());
} catch (Exception ex) {
ex.printStackTrace();
}
}
//--->>
public void startTest() {
}
}

8
src/Common/UI/UI.java
View File

@@ -70,10 +70,10 @@ import Repository.Component.UI.ComponentsForm;
import Repository.Subscribes.SubsribersDBTable;
import TestingSystem.Configuration.UI.ConfigurationDBTable;
import TestingSystem.Group.GroupsDBTable;
import TestingSystem.Sapfor.SapforConfiguration.SapforConfigurationDBTable;
import TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
import TestingSystem.Sapfor.SapforTask.SapforTasksDBTable;
import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackagesDBTable;
import SapforTestingSystem.SapforConfiguration.SapforConfigurationDBTable;
import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
import SapforTestingSystem.SapforTask.SapforTasksDBTable;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackagesDBTable;
import TestingSystem.Tasks.TestRunTasksDBTable;
import TestingSystem.TasksPackage.TasksPackageDBTable;
import TestingSystem.Test.TestDBTable;

10
src/GlobalData/GlobalDatabase.java
View File

@@ -33,11 +33,11 @@ import GlobalData.Tasks.CompilationTask.CompilationTasksDBTable;
import GlobalData.Tasks.RunTask.RunTasksDBTable;
import GlobalData.User.UsersDBTable;
import Repository.Component.ComponentType;
import TestingSystem.Sapfor.SapforTask.SapforTaskResult;
import TestingSystem.Sapfor.SapforTask.SapforTask_2023;
import TestingSystem.Sapfor.SapforTask.SapforTasksDBTable;
import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackage_2023;
import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackagesDBTable;
import SapforTestingSystem.SapforTask.SapforTaskResult;
import SapforTestingSystem.SapforTask.SapforTask_2023;
import SapforTestingSystem.SapforTask.SapforTasksDBTable;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackagesDBTable;
import TestingSystem.TaskKey.TaskKeysDBTable;
import Visual_DVM_2021.PassStats.PassStatsDBTable;
import Visual_DVM_2021.Passes.PassCode_2021;

2
src/TestingSystem/Sapfor/SapforVersion_json.java → src/SapforTestingSystem/Json/SapforVersion_json.java
View File

@@ -1,4 +1,4 @@
package TestingSystem.Sapfor;
package SapforTestingSystem.Json;
import com.google.gson.annotations.Expose;
public class SapforVersion_json {
@Expose

4
src/TestingSystem/Sapfor/ScenarioResults_json.java → src/SapforTestingSystem/Json/ScenarioResults_json.java
View File

@@ -1,5 +1,5 @@
package TestingSystem.Sapfor;
import TestingSystem.Sapfor.SapforTask.SapforTask_2023;
package SapforTestingSystem.Json;
import SapforTestingSystem.SapforTask.SapforTask_2023;
import com.google.gson.annotations.Expose;
import java.util.List;

2
src/TestingSystem/Sapfor/Scenario_json.java → src/SapforTestingSystem/Json/Scenario_json.java
View File

@@ -1,4 +1,4 @@
package TestingSystem.Sapfor;
package SapforTestingSystem.Json;
import Visual_DVM_2021.Passes.PassCode_2021;
import com.google.gson.annotations.Expose;

2
src/TestingSystem/Sapfor/SapforConfiguration/SapforConfiguration.java → src/SapforTestingSystem/SapforConfiguration/SapforConfiguration.java
View File

@@ -1,4 +1,4 @@
package TestingSystem.Sapfor.SapforConfiguration;
package SapforTestingSystem.SapforConfiguration;
import Common.Database.rDBObject;
public class SapforConfiguration extends rDBObject {
//настройки.

6
src/TestingSystem/Sapfor/SapforConfiguration/SapforConfigurationDBTable.java → src/SapforTestingSystem/SapforConfiguration/SapforConfigurationDBTable.java
View File

@@ -1,12 +1,12 @@
package TestingSystem.Sapfor.SapforConfiguration;
package SapforTestingSystem.SapforConfiguration;
import Common.Current;
import Common.Database.*;
import Common.Global;
import Common.UI.DataSetControlForm;
import Common.UI.Windows.Dialog.DBObjectDialog;
import Common.Utils.Utils;
import TestingSystem.Sapfor.SapforConfiguration.UI.SapforConfigurationFields;
import TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommand;
import SapforTestingSystem.SapforConfiguration.UI.SapforConfigurationFields;
import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
import java.util.LinkedHashMap;
public class SapforConfigurationDBTable extends DBTable<String, SapforConfiguration> {

4
src/TestingSystem/Sapfor/SapforConfiguration/SapforConfigurationInterface.java → src/SapforTestingSystem/SapforConfiguration/SapforConfigurationInterface.java
View File

@@ -1,7 +1,7 @@
package TestingSystem.Sapfor.SapforConfiguration;
package SapforTestingSystem.SapforConfiguration;
import Common.Global;
import Common.Utils.TextLog;
import TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommand;
import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
import Visual_DVM_2021.Passes.PassCode_2021;
import java.util.Vector;

2
src/TestingSystem/Sapfor/SapforConfiguration/UI/SapforConfigurationFields.form → src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.form
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="TestingSystem.Sapfor.SapforConfiguration.UI.SapforConfigurationFields">
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="SapforTestingSystem.SapforConfiguration.UI.SapforConfigurationFields">
<grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>

2
src/TestingSystem/Sapfor/SapforConfiguration/UI/SapforConfigurationFields.java → src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.java
View File

@@ -1,4 +1,4 @@
package TestingSystem.Sapfor.SapforConfiguration.UI;
package SapforTestingSystem.SapforConfiguration.UI;
import Common.UI.TextField.StyledTextField;
import Common.UI.Windows.Dialog.DialogFields;

2
src/TestingSystem/Sapfor/SapforConfigurationCommand/SapforConfigurationCommand.java → src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommand.java
View File

@@ -1,4 +1,4 @@
package TestingSystem.Sapfor.SapforConfigurationCommand;
package SapforTestingSystem.SapforConfigurationCommand;
import Common.Database.rDBObject;
import Visual_DVM_2021.Passes.PassCode_2021;
import com.sun.org.glassfish.gmbal.Description;

2
src/TestingSystem/Sapfor/SapforConfigurationCommand/SapforConfigurationCommandInterface.java → src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommandInterface.java
View File

@@ -1,4 +1,4 @@
package TestingSystem.Sapfor.SapforConfigurationCommand;
package SapforTestingSystem.SapforConfigurationCommand;
import Common.Current;
public class SapforConfigurationCommandInterface {
public static boolean isVisible(SapforConfigurationCommand object) {

4
src/TestingSystem/Sapfor/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java → src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java
View File

@@ -1,10 +1,10 @@
package TestingSystem.Sapfor.SapforConfigurationCommand;
package SapforTestingSystem.SapforConfigurationCommand;
import Common.Current;
import Common.Database.DBTable;
import Common.UI.DataSetControlForm;
import Common.UI.UI;
import Common.UI.Windows.Dialog.DBObjectDialog;
import TestingSystem.Sapfor.SapforConfigurationCommand.UI.SapforConfigurationCommandFields;
import SapforTestingSystem.SapforConfigurationCommand.UI.SapforConfigurationCommandFields;
import Visual_DVM_2021.Passes.PassCode_2021;
public class SapforConfigurationCommandsDBTable extends DBTable<String, SapforConfigurationCommand> {
public SapforConfigurationCommandsDBTable() {

2
src/TestingSystem/Sapfor/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.form → src/SapforTestingSystem/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.form
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="TestingSystem.Sapfor.SapforConfigurationCommand.UI.SapforConfigurationCommandFields">
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="SapforTestingSystem.SapforConfigurationCommand.UI.SapforConfigurationCommandFields">
<grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>

2
src/TestingSystem/Sapfor/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.java → src/SapforTestingSystem/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.java
View File

@@ -1,4 +1,4 @@
package TestingSystem.Sapfor.SapforConfigurationCommand.UI;
package SapforTestingSystem.SapforConfigurationCommand.UI;
import Common.Current;
import Common.UI.Tables.StyledCellLabel;
import Common.UI.Windows.Dialog.DialogFields;

2
src/TestingSystem/Sapfor/SapforTask/MatchState.java → src/SapforTestingSystem/SapforTask/MatchState.java
View File

@@ -1,4 +1,4 @@
package TestingSystem.Sapfor.SapforTask;
package SapforTestingSystem.SapforTask;
import Common.Current;
import Common.UI.StatusEnum;
import Common.UI.Themes.VisualiserFonts;

4
src/TestingSystem/Sapfor/SapforTask/SapforTaskResult.java → src/SapforTestingSystem/SapforTask/SapforTaskResult.java
View File

@@ -1,6 +1,6 @@
package TestingSystem.Sapfor.SapforTask;
package SapforTestingSystem.SapforTask;
import Common.Database.DBObject;
import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackage_2023;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
public class SapforTaskResult extends DBObject {
public SapforTasksPackage_2023 sapforTasksPackage;
public SapforTask_2023 task;

4
src/TestingSystem/Sapfor/SapforTask/SapforTask_2023.java → src/SapforTestingSystem/SapforTask/SapforTask_2023.java
View File

@@ -1,8 +1,8 @@
package TestingSystem.Sapfor.SapforTask;
package SapforTestingSystem.SapforTask;
import Common.Database.DBObject;
import Common.Utils.Utils;
import GlobalData.Tasks.TaskState;
import TestingSystem.Sapfor.SapforVersion_json;
import SapforTestingSystem.Json.SapforVersion_json;
import com.google.gson.annotations.Expose;
import com.sun.org.glassfish.gmbal.Description;

2
src/TestingSystem/Sapfor/SapforTask/SapforTasksDBTable.java → src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java
View File

@@ -1,4 +1,4 @@
package TestingSystem.Sapfor.SapforTask;
package SapforTestingSystem.SapforTask;
import Common.Current;
import Common.Database.DBTable;
import Common.UI.DataSetControlForm;

4
src/TestingSystem/Sapfor/SapforTasksPackage/SapforTasksPackage_2023.java → src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage_2023.java
View File

@@ -1,7 +1,7 @@
package TestingSystem.Sapfor.SapforTasksPackage;
package SapforTestingSystem.SapforTasksPackage;
import Common.Database.DBObject;
import Common.Database.iDBObject;
import TestingSystem.Sapfor.SapforConfiguration.SapforConfiguration;
import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
import TestingSystem.TasksPackage.TasksPackageState;
import TestingSystem.Test.Test;
import Visual_DVM_2021.Passes.PassCode_2021;

4
src/TestingSystem/Sapfor/SapforTasksPackage/SapforTasksPackagesDBTable.java → src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java
View File

@@ -1,8 +1,8 @@
package TestingSystem.Sapfor.SapforTasksPackage;
package SapforTestingSystem.SapforTasksPackage;
import Common.Current;
import Common.Database.*;
import Common.UI.DataSetControlForm;
import TestingSystem.Sapfor.SapforTask.SapforTask_2023;
import SapforTestingSystem.SapforTask.SapforTask_2023;
import java.util.Date;
import java.util.LinkedHashMap;

4
src/TestingSystem/TestsDatabase.java
View File

@@ -4,8 +4,8 @@ import GlobalData.Settings.SettingName;
import TestingSystem.Configuration.UI.ConfigurationDBTable;
import TestingSystem.Group.GroupsDBTable;
import TestingSystem.MachineMaxKernels.MachineMaxKernelsDBTable;
import TestingSystem.Sapfor.SapforConfiguration.SapforConfigurationDBTable;
import TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
import SapforTestingSystem.SapforConfiguration.SapforConfigurationDBTable;
import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
import TestingSystem.TSetting.TSetting;
import TestingSystem.TSetting.TSettingsDBTable;
import TestingSystem.Test.TestDBTable;

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

@@ -1,8 +1,8 @@
package Visual_DVM_2021.Passes.All;
import Common.Global;
import Common.Utils.Utils;
import TestingSystem.Sapfor.SapforTask.SapforTask_2023;
import TestingSystem.Sapfor.ScenarioResults_json;
import SapforTestingSystem.SapforTask.SapforTask_2023;
import SapforTestingSystem.Json.ScenarioResults_json;
import Visual_DVM_2021.Passes.Pass_2021;
import org.apache.commons.io.FileUtils;

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

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All;
import Common.Database.DataSet;
import TestingSystem.Sapfor.SapforTask.SapforTaskResult;
import SapforTestingSystem.SapforTask.SapforTaskResult;
import Visual_DVM_2021.Passes.Pass_2021;
public class CompareSapforPackages extends Pass_2021 {
DataSet<String, SapforTaskResult> masterTasks;

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 TestingSystem.Sapfor.SapforConfiguration.SapforConfiguration;
import SapforTestingSystem.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 TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommand;
import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
import Visual_DVM_2021.Passes.DeleteSelectedServerObjects;
import java.util.Vector;

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

@@ -4,7 +4,7 @@ import Common.Database.Database;
import Common.Global;
import Common.UI.UI;
import Common.Utils.Utils;
import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackage_2023;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
import Visual_DVM_2021.Passes.DeleteObjectPass;
import java.io.File;

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 TestingSystem.Sapfor.SapforConfiguration.SapforConfiguration;
import SapforTestingSystem.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 TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommand;
import SapforTestingSystem.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 TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommand;
import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
import Visual_DVM_2021.Passes.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 TestingSystem.Sapfor.SapforConfiguration.SapforConfiguration;
import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
import Visual_DVM_2021.Passes.TestingSystemPass;
public class EditSapforConfigurationOnServer extends TestingSystemPass<SapforConfiguration> {
@Override

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

@@ -6,9 +6,9 @@ import ProjectData.Files.DBProjectFile;
import ProjectData.LanguageName;
import ProjectData.Messages.Errors.MessageError;
import ProjectData.Project.db_project_info;
import TestingSystem.Sapfor.SapforTask.SapforTaskResult;
import TestingSystem.Sapfor.SapforTask.SapforTask_2023;
import TestingSystem.Sapfor.SapforVersion_json;
import SapforTestingSystem.SapforTask.SapforTaskResult;
import SapforTestingSystem.SapforTask.SapforTask_2023;
import SapforTestingSystem.Json.SapforVersion_json;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import org.apache.commons.io.FileUtils;

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

@@ -2,10 +2,10 @@ package Visual_DVM_2021.Passes.All;
import Common.Utils.Utils;
import GlobalData.Tasks.TaskState;
import ProjectData.Project.db_project_info;
import TestingSystem.Sapfor.SapforTask.SapforTask_2023;
import TestingSystem.Sapfor.SapforVersion_json;
import TestingSystem.Sapfor.ScenarioResults_json;
import TestingSystem.Sapfor.Scenario_json;
import SapforTestingSystem.SapforTask.SapforTask_2023;
import SapforTestingSystem.Json.SapforVersion_json;
import SapforTestingSystem.Json.ScenarioResults_json;
import SapforTestingSystem.Json.Scenario_json;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassException;
import Visual_DVM_2021.Passes.Pass_2021;

10
src/Visual_DVM_2021/Passes/All/PerformScenario.java
View File

@@ -3,11 +3,11 @@ import Common.Global;
import Common.Utils.Utils;
import GlobalData.Tasks.TaskState;
import ProjectData.Project.db_project_info;
import TestingSystem.Sapfor.SapforTask.SapforTask_2023;
import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackage_2023;
import TestingSystem.Sapfor.SapforVersion_json;
import TestingSystem.Sapfor.ScenarioResults_json;
import TestingSystem.Sapfor.Scenario_json;
import SapforTestingSystem.SapforTask.SapforTask_2023;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
import SapforTestingSystem.Json.SapforVersion_json;
import SapforTestingSystem.Json.ScenarioResults_json;
import SapforTestingSystem.Json.Scenario_json;
import TestingSystem.TasksPackage.TasksPackageState;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassException;

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 TestingSystem.Sapfor.SapforConfiguration.SapforConfiguration;
import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.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 TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommand;
import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.TestingSystemPass;
public class PublishSapforConfigurationCommand extends TestingSystemPass<SapforConfigurationCommand> {

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

@@ -9,11 +9,11 @@ import ProjectData.LanguageName;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.Group.Group;
import TestingSystem.Sapfor.SapforConfiguration.SapforConfiguration;
import TestingSystem.Sapfor.SapforConfiguration.SapforConfigurationInterface;
import TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommand;
import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackage_2023;
import TestingSystem.Sapfor.Scenario_json;
import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
import SapforTestingSystem.SapforConfiguration.SapforConfigurationInterface;
import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
import SapforTestingSystem.Json.Scenario_json;
import TestingSystem.Test.Test;
import TestingSystem.Test.TestInterface;
import Visual_DVM_2021.Passes.PassCode_2021;

2
src/Visual_DVM_2021/UI/Interface/TestingWindow.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.UI.Interface;
import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackage_2023;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
public interface TestingWindow extends VisualizerForm {
void ShowAll();
void RestoreLastCredentials();

4
src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
View File

@@ -7,8 +7,8 @@ import Common.UI.Label.ShortLabel;
import Common.UI.Menus_2023.VisualiserMenuBar;
import Common.UI.UI;
import Common.Utils.TextLog;
import TestingSystem.Sapfor.SapforTask.SapforTaskResult;
import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackage_2023;
import SapforTestingSystem.SapforTask.SapforTaskResult;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
import TestingSystem.Test.ProjectFiles_json;
import Visual_DVM_2021.Passes.Pass_2021;

2
src/Visual_DVM_2021/UI/Main/SapforTasksComparisonForm.java
View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.UI.Main;
import Common.Current;
import TestingSystem.Sapfor.SapforTask.SapforTask_2023;
import SapforTestingSystem.SapforTask.SapforTask_2023;
//упразднить.
public class SapforTasksComparisonForm extends TasksComparisonForm<SapforTask_2023> {
public SapforTasksComparisonForm(ComparisonForm<SapforTask_2023> slave_in) {

2
src/Visual_DVM_2021/UI/Main/TestingForm.java
View File

@@ -10,7 +10,7 @@ import GlobalData.Credentials.Credentials;
import TestingSystem.Configuration.UI.ConfigurationDBTable;
import TestingSystem.Group.Group;
import TestingSystem.MachineMaxKernels.MachineMaxKernels;
import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackage_2023;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
import TestingSystem.TasksPackage.TasksPackageDBTable;
import TestingSystem.Test.Test;
import Visual_DVM_2021.UI.Interface.FormWithSplitters;