From e5f3230c9cb7df32653ad4eaaf162fd1aca1c690 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 25 Dec 2023 02:07:37 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                            | 15 +--------------
 .../SAPFOR/PackageModeSupervisor.java          | 18 ++++++++----------
 .../SAPFOR/SapforTask/SapforTask.java          | 10 +++-------
 .../UI/Main/SapforPackagesComparisonForm.java  | 11 -----------
 4 files changed, 12 insertions(+), 42 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2f9d7957..206fe38d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,22 +7,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforTestingSet_json.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddTasksToSapforPackage.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Новый текстовый документ.txt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/TestingSystem/Common/TaskThread.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TaskThread.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforTasksPackage_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforTasksResults_json.java" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PackageModeSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PackageModeSupervisor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PerformSapforTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackagesBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddSapforPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.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" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/SapforTask.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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/src/TestingSystem/SAPFOR/PackageModeSupervisor.java b/src/TestingSystem/SAPFOR/PackageModeSupervisor.java
index 48910fa8..92ddab5d 100644
--- a/src/TestingSystem/SAPFOR/PackageModeSupervisor.java
+++ b/src/TestingSystem/SAPFOR/PackageModeSupervisor.java
@@ -2,13 +2,13 @@ package TestingSystem.SAPFOR;
 import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
+import TestingSystem.Common.TaskThread;
+import TestingSystem.Common.ThreadsPlanner.ThreadsPlanner;
 import TestingSystem.SAPFOR.Json.SapforConfiguration_json;
 import TestingSystem.SAPFOR.Json.SapforPackage_json;
 import TestingSystem.SAPFOR.Json.SapforTest_json;
 import TestingSystem.SAPFOR.Json.SapforTestingSet_json;
 import TestingSystem.SAPFOR.SapforTask.SapforTask;
-import TestingSystem.Common.TaskThread;
-import TestingSystem.Common.ThreadsPlanner.ThreadsPlanner;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import org.apache.commons.io.FileUtils;
 
@@ -18,18 +18,17 @@ import java.util.Date;
 import java.util.Vector;
 public class PackageModeSupervisor extends ThreadsPlanner {
     SapforPackage_json package_json = null;
-    File sapfor_drv=null;
-
+    File sapfor_drv = null;
     public PackageModeSupervisor() throws Exception {
         super(2000);
         package_json = (SapforPackage_json) Utils.jsonFromFile(new File(Constants.package_json), SapforPackage_json.class);
         //--
         File sapfor_src = new File(package_json.sapfor_drv);
-        sapfor_drv = new File(Global.Home,Utils.getDateName("SAPFOR_F"));
+        sapfor_drv = new File(Global.Home, Utils.getDateName("SAPFOR_F"));
         FileUtils.copyFile(sapfor_src, sapfor_drv);
         if (!sapfor_drv.setExecutable(true))
             throw new Exception("Не удалось сделать файл " + sapfor_drv.getName() + " исполняемым!");
-        File PID = new File( "PID");
+        File PID = new File("PID");
         FileUtils.writeStringToFile(PID, sapfor_drv.getName(), Charset.defaultCharset());
         //---
         Date startDate = new Date();
@@ -37,8 +36,8 @@ public class PackageModeSupervisor extends ThreadsPlanner {
         FileUtils.writeStringToFile(started, String.valueOf(startDate));
         //формирование списка задач.
         setMaxKernels(package_json.kernels);
-        int max_rask_id=0;
-        for (SapforTestingSet_json set_json: package_json.testingSets) {
+        int max_rask_id = 0;
+        for (SapforTestingSet_json set_json : package_json.testingSets) {
             for (SapforConfiguration_json sapforConfiguration_json : set_json.configurations) {
                 for (SapforTest_json test : set_json.tests) {
                     //--- чтобы было можно на нее сослаться после выполнения всех нитей.
@@ -47,6 +46,7 @@ public class PackageModeSupervisor extends ThreadsPlanner {
                     task.group_description = test.group_description;
                     task.test_description = test.description;
                     task.flags = sapforConfiguration_json.flags;
+                    task.set_id = set_json.id;
                     task.sapfor_configuration_id = sapforConfiguration_json.id;
                     task.sapfortaskspackage_id = Integer.parseInt(new File(Global.Home).getName());
                     package_json.tasks.add(task);
@@ -79,14 +79,12 @@ public class PackageModeSupervisor extends ThreadsPlanner {
             FileUtils.writeStringToFile(new File(Constants.DONE), "");
             //--
             //Очистка
-
             //очистка служебных файлов.
             Utils.deleteFilesByExtensions(new File(Global.Home),
                     "proj", "dep", "jar"
                     //  ,"sh", "exe", "bat"
             );
             //удаление сапфора
-
             if (sapfor_drv.exists())
                 FileUtils.forceDelete(sapfor_drv);
         } catch (Exception e) {
diff --git a/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java b/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java
index 69c7c9d2..5d0c9dbf 100644
--- a/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java
+++ b/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java
@@ -18,26 +18,21 @@ import java.util.LinkedHashMap;
 import java.util.Vector;
 public class SapforTask extends DBObject {
     //------------------------------------>>
-    @Description("PRIMARY KEY, UNIQUE")
     @Expose
     public long id = Constants.Nan;
-    @Description("DEFAULT '-1'")
+    @Expose
+    public int set_id = 0;
     @Expose
     public int sapfor_configuration_id = Constants.Nan;
     @Expose
-    @Description("DEFAULT '-1'")
     public long sapfortaskspackage_id = Constants.Nan;
     //------------------------------------->>
-    @Description("DEFAULT ''")
     @Expose
     public String test_description = "";
-    @Description("DEFAULT ''")
     @Expose
     public String group_description = "";
-    @Description("DEFAULT ''")
     @Expose
     public String flags = "";
-    @Description("DEFAULT ''")
     @Expose
     public String codes = "";
     @Expose
@@ -123,6 +118,7 @@ public class SapforTask extends DBObject {
         super.SynchronizeFields(object);
         SapforTask t = (SapforTask) object;
         id = t.id;
+        set_id= t.set_id;
         sapfor_configuration_id = t.sapfor_configuration_id;
         sapfortaskspackage_id = t.sapfortaskspackage_id;
         //-
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
index cb07d39c..02119ff0 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
@@ -198,17 +198,6 @@ public class SapforPackagesComparisonForm {
                     package1 = object;
                     package2 = slave.object;
                     //--
-                    /*
-                    if (!package1.testsIds.equals(package2.testsIds)) {
-                        Log.Writeln_("Наборы тестов пакетов не совпадают!");
-                        return false;
-                    }
-                    if (!package1.configurationsIds.equals(package2.configurationsIds)) {
-                        Log.Writeln_("Наборы конфигураций не совпадают!");
-                        return false;
-                    }
-                     */
-
                     for (String key1 : package1.package_json.allTasks.keySet()) {
                         if (!package2.package_json.allTasks.containsKey(key1)) {
                             Log.Writeln_("Задача эталона " + key1 + "не найдена в сравниваемом пакете!");