From 25613012fd40044e9dd537f3bc26e7067c670a64 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 15 Nov 2023 14:05:04 +0300
Subject: [PATCH] =?UTF-8?q?fix.=20=D0=B2=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4?=
 =?UTF-8?q?=D0=B5=20keepnewFiles=20=D0=B1=D1=8B=D0=BB=D0=B0=20=D0=B8=D0=BD?=
 =?UTF-8?q?=D0=B4=D0=B8=D0=B9=D1=81=D0=BA=D0=B0=D1=8F=20=D1=81=D0=BE=D1=80?=
 =?UTF-8?q?=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0.=20=D0=B2=D0=BC?=
 =?UTF-8?q?=D0=B5=D1=81=D1=82=D0=BE=20Long.compare=20=D0=B1=D1=8B=D0=BB?=
 =?UTF-8?q?=D0=BE=20=D0=BF=D1=80=D0=B8=D0=B2=D0=B5=D0=B4=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D0=BA=20=D0=B8=D0=BD=D1=82=D1=83=20=D0=B8=20=D1=81?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5.=20=D1=87?=
 =?UTF-8?q?=D1=82=D0=BE=20=D0=B2=D1=8B=D0=B7=D1=8B=D0=B2=D0=B0=D0=BB=D0=BE?=
 =?UTF-8?q?=20=D0=B8=D1=81=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D0=B5?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  7 ++-
 properties                                    |  2 +-
 src/Common/Utils/Utils.java                   |  3 +-
 src/Repository/Component/Visualiser.java      |  2 +-
 src/Repository/RepositoryServer.java          |  2 -
 .../SapforTasksPackage.java                   |  1 +
 .../SapforTasksPackageSupervisor.java         | 48 ++++++++++++++-----
 src/TestingSystem/TestingPlanner.java         |  3 --
 8 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3d84e517..7c6808a4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,8 +8,13 @@
   <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/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$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/RepositoryServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.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/TestingSystem/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingPlanner.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index d9a7bdd4..d849699a 100644
--- a/properties
+++ b/properties
@@ -20,7 +20,7 @@
   "ComponentsWindowWidth": 843,
   "ComponentsWindowHeight": 250,
   "VisualiserPath": "C:\\Users\\misha\\Downloads",
-  "Sapfor_FPath": "E:\\",
+  "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
   "Visualizer_2Path": "C:\\Users\\misha\\Documents",
   "InstructionPath": "",
   "PerformanceAnalyzerPath": "",
diff --git a/src/Common/Utils/Utils.java b/src/Common/Utils/Utils.java
index 3172694b..0b7009df 100644
--- a/src/Common/Utils/Utils.java
+++ b/src/Common/Utils/Utils.java
@@ -1013,13 +1013,14 @@ public class Utils {
     public static int fromBoolean(boolean flag) {
         return flag ? 1 : 0;
     }
+
     public static void keepNewFiles(File directory, int count) throws Exception {
         if (count > 0) {
             File[] old_ = directory.listFiles(pathname -> pathname.isFile());
             if (old_ != null) {
                 Vector<File> old = new Vector<>();
                 Collections.addAll(old, old_);
-                old.sort((o1, o2) -> (int) (o2.lastModified() - o1.lastModified()));
+                old.sort((o1, o2) -> Long.compare(o2.lastModified(), o1.lastModified()));
                 for (int i = count - 1; i < old.size(); ++i) {
                     File file = old.get(i);
                     System.out.println(file.getName() + ":" + file.lastModified());
diff --git a/src/Repository/Component/Visualiser.java b/src/Repository/Component/Visualiser.java
index 2ac9acf7..b49d0fe0 100644
--- a/src/Repository/Component/Visualiser.java
+++ b/src/Repository/Component/Visualiser.java
@@ -62,7 +62,7 @@ public class Visualiser extends Component {
     //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
     @Override
     public void GetVersionInfo() {
-        version = 1027;
+        version = 1028;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());
diff --git a/src/Repository/RepositoryServer.java b/src/Repository/RepositoryServer.java
index eb41c15d..8dcec9de 100644
--- a/src/Repository/RepositoryServer.java
+++ b/src/Repository/RepositoryServer.java
@@ -286,8 +286,6 @@ public abstract class RepositoryServer<D extends Database> {
                                 case GetObjectsCopiesByPK:
                                     Print("Получить список копий объектов по ключам");
                                     p = (Pair<Class, Object>) request.object;
-                                    System.out.println(p.getKey());
-                                    System.out.println(p.getValue());
                                     response = new ServerExchangeUnit_2021(ServerCode.OK);
                                     response.object = db.getObjectsCopies(p.getKey(), (Vector<Object>) p.getValue());
                                     break;
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java
index 731fdb92..89142f34 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java
@@ -55,6 +55,7 @@ public class SapforTasksPackage extends nDBObject {
         sapfor_process_name = p.sapfor_process_name;
         state = p.state;
         needsEmail = p.needsEmail;
+        summary = p.summary;
     }
     //---
     @Description("IGNORE")
diff --git a/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java b/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
index 6584de94..fb8394fd 100644
--- a/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
+++ b/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
@@ -44,9 +44,6 @@ public class SapforTasksPackageSupervisor {
         LinkedHashMap<String, Group> groups = new LinkedHashMap<>();
         //--
         System.out.println(sapforTasksPackage.id + " — TestsSynchronize");
-        for (String test_id : testsIds) {
-            System.out.println(Utils.Brackets(test_id));
-        }
         for (Object o : tests_) {
             Test test = (Test) o;
             tests.put(test.id, test);
@@ -54,20 +51,42 @@ public class SapforTasksPackageSupervisor {
                 groupsIds.add(test.group_id);
         }
         //--
-        Vector<Object> groups_ = (Vector<Object>) planner.ServerCommand(ServerCode.GetObjectsCopiesByPK, "", new Pair<>(Group.class, groupsIds));
-
-        for (Object o : groups_) {
-            Group group = (Group) o;
-            groups.put(group.id, group);
-        }
-        //--
         for (Object o : configurations_) {
             SapforConfiguration sapforConfiguration = (SapforConfiguration) o;
             configurations.put(sapforConfiguration.id, sapforConfiguration);
         }
         //---
-        
-
+        Vector<String> badTests = new Vector<>();
+        for (String testId : testsIds)
+            if (!tests.containsKey(testId))
+                badTests.add(testId);
+        //--
+        Vector<String> badConfigurations = new Vector<>();
+        for (String configurationId : configurationsIds)
+            if (!configurations.containsKey(configurationId))
+                badConfigurations.add(configurationId);
+        //--
+        File sapfor_src = new File(sapforTasksPackage.sapfor_drv);
+        //--
+        Vector<String> notFound = new Vector<>();
+        if (!badTests.isEmpty())
+            notFound.add("Несуществующие тесты: " + String.join("\n", badTests));
+        if (!badConfigurations.isEmpty())
+            notFound.add("Несуществующие конфигурации: " + String.join("\n", badConfigurations));
+        if (!sapfor_src.exists()) {
+            notFound.add("Несуществующий SAPFOR: " + Utils.Brackets(sapfor_src.getAbsolutePath()));
+        }
+        if (!notFound.isEmpty()) {
+            sapforTasksPackage.summary = String.join("\n", notFound);
+            System.out.println(sapforTasksPackage.summary);
+            sapforTasksPackage.state = TasksPackageState.Aborted;
+            return;
+        }
+        Vector<Object> groups_ = (Vector<Object>) planner.ServerCommand(ServerCode.GetObjectsCopiesByPK, "", new Pair<>(Group.class, groupsIds));
+        for (Object o : groups_) {
+            Group group = (Group) o;
+            groups.put(group.id, group);
+        }
         //--
         SapforTasksPackage_json package_json = new SapforTasksPackage_json();
         package_json.kernels = sapforTasksPackage.kernels;
@@ -82,6 +101,7 @@ public class SapforTasksPackageSupervisor {
         Utils.CheckAndCleanDirectory(packageWorkspace);
         sapforTasksPackage.workspace = packageWorkspace.getAbsolutePath();
         //копирование тестов по конфигурациям.
+        int actual_tasks_count = 0;
         for (String configuration_id : configurationsIds) {
             SapforConfiguration configuration = configurations.get(configuration_id);
             //--
@@ -100,11 +120,13 @@ public class SapforTasksPackageSupervisor {
                 File test_root = new File(configurationWorkspace, test.description);
                 Utils.CheckAndCleanDirectory(test_root);
                 FileUtils.copyDirectory(new File(Global.TestsDirectory, test.id), test_root);
+                actual_tasks_count++;
             }
         }
+        sapforTasksPackage.tasksCount = actual_tasks_count;
         //копирование SAPFOR
         File sapforFile = new File(sapforTasksPackage.workspace, Utils.getDateName("SAPFOR_F"));
-        FileUtils.copyFile(new File(sapforTasksPackage.sapfor_drv), sapforFile);
+        FileUtils.copyFile(sapfor_src, sapforFile);
         if (!sapforFile.setExecutable(true))
             throw new Exception("Не удалось сделать файл " + sapforFile.getName() + " исполняемым!");
         sapforTasksPackage.sapfor_process_name = package_json.sapfor_drv = sapforFile.getName();
diff --git a/src/TestingSystem/TestingPlanner.java b/src/TestingSystem/TestingPlanner.java
index aff002d2..5aed0248 100644
--- a/src/TestingSystem/TestingPlanner.java
+++ b/src/TestingSystem/TestingPlanner.java
@@ -216,9 +216,6 @@ public class TestingPlanner {
             switch (sapforTasksPackage.state) {
                 case RunningExecution:
                 case Aborted:
-                    message = new EmailMessage();
-                    message.subject = "Состояние пакета задач SAPFOR" + Utils.Brackets(sapforTasksPackage.id) + " изменилось на " + Utils.Brackets(sapforTasksPackage.state.getDescription());
-                    break;
                 case Done:
                     //результаты.
                     message = new EmailMessage();