From abab3f067cb05ea0e62d6bcc82b37ce957e1c17f Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sun, 23 Mar 2025 15:59:28 +0300
Subject: [PATCH] =?UTF-8?q?++=20=D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD?=
 =?UTF-8?q?=D0=B5=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D1=8D=D1=82=D0=B0=D0=BB=D0=BE=D0=BD=D0=BE=D0=B2?=
 =?UTF-8?q?=20=D1=82=D0=B5=D1=81=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D1=81=D0=B0=D0=BF=D1=84=D0=BE=D1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 10 -----
 src/_VisualDVM/Constants.java                 |  2 +-
 .../TestingSystem/Common/TestingServer.java   | 41 ++++++++++---------
 .../SAPFOR/SapforPackage/SapforPackage.java   |  1 +
 4 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7319b6d0..2b684550 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,7 @@
   </component>
   <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/_VisualDVM/TestingSystem/Common/Group/Json/GroupJson.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/Json/GroupsJson.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Settings/Json/SettingsArrayJson.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Settings/Json/SettingsJson.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Json/TestFileJson.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Json/TestFilesJson.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Json/TestJson.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Json/TestsJson.java" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index 3deb3579..eff503ee 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
-    public static final int version = 1221;
+    public static final int version = 1222;
     public static final int planner_version = 24;
     public static final int testingMaxKernels = 64;
     //--
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingServer.java b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
index 938f6a23..7dfd4532 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingServer.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
@@ -258,11 +258,11 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         checkExistense(sapforId, ServerSapfor.class);
         ServerSapfor sapfor = db.serverSapfors.get(sapforId);
         TextLog Log = new TextLog();
-        SapforPackage autoPackage = tryAutoSapforTesting(sapfor, Log);
+        tryAutoSapforTesting(sapfor, Log);
         EmailMessage message = Log.isEmpty() ?
                 new EmailMessage(
-                        "Запущено автоматическое тестирование версии " + sapfor.version + " системы SAPFOR",
-                        "Пакет " + Utils_.Brackets(autoPackage.id)) :
+                        ("Запущено автоматическое тестирование версии " + sapfor.version + " системы SAPFOR"),
+                        Log.toString()) :
                 new EmailMessage(
                         "Не удалось запустить автоматическое тестирование версии " + sapfor.version + " системы SAPFOR",
                         Log.toString()
@@ -540,7 +540,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         }
         response.object = serverSapfor;
     }
-    SapforPackage tryAutoSapforTesting(ServerSapfor sapfor, TextLog Log) throws Exception {
+    void tryAutoSapforTesting(ServerSapfor sapfor, TextLog Log) throws Exception {
         //--
         UserAccount account = new UserAccount();
         account.name = "server";
@@ -549,28 +549,29 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         //-
         if (!sapfor.state.equals(ServerSapforState.Done)) {
             Log.Writeln_("Выбранная версия SAPFOR " + sapfor.version + " не собрана!");
-            return null;
+            return;
         }
         Vector<SapforConfiguration> configurations = db.sapforConfigurations.getAutoConfigurations();
         if (configurations.isEmpty()) {
             Log.Writeln_("Не найдено конфигураций для автоматического тестирования!");
-            return null;
+            return;
         }
-        SapforPackage target = new SapforPackage(account,
-                sapfor,
-                configurations,
-                1,
-                Log);
-        //-
-        if (target.tasksCount == 0) {
-            Log.Writeln_("Не сформировано ни одной новой задачи.");
-            return null;
+        Vector<SapforPackage> sapforPackages = new Vector<>();
+        for (SapforConfiguration sapforConfiguration : configurations) {
+            SapforPackage sapforPackage = new SapforPackage(account, sapfor,new Vector_<>(sapforConfiguration), 1, Log);
+            if (sapforPackage.tasksCount > 0) {
+                sapforPackages.add(sapforPackage);
+            }
+        }
+        if (sapforPackages.isEmpty()){
+            Log.Writeln_("Не сформировано ни одного пакета");
+            return;
+        }
+        for (SapforPackage sapforPackage: sapforPackages){
+            beforePublishAction(sapforPackage);
+            db.InsertS(sapforPackage);
+            afterPublishAction(sapforPackage);
         }
-        beforePublishAction(target);
-        db.InsertS(target);
-        afterPublishAction(target);
-        //--
-        return target;
     }
     Vector<String> getSapforTaskResults(SapforTask task) throws Exception {
         Vector<String> res = new Vector<>();
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
index 0451b782..3d8b27c1 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
@@ -103,6 +103,7 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
                 bad++;
             else good++;
         }
+        bad+=mismatchesCount;
         state = (bad > 0) ? TasksPackageState.DoneWithErrors : TasksPackageState.Done;
         double percent = (((double) (good)) / tasksCount) * 100.0;
         description = "Выполнено на " + ((int) percent) + "%\n" +