no message

2023-10-18 22:16:22 +03:00
parent b7a0445f39
commit 8c1cd78fc7
6 changed files with 33 additions and 21 deletions
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,15 +8,10 @@
  <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/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Constants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestingBar/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestingBar/TestingBar.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingPlanner.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestsSupervisor_2022/TestsSupervisor_2022.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestsSupervisor_2022/TestsSupervisor_2022.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.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" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
--- a/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java
+++ b/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java
@@ -29,12 +29,14 @@ public class PackageModeSupervisor extends ThreadsPlanner {
            for (String testName : package_json.tests) {
                //--- чтобы было можно на нее сослаться после выполнения всех нитей.
                SapforTask task = new SapforTask();
+                task.test_description = testName;
+                task.flags = sapforConfiguration_json.flags;
+                task.sapfor_configuration_id = sapforConfiguration_json.id;
                results_json.tasks.add(task);
                //---
                addThread(() -> new PerformSapforTask().Do(
                        sapfor_drv,
                        sapforConfiguration_json,
-                        testName,
                        task
                ));
            }
--- a/src/SapforTestingSystem/PerformSapforTask.java
+++ b/src/SapforTestingSystem/PerformSapforTask.java
@@ -50,14 +50,11 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
    protected boolean canStart(Object... args) throws Exception {
        sapfor_drv = (File) args[0];
        sapforConfiguration_json = (SapforConfiguration_json) args[1];
-        String testDescription = (String) args[2];
-        target = (SapforTask) args[3];
+        target = (SapforTask) args[2];
        //--->>
-        parentTask = Paths.get(Global.Home, sapforConfiguration_json.id, testDescription).toFile();
+        parentTask = Paths.get(Global.Home, sapforConfiguration_json.id, target.test_description).toFile();
        task = null;
        //--->>
-        target.sapfor_configuration_id = sapforConfiguration_json.id;
-        target.test_description = testDescription;
        target.root = parentTask.getAbsolutePath();
        return true;
    }
@@ -92,7 +89,7 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
        File file = new File(data_workspace, name + (Global.isWindows ? ".bat" : ".sh"));
        FileUtils.write(file,
                Utils.DQuotes(sapfor_drv.getAbsolutePath())
-                        + (sapforConfiguration_json.flags.isEmpty() ? "" : (" " + sapforConfiguration_json.flags))
+                        + (target.flags.isEmpty() ? "" : (" " + target.flags))
                        + " -noLogo"
                        + " " + command +
                        " 1>" +
--- a/src/SapforTestingSystem/SapforTask/SapforTask.java
+++ b/src/SapforTestingSystem/SapforTask/SapforTask.java
@@ -21,6 +21,9 @@ public class SapforTask extends DBObject {
    public String test_description = "";
    @Description("DEFAULT ''")
    @Expose
+    public String flags = "";
+    @Description("DEFAULT ''")
+    @Expose
    public String root = "";
    @Description("DEFAULT ''")
    @Expose
--- a/src/TestingSystem/TestingPlanner.java
+++ b/src/TestingSystem/TestingPlanner.java
@@ -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;
    }
 }
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -315,7 +315,7 @@ public enum PassCode_2021 {
            case ShowParallelVariantsCoverage:
                return "Отобразить минимальное покрытие параллельных вариантов";
            case DeleteSapforTasksPackage:
-                return "Удалить сценарий SAPFOR";
+                return "Удалить пакет задач SAPFOR";
            case DeleteServerSapfor:
                return "Удалить версию SAPFOR";
            case StartSapforTests: