From 4ad0a322388122517297ddb68a19d70ee98b8690 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 3 Oct 2024 16:21:11 +0300
Subject: [PATCH] =?UTF-8?q?=D1=83=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D1=8F?=
 =?UTF-8?q?=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 17 ++++-----
 properties                                    |  2 +-
 .../Common/TestingPackage/TestingPackage.java |  4 +++
 src/TestingSystem/Common/TestingPlanner.java  | 17 ++++++++-
 src/TestingSystem/Common/TestingServer.java   | 17 ++++-----
 .../DVM/DVMPackage/DVMPackage.java            |  4 +++
 .../DVM/LocalDVMTestingPlanner.java           |  4 +++
 .../DVM/RemoteDVMTestingPlanner.java          | 12 ++++++-
 .../SAPFOR/Json/SapforPackage_json.java       |  6 ----
 .../SAPFOR/SapforPackage/SapforPackage.java   | 36 ++++++++++++-------
 .../SAPFOR/SapforTestingPlanner.java          | 11 +++---
 .../Passes/All/CloneSapforSettings.java       |  2 +-
 12 files changed, 88 insertions(+), 44 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 642512a7..2c00fa9b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,16 +7,17 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneDVMSettings.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforSettings.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/CloneServerObject.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsBar.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/Common/TestingPackage/TestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforPackage_json.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/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforSettings.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 273d58d5..2e627f77 100644
--- a/properties
+++ b/properties
@@ -35,7 +35,7 @@
   "PerformanceAnalyzerPath": "",
   "ComponentsBackUpsCount": 10,
   "TestingKernels": 64,
-  "AutoCheckTesting": false,
+  "AutoCheckTesting": true,
   "CheckTestingIntervalSeconds": 10,
   "EmailOnTestingProgress": true,
   "eraseTestingWorkspaces": true
diff --git a/src/TestingSystem/Common/TestingPackage/TestingPackage.java b/src/TestingSystem/Common/TestingPackage/TestingPackage.java
index 3b23429e..94b16a49 100644
--- a/src/TestingSystem/Common/TestingPackage/TestingPackage.java
+++ b/src/TestingSystem/Common/TestingPackage/TestingPackage.java
@@ -84,4 +84,8 @@ public abstract class TestingPackage<J> extends riDBObject {
     public void saveConfigurationsAsJson(Vector<? extends Configuration> configurations) {
         packedConfigurationsJson = Utils.jsonToPrettyFormat(Utils.gson.toJson(new ConfigurationsJson(configurations)));
     }
+    //определить завершен пакет с ошибками или нет.
+    public void checkFinishState() throws Exception{
+
+    }
 }
diff --git a/src/TestingSystem/Common/TestingPlanner.java b/src/TestingSystem/Common/TestingPlanner.java
index 3d2fffbf..e2463aff 100644
--- a/src/TestingSystem/Common/TestingPlanner.java
+++ b/src/TestingSystem/Common/TestingPlanner.java
@@ -41,14 +41,29 @@ public abstract class TestingPlanner<P extends TestingPackage> extends Repositor
                 break;
         }
     }
+    protected void UpdatePackageState() throws Exception {
+        testingPackage.ChangeDate = new Date().getTime();
+        ServerCommand(ServerCode.EditObject, testingPackage);
+        switch (testingPackage.state) {
+            case Done:
+            case DoneWithErrors:
+            case Aborted:
+            case CompilationExecution:
+            case RunningExecution:
+                EmailPackage();
+                break;
+        }
+    }
     void UpdatePackage() throws Exception {
         testingPackage.ChangeDate = new Date().getTime();
         ServerCommand(ServerCode.EditObject, testingPackage);
     }
+    public abstract String packageDescription();
     void EmailPackage() throws Exception {
         if (testingPackage.needsEmail == 1) {
             EmailMessage message = new EmailMessage();
-            message.subject = "Состояние пакета задач " + Utils.Brackets(testingPackage) + " изменилось на " + Utils.Brackets(testingPackage.state.getDescription());
+            message.subject = "Состояние пакета тестирования "+packageDescription()+ " "+
+                     Utils.Brackets(testingPackage.id) + " изменилось на " + Utils.Brackets(testingPackage.state.getDescription());
             message.text = testingPackage.description;
             message.targets.add(testingPackage.sender_address);
             ServerCommand(ServerCode.Email, message);
diff --git a/src/TestingSystem/Common/TestingServer.java b/src/TestingSystem/Common/TestingServer.java
index d129b117..3968528b 100644
--- a/src/TestingSystem/Common/TestingServer.java
+++ b/src/TestingSystem/Common/TestingServer.java
@@ -172,12 +172,12 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
             case PerformAutoSapforTesting:
                 Print("Запустить автоматическое тестирование SAPFOR");
                 TextLog Log = new TextLog();
-                tryAutoSapforTesting(Log);
+                SapforPackage autoPackage = tryAutoSapforTesting(Log);
                 response = new ServerExchangeUnit_2021(ServerCode.OK);
                 EmailMessage message = Log.isEmpty() ?
                         new EmailMessage(
-                                "Запущено автоматической тестирование версии " + request.arg + " системы SAPFOR",
-                                "", new Vector<>()) :
+                                "Запущено автоматическое тестирование версии " + request.arg + " системы SAPFOR",
+                                "Пакет "+ Utils.Brackets(autoPackage.id), new Vector<>()) :
                         new EmailMessage(
                                 "Не удалось запустить автоматическое тестирование версии " + request.arg + " системы SAPFOR",
                                 Log.toString(),
@@ -606,7 +606,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         response = new ServerExchangeUnit_2021(ServerCode.OK);
         response.object = serverSapfor;
     }
-    void tryAutoSapforTesting(TextLog Log) throws Exception {
+    SapforPackage tryAutoSapforTesting(TextLog Log) throws Exception {
         //--
         Account account = new Account();
         account.name = "server";
@@ -617,17 +617,17 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
 
         if (!db.serverSapfors.containsKey(sapforId)) {
             Log.Writeln_("Версия SAPFOR " + sapforId + " не существует.");
-            return;
+            return null;
         }
         ServerSapfor sapfor = db.serverSapfors.get(sapforId);
         if (!sapfor.state.equals(ServerSapforState.Done)) {
             Log.Writeln_("Выбранная версия SAPFOR " + sapforId + " не собрана!");
-            return;
+            return null;
         }
         Vector<SapforConfiguration> configurations = db.sapforConfigurations.getAutoConfigurations();
         if (configurations.isEmpty()) {
             Log.Writeln_("Не найдено конфигураций для автоматического тестирования!");
-            return;
+            return null;
         }
         SapforPackage target = new SapforPackage(account,
                 sapfor,
@@ -637,12 +637,13 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         //-
         if (target.tasksCount == 0) {
             Log.Writeln_("Не сформировано ни одной новой задачи.");
-            return;
+            return null;
         }
         beforePublishAction(target);
         db.InsertS(target);
         afterPublishAction(target);
         //--
+        return target;
     }
 
 }
diff --git a/src/TestingSystem/DVM/DVMPackage/DVMPackage.java b/src/TestingSystem/DVM/DVMPackage/DVMPackage.java
index 0610a377..a87d2e2f 100644
--- a/src/TestingSystem/DVM/DVMPackage/DVMPackage.java
+++ b/src/TestingSystem/DVM/DVMPackage/DVMPackage.java
@@ -114,5 +114,9 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
         return (!DVMPackageDBTable.filterMyOnly || Current.getAccount().email.equals(sender_address)) &&
                 (!DVMPackageDBTable.filterActive || state.isActive());
     }
+    @Override
+    public void checkFinishState() throws Exception {
+
+    }
 }
 
diff --git a/src/TestingSystem/DVM/LocalDVMTestingPlanner.java b/src/TestingSystem/DVM/LocalDVMTestingPlanner.java
index a4064cc7..513f51f7 100644
--- a/src/TestingSystem/DVM/LocalDVMTestingPlanner.java
+++ b/src/TestingSystem/DVM/LocalDVMTestingPlanner.java
@@ -55,6 +55,10 @@ public class LocalDVMTestingPlanner extends DVMTestingPlanner {
         return true;
     }
     @Override
+    public String packageDescription() {
+        return "DVM";
+    }
+    @Override
     protected void TestsSynchronize() throws Exception {
         testingPackage.readJson();
         LinkedHashMap<Integer, File> tests = getTestsFromJson();
diff --git a/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java b/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java
index 1d5da392..ece87e08 100644
--- a/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java
+++ b/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java
@@ -104,6 +104,7 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
         //--
         int ct_count = 0;
         int rt_count = 0;
+        int good=0;
         //--
         for (DVMCompilationTask compilationTask : testingPackage.package_json.compilationTasks) {
             compilationTask.dvm_package_id = testingPackage.id;
@@ -154,13 +155,18 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
                     }
                     if (!runTask.state.equals(TaskState.Done))
                         hasErrors = true;
+                    else good++;
                 }
             }
         }
         testingPackage.progress = 100;
         testingPackage.saveJson(); //запись обновленных результатов пакета в json!
         Print("analysis done, ct_count=" + ct_count + " rt count=" + rt_count);
-        UpdatePackageState(hasErrors ? TasksPackageState.DoneWithErrors : TasksPackageState.Done);
+        testingPackage.state = hasErrors ? TasksPackageState.DoneWithErrors : TasksPackageState.Done;
+        double percent = ( ((double)(good))/testingPackage.tasksCount)*100.0;
+        testingPackage.description = "Выполнено на "+((int)percent)+"%\n"+
+                "Всего задач: "+testingPackage.tasksCount+", из них с ошибками "+(testingPackage.tasksCount-good);
+        UpdatePackageState();
     }
     @Override
     protected void PackageStart() throws Exception {
@@ -263,4 +269,8 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
         }
         return true;
     }
+    @Override
+    public String packageDescription() {
+        return "DVM";
+    }
 }
diff --git a/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java b/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java
index 19bc4759..d97fde82 100644
--- a/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java
+++ b/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java
@@ -179,12 +179,6 @@ public class SapforPackage_json implements Serializable {
         });
         return names;
     }
-    public TasksPackageState getState() {
-        for (SapforTask task : tasks)
-            if (!task.state.equals(TaskState.Done))
-                return TasksPackageState.DoneWithErrors;
-        return TasksPackageState.Done;
-    }
     //---
     public SapforPackage_json() {
     }
diff --git a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
index eaca9e41..7da729d3 100644
--- a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
+++ b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
@@ -4,23 +4,18 @@ import Common.Current;
 import Common.Database.DBObject;
 import Common.Global;
 import Common.UI.VisualCache.ConfigurationCache;
-import Common.UI.VisualCache.SapforConfigurationCache;
 import Common.UI.VisualCache.VisualCaches;
 import Common.Utils.TextLog;
 import Common.Utils.Utils;
 import GlobalData.Account.Account;
+import GlobalData.Tasks.TaskState;
 import TestingSystem.Common.TasksPackageState;
 import TestingSystem.Common.Test.Test;
 import TestingSystem.Common.TestingPackage.TestingPackage;
-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.SapforConfiguration.SapforConfiguration;
-import TestingSystem.SAPFOR.SapforSettings.SapforSettings;
 import TestingSystem.SAPFOR.SapforTask.SapforTask;
 import TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
-import Visual_DVM_2021.Passes.PassCode_2021;
 
 import java.io.File;
 import java.util.LinkedHashMap;
@@ -66,7 +61,7 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
     //Запрещено выполнять на нитях, так как прямой доступ к бд.
     public SapforPackage(Account account, ServerSapfor serverSapfor, Vector<SapforConfiguration> configurations,
                          int neeedsEmail_in,
-                         TextLog Log) throws Exception{
+                         TextLog Log) throws Exception {
         id = Constants.Nan;
         sender_name = account.name;
         sender_address = account.email;
@@ -82,9 +77,9 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
         //--
         boolean valid = true;
         //проверка исходных данных тестов и групп
-        LinkedHashMap<String, Test> testsByDescriptions =new LinkedHashMap<>();
+        LinkedHashMap<String, Test> testsByDescriptions = new LinkedHashMap<>();
         //--
-        kernels=1;
+        kernels = 1;
         for (SapforConfiguration configuration : configurations) {
             kernels = Math.max(configuration.kernels, kernels);
             configuration.validate(Log);
@@ -95,18 +90,33 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
                 String l_description = test.description.toLowerCase();
                 if (testsByDescriptions.containsKey(l_description)) {
                     Log.Writeln_("В пакет не могут входить тесты с одинаковыми именами (без учета регистра):" + test.description.toLowerCase());
-                    valid=false;
+                    valid = false;
                 } else {
                     testsByDescriptions.put(l_description, test);
                 }
             }
         }
-        valid= Log.isEmpty();
+        valid = Log.isEmpty();
         //формирование задач.
-        if (valid){
-            package_json= new SapforPackage_json(serverSapfor, testsByDescriptions, configurations, kernels);
+        if (valid) {
+            package_json = new SapforPackage_json(serverSapfor, testsByDescriptions, configurations, kernels);
             tasksCount = package_json.tasks.size();
             saveConfigurationsAsJson(configurations);
         }
     }
+    @Override
+    public void checkFinishState() throws Exception {
+        readJson();
+        int good=0;
+        int bad = 0;
+        for (SapforTask task : package_json.tasks) {
+            if (!task.state.equals(TaskState.Done))
+                bad++;
+            else good++;
+        }
+        state = (bad > 0) ? TasksPackageState.DoneWithErrors : TasksPackageState.Done;
+        double percent = ( ((double)(good))/tasksCount)*100.0;
+        description = "Выполнено на "+((int)percent)+"%\n"+
+                "Всего задач: "+tasksCount+", из них с ошибками "+bad;
+    }
 }
diff --git a/src/TestingSystem/SAPFOR/SapforTestingPlanner.java b/src/TestingSystem/SAPFOR/SapforTestingPlanner.java
index eaeaf238..32bac26f 100644
--- a/src/TestingSystem/SAPFOR/SapforTestingPlanner.java
+++ b/src/TestingSystem/SAPFOR/SapforTestingPlanner.java
@@ -46,6 +46,10 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
         repo_err = new File(repoSapforHome, Constants.err_file);
     }
     @Override
+    public String packageDescription() {
+        return "SAPFOR";
+    }
+    @Override
     protected ServerCode getActivePackagesCode() {
         return ServerCode.GetFirstActiveSapforPackages;
     }
@@ -146,8 +150,8 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
     protected void AnalyseResults() throws Exception {
         //не требуется.
         testingPackage.progress = 100;
-        testingPackage.readJson();
-        UpdatePackageState(testingPackage.package_json.getState());
+        testingPackage.checkFinishState();
+        UpdatePackageState();
     }
     @Override
     protected void Kill() throws Exception {
@@ -181,9 +185,6 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
     void UpdateSapforState(ServerSapforState state_in) throws Exception {
         sapfor.state = state_in;
         ServerCommand(ServerCode.EditObject, sapfor);
-        if (!sapfor.state.isActive()){
-
-        }
     }
     void SyncronizeRepository() throws Exception {
         UpdateSapforState(ServerSapforState.DVMRepositorySynchronization);
diff --git a/src/Visual_DVM_2021/Passes/All/CloneSapforSettings.java b/src/Visual_DVM_2021/Passes/All/CloneSapforSettings.java
index c68b63bd..a0aec053 100644
--- a/src/Visual_DVM_2021/Passes/All/CloneSapforSettings.java
+++ b/src/Visual_DVM_2021/Passes/All/CloneSapforSettings.java
@@ -10,7 +10,7 @@ import TestingSystem.SAPFOR.SapforSettings.SapforSettings;
 import TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Server.CloneServerObject;
-
+//автоматической
 import java.util.Vector;
 public class CloneSapforSettings extends CloneServerObject<TestingServer, SapforSettings> {
     public CloneSapforSettings() {