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-10-01 23:22:07 +03:00
parent b6bd529fb1
commit bf25aae4d9
8 changed files with 40 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.idea/workspace.xml generated
View File

@@ -7,12 +7,14 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforScenariosBar/SapforScenariosBar.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforScenario.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTask_json.java" beforeDir="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/SapforTestingSystem/Json/ScenarioResults_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforScenarioResults_json.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforScenarioResults_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforScenarioResults_json.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/ThreadsPlanner/ThreadsPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/ThreadsPlanner/ThreadsPlanner.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java" beforeDir="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/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

8
src/Common/UI/Menus_2023/SapforScenariosBar/SapforScenariosBar.java Normal file
View File

@@ -0,0 +1,8 @@
package Common.UI.Menus_2023.SapforScenariosBar;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class SapforScenariosBar extends DataMenuBar {
public SapforScenariosBar() {
super("сценарии", PassCode_2021.DeleteSapforScenario);
}
}

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

@@ -19,6 +19,7 @@ import Common.UI.Menus_2023.RemoteSapforsMenuBar.RemoteSapforsMenuBar;
import Common.UI.Menus_2023.RunConfigurationsMenuBar.RunConfigurationsMenuBar; import Common.UI.Menus_2023.RunConfigurationsMenuBar.RunConfigurationsMenuBar;
import Common.UI.Menus_2023.SapforConfigurationCommandsMenuBar.SapforConfigurationCommandsMenuBar; import Common.UI.Menus_2023.SapforConfigurationCommandsMenuBar.SapforConfigurationCommandsMenuBar;
import Common.UI.Menus_2023.SapforConfigurationsMenuBar.SapforConfigurationsMenuBar; import Common.UI.Menus_2023.SapforConfigurationsMenuBar.SapforConfigurationsMenuBar;
import Common.UI.Menus_2023.SapforScenariosBar.SapforScenariosBar;
import Common.UI.Menus_2023.SapforTasksMenuBar.SapforTasksMenuBar; import Common.UI.Menus_2023.SapforTasksMenuBar.SapforTasksMenuBar;
import Common.UI.Menus_2023.SapforTasksPackagesBar.SapforTasksPackagesBar; import Common.UI.Menus_2023.SapforTasksPackagesBar.SapforTasksPackagesBar;
import Common.UI.Menus_2023.SubscribersMenuBar.SubscribersMenuBar; import Common.UI.Menus_2023.SubscribersMenuBar.SubscribersMenuBar;
@@ -231,7 +232,7 @@ public class UI {
menuBars.put(SapforConfigurationDBTable.class, new SapforConfigurationsMenuBar()); menuBars.put(SapforConfigurationDBTable.class, new SapforConfigurationsMenuBar());
menuBars.put(SapforConfigurationCommandsDBTable.class, new SapforConfigurationCommandsMenuBar()); menuBars.put(SapforConfigurationCommandsDBTable.class, new SapforConfigurationCommandsMenuBar());
menuBars.put(RemoteSapforsDBTable.class, new RemoteSapforsMenuBar()); menuBars.put(RemoteSapforsDBTable.class, new RemoteSapforsMenuBar());
menuBars.put(SapforScenariosDBTable.class, new DataMenuBar("сценарии")); menuBars.put(SapforScenariosDBTable.class, new SapforScenariosBar());
menuBars.put(SapforTasksPackagesDBTable.class, new SapforTasksPackagesBar()); menuBars.put(SapforTasksPackagesDBTable.class, new SapforTasksPackagesBar());
menuBars.put(SapforTasksDBTable.class, new SapforTasksMenuBar()); menuBars.put(SapforTasksDBTable.class, new SapforTasksMenuBar());
//---->> //---->>

4
src/SapforTestingSystem/Json/SapforScenarioResults_json.java
View File

@@ -5,6 +5,10 @@ import com.google.gson.annotations.Expose;
import java.util.List; import java.util.List;
import java.util.Vector; import java.util.Vector;
public class SapforScenarioResults_json { public class SapforScenarioResults_json {
@Expose
public long StartDate = 0;
@Expose
public long EndDate = 0;
@Expose @Expose
public List<SapforTask> tasks = new Vector<>(); public List<SapforTask> tasks = new Vector<>();
} }

4
src/SapforTestingSystem/SapforScenario/SapforScenariosDBTable.java
View File

@@ -2,7 +2,7 @@ package SapforTestingSystem.SapforScenario;
import Common.Current; import Common.Current;
import Common.Database.*; import Common.Database.*;
import Common.UI.DataSetControlForm; import Common.UI.DataSetControlForm;
import SapforTestingSystem.SapforTask.SapforTask; import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import java.util.Date; import java.util.Date;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
@@ -79,7 +79,7 @@ public class SapforScenariosDBTable extends iDBTable<SapforScenario> {
@Override @Override
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() { public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>(); LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
res.put(SapforTask.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE)); res.put(SapforTasksPackage.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
return res; return res;
} }
} }

7
src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java
View File

@@ -2,20 +2,21 @@ package SapforTestingSystem.SapforTestingPlaner;
import Common.Global; import Common.Global;
import Common.Utils.Utils; import Common.Utils.Utils;
import SapforTestingSystem.Json.SapforPackage_json; import SapforTestingSystem.Json.SapforPackage_json;
import SapforTestingSystem.Json.SapforScenario_json;
import SapforTestingSystem.Json.SapforScenarioResults_json; import SapforTestingSystem.Json.SapforScenarioResults_json;
import SapforTestingSystem.Json.SapforScenario_json;
import SapforTestingSystem.PerformSapforTask; import SapforTestingSystem.PerformSapforTask;
import SapforTestingSystem.SapforTask.SapforTask; import SapforTestingSystem.SapforTask.SapforTask;
import SapforTestingSystem.ThreadsPlanner.ThreadsPlanner; import SapforTestingSystem.ThreadsPlanner.ThreadsPlanner;
import java.io.File; import java.io.File;
import java.util.Date;
public class SapforTestingPlanner extends ThreadsPlanner { public class SapforTestingPlanner extends ThreadsPlanner {
SapforScenario_json scenario_json = null; SapforScenario_json scenario_json = null;
SapforScenarioResults_json results_json = new SapforScenarioResults_json(); SapforScenarioResults_json results_json = new SapforScenarioResults_json();
public SapforTestingPlanner() throws Exception { public SapforTestingPlanner() throws Exception {
super(Global.properties.threadsTimeout, Global.properties.threadsNum); super(Global.properties.threadsTimeout, Global.properties.threadsNum);
scenario_json = (SapforScenario_json) Utils.jsonFromFile(new File(Global.Home, "scenario.txt"), SapforScenario_json.class); scenario_json = (SapforScenario_json) Utils.jsonFromFile(new File(Global.Home, "scenario.txt"), SapforScenario_json.class);
results_json.StartDate = new Date().getTime();
//формирование списка задач. //формирование списка задач.
File sapfor_drv = new File(Global.Home, scenario_json.sapfor_drv); File sapfor_drv = new File(Global.Home, scenario_json.sapfor_drv);
for (SapforPackage_json sapforPackage_json : scenario_json.packages) { for (SapforPackage_json sapforPackage_json : scenario_json.packages) {
@@ -47,6 +48,7 @@ public class SapforTestingPlanner extends ThreadsPlanner {
} }
@Override @Override
protected void finalize() { protected void finalize() {
results_json.EndDate = new Date().getTime();
System.out.println("Запись результатов"); System.out.println("Запись результатов");
//записать результаты всех задач. //записать результаты всех задач.
try { try {
@@ -56,7 +58,6 @@ public class SapforTestingPlanner extends ThreadsPlanner {
} catch (Exception e) { } catch (Exception e) {
Global.Log.PrintException(e); Global.Log.PrintException(e);
} }
System.exit(0); System.exit(0);
} }
} }

21
src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java → src/Visual_DVM_2021/Passes/All/DeleteSapforScenario.java
View File

@@ -1,13 +1,14 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.Database.Database; import Common.Database.Database;
import Common.Global; import Common.Global;
import Common.UI.UI; import Common.Utils.Utils;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage; import SapforTestingSystem.SapforScenario.SapforScenario;
import Visual_DVM_2021.Passes.DeleteObjectPass; import Visual_DVM_2021.Passes.DeleteObjectPass;
public class DeleteSapforTasksPackage extends DeleteObjectPass<SapforTasksPackage> {
public DeleteSapforTasksPackage() { import java.io.File;
super(SapforTasksPackage.class); public class DeleteSapforScenario extends DeleteObjectPass<SapforScenario> {
public DeleteSapforScenario() {
super(SapforScenario.class);
} }
@Override @Override
protected Database getDb() { protected Database getDb() {
@@ -15,13 +16,15 @@ public class DeleteSapforTasksPackage extends DeleteObjectPass<SapforTasksPackag
} }
@Override @Override
protected void performPreparation() throws Exception { protected void performPreparation() throws Exception {
if (Current.hasUI()) { /*
UI.getMainWindow().getTestingWindow().RemoveSapforPackageFromComparison(target); if (Current.hasUI()&&Current.HasSapforTasksPackage()) {
UI.getMainWindow().getTestingWindow().RemoveSapforPackageFromComparison();
} }
*/
} }
@Override @Override
protected void body() throws Exception { protected void body() throws Exception {
super.body(); super.body();
// Utils.delete_with_check(new File(target.workspace)); Utils.delete_with_check(new File(target.workspace));
} }
} }

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

@@ -9,10 +9,11 @@ public enum PassCode_2021 {
CompareSapforPackages, CompareSapforPackages,
//- //-
StartSapforTests, StartSapforTests,
DeleteSapforTasksPackage,
AnalyseSapforPackageResults, AnalyseSapforPackageResults,
OpenSapforTest, OpenSapforTest,
//- //-
DeleteSapforScenario,
//-
//- //-
CheckAccount, CheckAccount,
CheckRegistrationOnServer, CheckRegistrationOnServer,
@@ -328,8 +329,6 @@ public enum PassCode_2021 {
return "Создать задачи тестирования SAPFOR"; return "Создать задачи тестирования SAPFOR";
case SPF_SharedMemoryParallelization: case SPF_SharedMemoryParallelization:
return "Распараллеливание на общую память"; return "Распараллеливание на общую память";
case DeleteSapforTasksPackage:
return "Удалить пакет задач SAPFOR";
case ResurrectComponentFromServer: case ResurrectComponentFromServer:
return "Восстановление предыдущей версии компонента с сервера"; return "Восстановление предыдущей версии компонента с сервера";
case ResurrectComponent: case ResurrectComponent: