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

кнопка удаления пакетов SAPFOR и их результатов.

Browse Source
This commit is contained in:
02090095
2023-10-18 14:05:51 +03:00
parent d19307ac2b
commit b7a0445f39
11 changed files with 116 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java
View File

@@ -17,7 +17,7 @@ public class PackageModeSupervisor extends ThreadsPlanner {
SapforTasksResults_json results_json = new SapforTasksResults_json();
public PackageModeSupervisor() throws Exception {
super(2000);
package_json = (SapforTasksPackage_json) Utils.jsonFromFile(new File(Global.Home, "package_json"), SapforTasksPackage_json.class);
package_json = (SapforTasksPackage_json) Utils.jsonFromFile(new File(Global.Home, Constants.package_json), SapforTasksPackage_json.class);
Date startDate = new Date();
results_json.StartDate = startDate.getTime();
File started = new File(Constants.STARTED);
@@ -46,7 +46,7 @@ public class PackageModeSupervisor extends ThreadsPlanner {
results_json.EndDate = new Date().getTime();
//записать результаты всех задач.
try {
Utils.jsonToFile(results_json, new File(Global.Home, "results_json"));
Utils.jsonToFile(results_json, new File(Global.Home, Constants.results_json));
//тут же и строить версии.
Utils.deleteFilesByExtensions(new File(Global.Home), "proj", "dep"); //Потом txt тоже добавить.
FileUtils.writeStringToFile(new File(Constants.DONE), "");

10
src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
View File

@@ -112,7 +112,7 @@ public class SapforTasksPackageSupervisor {
}
//-->>
sapforTasksPackage.state = TasksPackageState.RunningExecution;
planner.UpdateSapforPackage(sapforTasksPackage);
planner.UpdateSapforPackage();
System.out.println("done");
}
void CheckPackageState() throws Exception {
@@ -121,11 +121,11 @@ public class SapforTasksPackageSupervisor {
File aborted = new File(sapforTasksPackage.workspace, Constants.ABORTED);
if (done.exists()) {
sapforTasksPackage.state = TasksPackageState.Done;
planner.UpdateSapforPackage(sapforTasksPackage);
planner.UpdateSapforPackage();
System.out.println("package done");
} else if (aborted.exists()) {
sapforTasksPackage.state = TasksPackageState.Aborted;
planner.UpdateSapforPackage(sapforTasksPackage);
planner.UpdateSapforPackage();
System.out.println("package aborted");
} else {
System.out.println("package running");
@@ -157,13 +157,13 @@ public class SapforTasksPackageSupervisor {
System.out.println("PACKAGE " + sapforTasksPackage.id + " NEEDS TO KILL");
killPackage();
sapforTasksPackage.state = TasksPackageState.Aborted;
planner.UpdateSapforPackage(sapforTasksPackage);
planner.UpdateSapforPackage();
} else {
switch (sapforTasksPackage.state) {
case TestsSynchronize:
TestsSynchronize();
sapforTasksPackage.state = TasksPackageState.RunningPreparation;
planner.UpdateSapforPackage(sapforTasksPackage);
planner.UpdateSapforPackage();
break;
case RunningPreparation:
PackageStart();