From c05eb12737a01510a7b27dc80a746f2ed32d4b4b Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 10 Oct 2023 16:53:29 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           | 12 +++++++++--
 .../PerformSapforTask.java                    |  5 ++---
 .../SapforTasksPackageSupervisor.java         |  2 +-
 src/TestingSystem/TestingServer.java          |  3 ++-
 .../Passes/All/InstallServerSapfor.java       |  5 +++++
 .../Passes/All/StartSapforTests.java          | 17 +++++++++++-----
 .../Passes/All/SynchronizeTestsTasks.java     |  4 ++--
 src/Visual_DVM_2021/Passes/PassCode_2021.java |  4 ----
 .../Passes/SSH/ConnectionPass.java            | 20 +++++++++----------
 src/Visual_DVM_2021/UI/Main/TestingForm.form  |  4 ++--
 src/Visual_DVM_2021/UI/Main/TestingForm.java  | 19 +++++++++---------
 11 files changed, 55 insertions(+), 40 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8499f6d8..f25ae58a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,8 +8,16 @@
   <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/Utils/InterruptThread.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/InterruptThread.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/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.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/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTestsTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTestsTasks.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/Visual_DVM_2021/Passes/SSH/ConnectionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/ConnectionPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/SapforTestingSystem/PerformSapforTask.java b/src/SapforTestingSystem/PerformSapforTask.java
index a13b33e2..08697951 100644
--- a/src/SapforTestingSystem/PerformSapforTask.java
+++ b/src/SapforTestingSystem/PerformSapforTask.java
@@ -148,9 +148,8 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
     protected void variants() throws Exception {
         //папки вариантов создается самим сапфором.
         target.state = performSapforScript("create_variants", parentTask, " -t 13 -allVars"
-                      +                    " -tinfo"
+                        + " -tinfo"
                 ,
-
                 Constants.out_file,
                 Constants.err_file
         ) ? TaskState.Done : TaskState.DoneWithErrors;
@@ -293,7 +292,7 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
         //--
         if (isTransformation) {
             File p_out = Paths.get(project.Home.getAbsolutePath(), Constants.data, Constants.parse_out_file).toFile();
-            File p_err = Paths.get(project.Home.getAbsolutePath(), Constants.data,Constants.parse_err_file).toFile();
+            File p_err = Paths.get(project.Home.getAbsolutePath(), Constants.data, Constants.parse_err_file).toFile();
             File out = Paths.get(project.Home.getAbsolutePath(), Constants.data, Constants.out_file).toFile();
             File err = Paths.get(project.Home.getAbsolutePath(), Constants.data, Constants.err_file).toFile();
             //--
diff --git a/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java b/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
index 11578bf3..1955a2b3 100644
--- a/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
+++ b/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
@@ -57,7 +57,7 @@ public class SapforTasksPackageSupervisor extends ThreadsPlanner {
 
         //записать результаты всех задач.
         try {
-            Utils.jsonToFile(results_json, new File(Global.Home, "results"));
+            Utils.jsonToFile(results_json, new File(Global.Home, "results_json"));
             //тут же и строить версии.
             Utils.deleteFilesByExtensions(new File(Global.Home),"proj","dep"); //Потом txt тоже добавить.
             FileUtils.writeStringToFile(new File(Constants.DONE), "");
diff --git a/src/TestingSystem/TestingServer.java b/src/TestingSystem/TestingServer.java
index 389b61d8..dc3cad6f 100644
--- a/src/TestingSystem/TestingServer.java
+++ b/src/TestingSystem/TestingServer.java
@@ -22,7 +22,6 @@ import SapforTestingSystem.SapforConfiguration.SapforConfigurationInterface;
 import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
 import SapforTestingSystem.SapforTasksPackage_info;
 import SapforTestingSystem.ServerSapfor.ServerSapfor;
-import SapforTestingSystem.ServerSapforTestingPlanner.ServerSapforTestingPlanner;
 import TestingSystem.Group.Group;
 import TestingSystem.Group.GroupInterface;
 import TestingSystem.Tasks.TestCompilationTask;
@@ -223,8 +222,10 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
     }
     protected TestingPlanner testingPlanner = new TestingPlanner();
     protected Thread testingThread = new Thread(() -> testingPlanner.Perform());
+    /*
     protected ServerSapforTestingPlanner sapforTestingPlanner = new ServerSapforTestingPlanner();
     protected Thread sapforTestingThread = new Thread(() -> sapforTestingPlanner.Perform());
+     */
     //------>>>
     public static boolean checkTasks = false;
     //--
diff --git a/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java b/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java
index 9d69bb61..44b41c4b 100644
--- a/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java
+++ b/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java
@@ -42,10 +42,15 @@ public class InstallServerSapfor extends ConnectionPass<Object> {
         return false;
     }
     @Override
+    protected boolean needsAnimation() {
+        return true;
+    }
+    @Override
     protected void ServerAction() throws Exception {
         RemoteFile testingSystemHome = new RemoteFile(sftpChannel.pwd(), "testing_system", true);
         RemoteFile repo = new RemoteFile(testingSystemHome.full_name, "Repo", true);
         RemoteFile repoSapforHome = new RemoteFile(repo.full_name + "/sapfor/experts/Sapfor_2017/_bin", true);
+        ShowMessage2("Вывод в консоли визуализатора");
         //-->>
         ShowMessage1("Синхронизация ветви DVM...");
         ShellCommand("cd " + Utils.DQuotes(repo.full_name), "svn checkout " + Constants.REPOSITORY_AUTHENTICATION + " " + Constants.DVM_REPOSITORY + "\n");
diff --git a/src/Visual_DVM_2021/Passes/All/StartSapforTests.java b/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
index aa23f395..e683e479 100644
--- a/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
+++ b/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
@@ -5,9 +5,9 @@ import Common.UI.UI;
 import ProjectData.LanguageName;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import SapforTestingSystem.SapforTasksPackage_info;
 import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
 import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
+import SapforTestingSystem.SapforTasksPackage_info;
 import TestingSystem.Group.Group;
 import TestingSystem.Test.Test;
 import Visual_DVM_2021.Passes.PassCode_2021;
@@ -181,14 +181,21 @@ public class StartSapforTests extends TestingSystemPass<SapforTasksPackage_info>
         for (Test test : allTests.values())
             target.testsIds.add(test.id);
         //--
-        ShowMessage1("Создание рабочих пространств...");
         for (SapforConfiguration configuration : Global.testingServer.db.sapforConfigurations.getCheckedItems())
             target.configurationsIds.add(configuration.id);
         Command(new ServerExchangeUnit_2021(ServerCode.StartSapforTests,  "", target));
     }
     @Override
-    protected void performFinish() throws Exception {
-        super.performFinish();
-        //passes.get(PassCode_2021.SynchronizeTests).Do();
+    protected void performDone() throws Exception {
+        passes.get(PassCode_2021.SynchronizeTestsTasks).Do();
+        /*
+        if (!TestingServer.checkTasks)
+            TestingServer.TimerOn();
+        Global.db.BeginTransaction();
+        for (TestRunTask testRunTask : server.account_db.testRunTasks.Data.values())
+            if (testRunTask.taskspackage_id.equals(target.id))
+                Global.db.Insert(new TaskKey_2022(testRunTask.id, target.id));
+        Global.db.Commit();
+         */
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/SynchronizeTestsTasks.java b/src/Visual_DVM_2021/Passes/All/SynchronizeTestsTasks.java
index acf7a09c..392c5f9a 100644
--- a/src/Visual_DVM_2021/Passes/All/SynchronizeTestsTasks.java
+++ b/src/Visual_DVM_2021/Passes/All/SynchronizeTestsTasks.java
@@ -35,7 +35,7 @@ public class SynchronizeTestsTasks extends TestingSystemPass<Vector<Integer>> {
     @Override
     protected void showPreparation() throws Exception {
         server.account_db.packages.ClearUI();
-       // server.account_db.sapforTasksPackages.ClearUI();
+        server.account_db.sapforTasksPackages.ClearUI();
     }
     @Override
     protected void ServerAction() throws Exception {
@@ -63,7 +63,7 @@ public class SynchronizeTestsTasks extends TestingSystemPass<Vector<Integer>> {
     @Override
     protected void showDone() throws Exception {
         server.account_db.packages.ShowUI();
-       // server.account_db.sapforTasksPackages.ShowUI();
+        server.account_db.sapforTasksPackages.ShowUI();
         if (!TestingServer.checkTasks) UI.getMainWindow().getTestingWindow().ShowAutoActualizeTestsState();
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index 2baf9396..dda65364 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -414,10 +414,6 @@ public enum PassCode_2021 {
                 return "Проверка удалённой рабочей папки";
             case PublishRemoteWorkspace:
                 return "Публикация удалённой рабочей папки";
-                /*
-            case GetRemoteUserHome:
-                return "Получить корневую папку серверного компонента";
-                 */
             case ApplyCurrentFunction:
                 return "Назначить текущую функцию по имени";
             case AbortSelectedPackages:
diff --git a/src/Visual_DVM_2021/Passes/SSH/ConnectionPass.java b/src/Visual_DVM_2021/Passes/SSH/ConnectionPass.java
index fbb21a42..51402048 100644
--- a/src/Visual_DVM_2021/Passes/SSH/ConnectionPass.java
+++ b/src/Visual_DVM_2021/Passes/SSH/ConnectionPass.java
@@ -17,7 +17,6 @@ import java.net.UnknownHostException;
 import java.nio.charset.StandardCharsets;
 import java.util.LinkedHashMap;
 import java.util.Vector;
-
 //убираем лишний класс-прослойку.
 //старый server pass Пока не трогаем.
 //https://stackoverflow.com/questions/15108923/sftp-file-transfer-using-java-jsch
@@ -167,7 +166,6 @@ public abstract class ConnectionPass<T> extends Pass_2021<T> {
         br.close();
         return res;
     }
-
     public void getSingleFile(String src, String dst) throws Exception {
         sftpChannel.get(src, dst);
     }
@@ -298,11 +296,11 @@ public abstract class ConnectionPass<T> extends Pass_2021<T> {
             // System.out.println(command);
             pin.write((command + "\r\n").getBytes());
             ShellParser.ReadLine(fromServer);
-          //  UI.Info("echo read");
+            //  UI.Info("echo read");
             ShellParser.ReadInvitation(fromServer);
-          //  UI.Info("first invitation read");
+            //  UI.Info("first invitation read");
             result = ShellParser.getCommandResult(fromServer);
-          //  UI.Info("result = " + Utils.Brackets(result));
+            //  UI.Info("result = " + Utils.Brackets(result));
         }
         shellChannel.disconnect();
         return result;
@@ -383,12 +381,12 @@ public abstract class ConnectionPass<T> extends Pass_2021<T> {
             ShellCommand("rm -rf " + Utils.DQuotes(dir));
         } else throw new PassException("Недопустимый путь для удаления папки " + Utils.DQuotes(dir));
     }
-   //скорее всего,временные методы. они есть в UserConnection, при удаленном запуске тестирования
-   //--------------------------------------------------------------------------------
-   public void MKDIR(RemoteFile dir) throws Exception {
-       if (!Exists(dir.parent, dir.name)) sftpChannel.mkdir(dir.full_name);
-   }
-   //--
+    //скорее всего,временные методы. они есть в UserConnection, при удаленном запуске тестирования
+    //--------------------------------------------------------------------------------
+    public void MKDIR(RemoteFile dir) throws Exception {
+        if (!Exists(dir.parent, dir.name)) sftpChannel.mkdir(dir.full_name);
+    }
+    //--
 }
 
 
diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.form b/src/Visual_DVM_2021/UI/Main/TestingForm.form
index 495b8a42..5b432c95 100644
--- a/src/Visual_DVM_2021/UI/Main/TestingForm.form
+++ b/src/Visual_DVM_2021/UI/Main/TestingForm.form
@@ -836,7 +836,7 @@
                                     </properties>
                                     <border type="none"/>
                                     <children>
-                                      <grid id="a5ba7" binding="sapforPackagesPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                      <grid id="a5ba7" layout-manager="BorderLayout" hgap="0" vgap="0">
                                         <constraints>
                                           <splitpane position="right"/>
                                         </constraints>
@@ -846,7 +846,7 @@
                                         <border type="none"/>
                                         <children/>
                                       </grid>
-                                      <grid id="eec01" binding="sapforScenariosPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                      <grid id="eec01" binding="sapforTasksPackagesPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
                                         <constraints>
                                           <splitpane position="left"/>
                                         </constraints>
diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.java b/src/Visual_DVM_2021/UI/Main/TestingForm.java
index 6b018e58..d507f30a 100644
--- a/src/Visual_DVM_2021/UI/Main/TestingForm.java
+++ b/src/Visual_DVM_2021/UI/Main/TestingForm.java
@@ -83,12 +83,12 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     private JLabel sapforConfigurationsLabel;
     private JLabel sapforConfigurationsCommandsLabel;
     private JPanel sapforConfigurationCommandsPanel;
-    private JPanel sapforPackagesPanel;
     private JLabel sapforTasksPackagesLabel;
     private JLabel sapforTasksLabel;
     private JPanel groupsBackground;
     private JPanel sapforScenariosPanel;
     private JPanel serverSapforsPanel;
+    private JPanel sapforTasksPackagesPanel;
     private JPanel testsRunTasksBackground;
     private JCheckBox filterFinished;
     private JButton bTest;
@@ -146,16 +146,14 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         Global.testingServer.db.tests.mountUI(testsPanel);
         Global.testingServer.account_db.packages.mountUI(packagesPanel);
         Global.testingServer.account_db.testRunTasks.mountUI(testsRunTasksPanel);
-        //   Global.testingServer.account_db.testRunTasks.setFilterUI(count -> tasksMatchesLabel.setText(String.valueOf(count)));
         //--
         Global.testingServer.db.sapforConfigurations.mountUI(sapforConfigurationsPanel);
         Global.testingServer.db.sapforConfigurationCommands.mountUI(sapforConfigurationCommandsPanel);
         Global.testingServer.db.serverSapfors.mountUI(serverSapforsPanel);
-      //  Global.testingServer.db.sapforTasksPackages.mountUI(sapforScenariosPanel);
-       // Global.testingServer.db.sapforTasksPackages.mountUI(sapforPackagesPanel);
-
+        //  Global.testingServer.db.sapforTasksPackages.mountUI(sapforScenariosPanel);
+        // Global.testingServer.db.sapforTasksPackages.mountUI(sapforPackagesPanel);
         //Global.db.sapforTasks.mountUI(sapforTasksPanel);
-        // Global.testingServer.account_db.sapforTasksPackages.mountUI(sapforPackagesPanel);
+        Global.testingServer.account_db.sapforTasksPackages.mountUI(sapforTasksPackagesPanel);
         // Global.testingServer.account_db.sapforTasks.mountUI(sapforTasksPanel);
         //--------------------------------------------------------------------->>>>
         /*
@@ -186,10 +184,11 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         this.RestoreLastCredentials();
         Global.testingServer.db.configurations.ShowUI();
         Global.testingServer.db.groups.ShowUI();
-        Global.testingServer.account_db.packages.ShowUI();
         Global.testingServer.db.serverSapfors.ShowUI();
         Global.testingServer.db.sapforConfigurations.ShowUI();
-      //  Global.testingServer.db.sapforTasksPackages.ShowUI();
+        //----
+        Global.testingServer.account_db.packages.ShowUI();
+        Global.testingServer.account_db.sapforTasksPackages.ShowUI();
     }
     //-
     @Override
@@ -226,7 +225,6 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     @Override
     public void ShowProject() {
         testingTabs.setEnabledAt(1, true);
-        // testingTabs.setSelectedIndex(0);
         //-
         ShowSession();
         //-
@@ -323,8 +321,11 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     public void RemountTestTable() {
         UI.Clear(packagesPanel);
         UI.Clear(testsRunTasksPanel);
+        UI.Clear(sapforTasksPackagesPanel);
+        //-->>
         Global.testingServer.account_db.packages.mountUI(packagesPanel);
         Global.testingServer.account_db.testRunTasks.mountUI(testsRunTasksPanel);
+        Global.testingServer.account_db.sapforTasksPackages.mountUI(sapforTasksPackagesPanel);
     }
     @Override
     public void setUserRights() {