From 7eecdf8f4d12aa68d07910c6e28324d11a60c7b4 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 10 Feb 2025 16:14:48 +0300
Subject: [PATCH] =?UTF-8?q?=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D0=B2=D0=BE?=
 =?UTF-8?q?=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=B4=D0=B0=D0=B2=D0=B0=D1=82=D1=8C=20=D1=82=D0=B8=D0=BF?=
 =?UTF-8?q?=20=D0=BC=D0=B0=D1=88=D0=B8=D0=BD=D1=8B=20=D0=BA=D0=B0=D0=BA=20?=
 =?UTF-8?q?=D0=BA=D0=BB=D0=B0=D1=81=D1=82=D0=B5=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                             |  7 ++++---
 properties                                      |  2 +-
 .../GlobalData/Machine/UI/MachineFields.java    |  4 ++--
 src/_VisualDVM/Passes/All/TestPass.java         | 17 +++++++++++++----
 .../Repository/Component/Visualiser.java        |  2 +-
 .../Repository/Server/ServerCode.java           |  4 ++--
 .../TestingSystem/Common/TestingServer.java     | 16 ++++++++++++++++
 .../Visual/Menus/MainMenuBar/MainMenuBar.java   |  4 ++--
 8 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 447f156d..24be9746 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,9 +9,10 @@
     <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$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/PackageCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/PackageCache.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/TestPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/TestPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" afterDir="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/Visual/Menus/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index e14be6ef..817943f7 100644
--- a/properties
+++ b/properties
@@ -1,6 +1,6 @@
 {
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\BUG",
+  "ProjectsSearchDirectory": "E:\\Tests\\Downloads",
   "VisualiserPath": "C:\\Users\\misha\\Downloads",
   "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
   "Visualizer_2Path": "C:\\Users\\misha\\Documents",
diff --git a/src/_VisualDVM/GlobalData/Machine/UI/MachineFields.java b/src/_VisualDVM/GlobalData/Machine/UI/MachineFields.java
index 0eb5c2a1..205bb014 100644
--- a/src/_VisualDVM/GlobalData/Machine/UI/MachineFields.java
+++ b/src/_VisualDVM/GlobalData/Machine/UI/MachineFields.java
@@ -33,8 +33,8 @@ public class MachineFields implements DialogFields {
         //-
         cbMachineType = new JComboBox<>();
         cbMachineType.addItem(MachineType.Server);
-        cbMachineType.addItem(MachineType.MVS_cluster);
-        cbMachineType.addItem(MachineType.Local);
+      //  cbMachineType.addItem(MachineType.MVS_cluster);
+      // cbMachineType.addItem(MachineType.Local);
     }
     @Override
     public Component getContent() {
diff --git a/src/_VisualDVM/Passes/All/TestPass.java b/src/_VisualDVM/Passes/All/TestPass.java
index 5cf95374..558a4fe9 100644
--- a/src/_VisualDVM/Passes/All/TestPass.java
+++ b/src/_VisualDVM/Passes/All/TestPass.java
@@ -1,8 +1,11 @@
 package _VisualDVM.Passes.All;
 import Common.Passes.Pass;
+import Common.Visual.UI;
 import _VisualDVM.Global;
-import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
-public class TestPass extends Pass {
+import _VisualDVM.Passes.Server.TestingServerPass;
+import _VisualDVM.Repository.Server.ServerCode;
+import _VisualDVM.TestingSystem.Common.Test.Test;
+public class TestPass extends TestingServerPass {
     /*
     LinkedHashMap<Integer,SapforConfiguration> unpackConfigurationsOld(SapforPackage sapforPackage){
        LinkedHashMap<Integer,SapforConfiguration> res = new LinkedHashMap<>();
@@ -27,7 +30,13 @@ public class TestPass extends Pass {
      */
     @Override
     protected void body() throws Exception {
-        for (SapforPackage sapforPackage : Global.testingServer.db.sapforPackages.Data.values()) {
-        }
+        if (!SendRequest(ServerCode.TestCode));
+        /*
+       for (Test test: Global.testingServer.db.tests.Data.values()){
+           if (!SendRequest(ServerCode.DownloadTest, String.valueOf(test.id))){
+               UI.Info(String.valueOf(test.id));
+           };
+       }
+         */
     }
 }
diff --git a/src/_VisualDVM/Repository/Component/Visualiser.java b/src/_VisualDVM/Repository/Component/Visualiser.java
index 3dee2523..f46dd747 100644
--- a/src/_VisualDVM/Repository/Component/Visualiser.java
+++ b/src/_VisualDVM/Repository/Component/Visualiser.java
@@ -62,7 +62,7 @@ public class Visualiser extends Component {
     //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
     @Override
     public void GetVersionInfo() {
-        version = 1149;
+        version = 1150;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());
diff --git a/src/_VisualDVM/Repository/Server/ServerCode.java b/src/_VisualDVM/Repository/Server/ServerCode.java
index b3f720f9..41c081fa 100644
--- a/src/_VisualDVM/Repository/Server/ServerCode.java
+++ b/src/_VisualDVM/Repository/Server/ServerCode.java
@@ -90,8 +90,8 @@ public enum ServerCode {
     StartNecessaryMachines,
     GetSapforForCompilation,
     GetMaxSapforVersion,
-    PerformAutoSapforTesting;
-
+    PerformAutoSapforTesting,
+    TestCode;
     public String getDescription(){
         switch (this){
             case GetComponentsVersionsInfo:
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingServer.java b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
index 8968fec1..cecc49ba 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingServer.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
@@ -374,6 +374,9 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 Print("Получить максимальную установленную версию Sapfor");
                 GetSapforMaxVersion();
                 break;
+            case TestCode:
+                checkUnpackedTests();
+                break;
             default:
                 throw new RepositoryRefuseException("Неподдерживаемый код: " + code);
         }
@@ -742,5 +745,18 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         //--
         return target;
     }
+    public void checkUnpackedTests() throws Exception{
+        for (Test test: db.tests.Data.values()){
+            File testHome = test.getServerPath();
+            if (!testHome.exists()){
+                throw new RepositoryRefuseException(test.id+" не существует папка");
+            }
+            File testArchive = test.getArchive();
+            if (!testArchive.exists()){
+                throw new RepositoryRefuseException(test.id+" не существует архив");
+            }
+        }
+        response = new ServerExchangeUnit_2021(ServerCode.OK);
+    }
 }
 
diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
index a5f075af..6286f224 100644
--- a/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
@@ -61,7 +61,7 @@ public class MainMenuBar extends VisualiserMenuBar {
         //-
         setPreferredSize(new Dimension(0, 30));
         //---
-        /*
+/*
         add(new MenuBarButton() {
             {
                 setIcon("/Common/icons/Apply.png");
@@ -71,7 +71,7 @@ public class MainMenuBar extends VisualiserMenuBar {
                 });
             }
         });
-         */
+ */
         add(new JSeparator());
         add(MachineButton = new MenuBarButton() {
             {