From 34504f9992c2c7f61c915e8b510ba22dfe6c5371 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 2 Mar 2024 01:44:03 +0300
Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B0=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0=20=D0=B2=20=D1=82=D0=B5?=
 =?UTF-8?q?=D1=81=D1=82=D0=B5=20=D0=BD=D0=B0=20=D1=82=D0=B5=D0=BA=D1=83?=
 =?UTF-8?q?=D1=89=D0=B8=D0=B9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  8 +++-
 src/Repository/Server/ServerCode.java         |  4 +-
 .../Common/Test/TestsMenuBar.java             |  1 +
 src/TestingSystem/Common/TestingServer.java   | 16 +++++++
 .../Passes/All/CreateTestFromDirectory.java   | 17 +++++---
 .../Passes/All/ReplaceTestProject.java        | 43 +++++++++++++++++++
 src/Visual_DVM_2021/Passes/PassCode_2021.java |  5 ++-
 7 files changed, 83 insertions(+), 11 deletions(-)
 create mode 100644 src/Visual_DVM_2021/Passes/All/ReplaceTestProject.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 46816811..9b4e1304 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,9 +7,13 @@
   </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/ReplaceTestProject.java" 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/DownloadDVMPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadDVMPackages.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Test/TestsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/TestsMenuBar.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/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/src/Repository/Server/ServerCode.java b/src/Repository/Server/ServerCode.java
index 184e486f..ae49214e 100644
--- a/src/Repository/Server/ServerCode.java
+++ b/src/Repository/Server/ServerCode.java
@@ -77,5 +77,7 @@ public enum ServerCode {
     DownloadDVMPackage,
     DownloadDVMPackages,
     DownloadSapforPackage,
-    InstallServerSapfor;
+    InstallServerSapfor,
+    ReplaceTestCode
+    ;
 }
diff --git a/src/TestingSystem/Common/Test/TestsMenuBar.java b/src/TestingSystem/Common/Test/TestsMenuBar.java
index 9cf89d63..8df4e40e 100644
--- a/src/TestingSystem/Common/Test/TestsMenuBar.java
+++ b/src/TestingSystem/Common/Test/TestsMenuBar.java
@@ -8,6 +8,7 @@ public class TestsMenuBar extends DataMenuBar {
                 PassCode_2021.CreateTestFromDirectory,
                 PassCode_2021.CreateTestsFromFiles, ///----------------------------
                 PassCode_2021.EditTest,
+                PassCode_2021.ReplaceTestProject,
                 PassCode_2021.DownloadTest,
                 PassCode_2021.DeleteTest);
     }
diff --git a/src/TestingSystem/Common/TestingServer.java b/src/TestingSystem/Common/TestingServer.java
index 45cf2fed..288fb4af 100644
--- a/src/TestingSystem/Common/TestingServer.java
+++ b/src/TestingSystem/Common/TestingServer.java
@@ -244,6 +244,10 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 Print("Установить текущую версию SAPFOR для тестирования");
                 InstallServerSapfor();
                 break;
+            case ReplaceTestCode:
+                Print("Заменить код теста");
+                ReplaceTestCode();
+                break;
             default:
                 throw new RepositoryRefuseException("Неподдерживаемый код: " + code);
         }
@@ -544,4 +548,16 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
             }
         }else throw new RepositoryRefuseException("Не удалось собрать SAPFOR");
     }
+    private void ReplaceTestCode() throws Exception {
+        Test test = (Test) request.object;
+        response = new ServerExchangeUnit_2021(ServerCode.OK);
+        //---
+        if (!test.unpackProjectOnServer()) {
+            db.Delete(test);
+            throw new RepositoryRefuseException(
+                    "Не удалось прикрепить проект к тесту с id " + test.id
+                            + "\nТест будет удален"
+            );
+        }else db.Update(test); //обновить список файлов и размерность.
+    }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java b/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java
index 83621360..413b5a8c 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java
@@ -34,6 +34,14 @@ public class CreateTestFromDirectory extends Pass_2021<Test> {
     File dir = null;
     boolean from_directory_chooser = false;
     Vector<ProjectFile> project_files = new Vector<>();
+    protected boolean initTarget() throws Exception{
+        target = new Test();
+        target.sender_address = Current.getAccount().email;
+        target.sender_name = Current.getAccount().name;
+        target.group_id = group.id;
+        target.description = dir.getName();
+        return true;
+    }
     @Override
     protected boolean canStart(Object... args) throws Exception {
         if (args.length == 0) {
@@ -126,12 +134,9 @@ public class CreateTestFromDirectory extends Pass_2021<Test> {
                     group.language.PrintExtensions()
             );
         }
-        //-----
-        target = new Test();
-        target.sender_address = Current.getAccount().email;
-        target.sender_name = Current.getAccount().name;
-        target.group_id = group.id;
-        target.description = dir.getName();
+        //----
+        if (!initTarget()) return false;
+        //----
         Vector<String> filesNames = new Vector<>();
         for (ProjectFile projectFile : project_files)
             filesNames.add(projectFile.file.getName());
diff --git a/src/Visual_DVM_2021/Passes/All/ReplaceTestProject.java b/src/Visual_DVM_2021/Passes/All/ReplaceTestProject.java
new file mode 100644
index 00000000..3e032fd5
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/ReplaceTestProject.java
@@ -0,0 +1,43 @@
+package Visual_DVM_2021.Passes.All;
+import Common.Current;
+import Repository.Server.ServerCode;
+import Repository.Server.ServerExchangeUnit_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Server.TestingSystemPass;
+
+import java.io.Serializable;
+public class ReplaceTestProject extends CreateTestFromProject {
+    @Override
+    public String getIconPath() {
+        return "/icons/Menu/Undo.png";
+    }
+    @Override
+    protected void performDone() throws Exception {
+        TestingSystemPass testingSystemPass = new TestingSystemPass() {
+            @Override
+            protected boolean canStart(Object... args) throws Exception {
+                target = args[0];
+                return true;
+            }
+            @Override
+            public String getDescription() {
+                return "Замена кода теста на сервере";
+            }
+            @Override
+            protected void ServerAction() throws Exception {
+                Command(new ServerExchangeUnit_2021(ServerCode.ReplaceTestCode, null, (Serializable) target));
+            }
+        };
+        testingSystemPass.Do(target);
+        passes.get(PassCode_2021.SynchronizeTests).Do();
+    }
+    @Override
+    protected boolean initTarget() throws Exception {
+        if (Current.Check(Log, Current.Test)) {
+            target = Current.getTest();
+
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index 03413efe..c5b4aea4 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -317,13 +317,14 @@ public enum PassCode_2021 {
     CloneDVMPackage,
     CloneSapforPackage,
     SPF_RemoveDeadCode,
-
-
+    ReplaceTestProject
     ;
     public String getDescription() {
         switch (this) {
             case Undefined:
                 return "?";
+            case ReplaceTestProject:
+                return "Заменить тестовый проект на текущий";
             case SPF_RemoveDeadCode:
                 return "Удаление мертвого кода";
             case CloneSapforPackage: