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-18 22:16:22 +03:00
parent b7a0445f39
commit 8c1cd78fc7
6 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/TestingSystem/TestingPlanner.java
View File

@@ -1,5 +1,4 @@
package TestingSystem;
import Common.Constants;
import Common.Global;
import Common.Utils.Utils;
import GlobalData.Machine.Machine;
@@ -7,8 +6,6 @@ import GlobalData.User.User;
import Repository.EmailMessage;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import SapforTestingSystem.Json.SapforTasksPackage_json;
import SapforTestingSystem.SapforTask.SapforTask;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import SapforTestingSystem.SapforTasksPackageSupervisor.SapforTasksPackageSupervisor;
import TestingSystem.Tasks.TestCompilationTask;
@@ -226,7 +223,7 @@ public class TestingPlanner {
//результаты.
message = new EmailMessage();
message.subject = "Состояние пакета задач SAPFOR" + Utils.Brackets(sapforTasksPackage.id) + " изменилось на " + Utils.Brackets(sapforTasksPackage.state.getDescription());
message.text = AnalyseSapforPackageResults();
message.text = PrintSapforPackageResults();
break;
default:
break;
@@ -238,17 +235,35 @@ public class TestingPlanner {
}
}
//--
public String AnalyseSapforPackageResults() throws Exception {
public String PrintSapforPackageResults() throws Exception {
String result = "";
Vector<String> result_lines = new Vector<>();
/*
File results_json_file = new File(sapforTasksPackage.workspace, Constants.results_json);
if (results_json_file.exists()) {
SapforTasksPackage_json results_json = (SapforTasksPackage_json) Utils.jsonFromFile(results_json_file, SapforTasksPackage_json.class);
SapforTasksResults_json results_json = (SapforTasksResults_json) Utils.jsonFromFile(results_json_file, SapforTasksPackage_json.class);
result = String.join("\n", result_lines);
result_lines.add("");
LinkedHashMap<String, Vector<SapforTask>> tasksByConfigurations = new LinkedHashMap<>();
//рассортировать задачи по конфигурациям.
for (SapforTask task : results_json.tasks) {
task.
//--
if (tasksByConfigurations.containsKey(task.sapfor_configuration_id)) {
tasksByConfigurations.get(task.sapfor_configuration_id).add(task);
} else {
Vector<SapforTask> tasks_ = new Vector<>();
tasks_.add(task);
tasksByConfigurations.put(task.sapfor_configuration_id, tasks_);
}
//--
}
//распечатать непрошедшие тесты.
for (String configuration_id: tasksByConfigurations.keySet()){
}
}
*/
return result;
}
}