From 8410203495c59d2580099ac05eac97630a5a18e6 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 24 Nov 2023 12:28:12 +0300
Subject: [PATCH] fix

---
 .idea/workspace.xml                           |  4 ----
 src/TestingSystem/Common/Test/Test.java       |  7 +++----
 .../Passes/All/CreateTestFromFolder.java      | 21 +++++++++++++++----
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 32d4eb14..30d6fa47 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,11 +8,7 @@
   <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/Repository/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Test/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/Test.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PerformSapforTask.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromFolder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromFolder.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" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/TestingSystem/Common/Test/Test.java b/src/TestingSystem/Common/Test/Test.java
index 34bee210..9700b27c 100644
--- a/src/TestingSystem/Common/Test/Test.java
+++ b/src/TestingSystem/Common/Test/Test.java
@@ -82,14 +82,13 @@ public class Test extends riDBObject {
         File tempProject = getTempProject();
         File tempArchive = getTempArchive();
         //- создать бд.
+        FileUtils.forceMkdir(tempProject);
+        FileUtils.copyDirectory(dir, tempProject);
+        //---
         db_project_info project = new db_project_info(tempProject);
         project.Open();
         project.Close();
-        //-
         project.clearData();
-        //-
-        FileUtils.forceMkdir(tempProject);
-        FileUtils.copyDirectory(dir, tempProject);
         //--
         ZipFolderPass zip = new ZipFolderPass();
         if (zip.Do(tempProject.getAbsolutePath(), tempArchive.getAbsolutePath())) {
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestFromFolder.java b/src/Visual_DVM_2021/Passes/All/CreateTestFromFolder.java
index ac891603..0bab9f34 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestFromFolder.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestFromFolder.java
@@ -135,13 +135,26 @@ public class CreateTestFromFolder extends Pass_2021<Test> {
         //--
         db_project_info project = target.packCode(dir); //создание копии папки, и архивация.
         //-- получить размерность консольным сапфором. папка уже отправлена и чистить ее не нужно!!
-        if (Sapfor.parse(Current.getSapfor().getFile(), project.Home, Current.getSapfor().getConsoleFlags())){
-            Sapfor.analysis(Current.getSapfor().getFile(),project.Home,
+        ShowMessage2("Синтаксический анализ");
+        if (Sapfor.parse(Current.getSapfor().getFile(), project.Home, Current.getSapfor().getConsoleFlags())
+
+        ){
+            ShowMessage2("Определение размерности");
+            if (Sapfor.analysis(Current.getSapfor().getFile(),project.Home,
                     PassCode_2021.SPF_GetMaxMinBlockDistribution,
-                    Current.getSapfor().getConsoleFlags());
+                    Current.getSapfor().getConsoleFlags())){
+
+
+
+            } else Log.Writeln_("Не удалось определить размерность.проекта "+Utils.Brackets(dir.getName()));
+        }else {
+            Log.Writeln_("Не удалось выполнить синтаксический анализ проекта "+Utils.Brackets(dir.getName()));
         }
         //todo получить значение из файла вывода анализа.
-
+    }
+    @Override
+    protected boolean validate() {
+        return Log.isEmpty();
     }
     @Override
     protected void performDone() throws Exception {