From da3f624cf27e9286dac09a0e4191885b1dc351d3 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 5 Mar 2024 19:52:49 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD=D1=83.=20=D0=95=D1=81?=
 =?UTF-8?q?=D0=BB=D0=B8=20=D1=84=D0=B0=D0=B9=D0=BB=D1=8B=20=D0=B2=D1=8B?=
 =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD=D1=8B,=20=D0=BD=D0=BE=20=D0=BD?=
 =?UTF-8?q?=D0=B5=20=D1=81=D0=BE=D0=B2=D0=BF=D0=B0=D0=B4=D0=B0=D1=8E=D1=82?=
 =?UTF-8?q?=20=D0=BF=D0=BE=20=D0=B8=D0=BC=D0=B5=D0=BD=D0=B0=D0=BC=20=D1=81?=
 =?UTF-8?q?=20=D1=83=D0=B6=D0=B5=20=D0=B8=D0=BC=D0=B5=D1=8E=D1=89=D0=B8?=
 =?UTF-8?q?=D0=BC=D0=B8=D1=81=D1=8F=20=D0=B2=20=D0=B3=D1=80=D1=83=D0=BF?=
 =?UTF-8?q?=D0=BF=D0=B5=20=D1=82=D0=B5=D1=81=D1=82=D0=B0=D0=BC=D0=B8,=20?=
 =?UTF-8?q?=D0=B1=D1=83=D0=B4=D1=83=D1=82=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BA=D0=B0=D0=BA=20=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B2=D1=8B=D0=B5=20=D1=82=D0=B5=D1=81=D1=82=D1=8B.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  2 +-
 .../Passes/All/ReplaceTestsFromFiles.java     | 43 ++++++++++++++-----
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 60c2a17e..55a7d1b0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,7 +7,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java b/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java
index 6edf07eb..5a6309d9 100644
--- a/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java
+++ b/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java
@@ -22,6 +22,7 @@ public class ReplaceTestsFromFiles extends TestingSystemPass<Vector<Test>> {
     Group group;
     LinkedHashMap<Integer, Test> oldTests;
     Vector<Test> replaceTests;
+    Vector<Test> newTests;
     //--
     @Override
     public String getIconPath() {
@@ -65,44 +66,64 @@ public class ReplaceTestsFromFiles extends TestingSystemPass<Vector<Test>> {
         //--
         oldTests = new LinkedHashMap<>();
         Vector<String> testForReplaceNames = new Vector<>();
+        Vector<String> newTestsNames = new Vector<>();
         //--
-        for (String name: filesByNames.keySet()){
+        for (String name : filesByNames.keySet()) {
             boolean exists = false;
-            for (Test test: server.db.tests.Data.values()){
-                if ((test.group_id==group.id)&&test.description.equals(name)){
-                    exists=true;
+            for (Test test : server.db.tests.Data.values()) {
+                if ((test.group_id == group.id) && test.description.equals(name)) {
+                    exists = true;
                     //--
                     oldTests.put(test.id, test);
                     testForReplaceNames.add(name);
                     break;
                 }
             }
+            if (!exists)
+                newTestsNames.add(name);
         }
         //--
-        if (oldTests.size()==0){
+        if (oldTests.size() == 0) {
             Log.Writeln_("Не найдено тестов на замену.");
             return false;
         }
         //--
-        if (UI.Question("Тесты\n"+String.join("\n", testForReplaceNames)+"\nбудут заменены. Продолжить")){
+        if (UI.Question(
+                testForReplaceNames.size() + " тестов будет заменено,\n" +
+                        newTestsNames.size() + " тестов будет добавлено.\n" +
+                        "Продолжить"
+        )) {
             replaceTests = new Vector<>();
             Pass_2021 createTestPass = passes.get(PassCode_2021.CreateTestFromFile);
-            for (Test old_test: oldTests.values()){
-                File file= filesByNames.get(old_test.description);
-                if (createTestPass.Do(file, group)){
+            for (Test old_test : oldTests.values()) {
+                File file = filesByNames.get(old_test.description);
+                if (createTestPass.Do(file, group)) {
                     Test new_test = (Test) createTestPass.target;
                     replaceTests.add(new_test);
                     new_test.id = old_test.id;
                 }
             }
+            //--
+            newTests = new Vector<>();
+            for (String name : newTestsNames) {
+                File file = filesByNames.get(name);
+                if (createTestPass.Do(file, group)) {
+                    Test new_test = (Test) createTestPass.target;
+                    newTests.add(new_test);
+                }
+            }
             return true;
-        };
+        }
+        ;
         return false;
     }
     //-
     @Override
     protected void ServerAction() throws Exception {
-        Command(new ServerExchangeUnit_2021(ServerCode.ReplaceTestsCodes, null, replaceTests));
+        if (!replaceTests.isEmpty())
+            Command(new ServerExchangeUnit_2021(ServerCode.ReplaceTestsCodes, null, replaceTests));
+        if (!newTests.isEmpty())
+            Command(new ServerExchangeUnit_2021(ServerCode.PublishObjects, null, newTests));
     }
     @Override
     protected void performFinish() throws Exception {