From 6271d6272a3e983c8aafd0f3741299d0929737d3 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 2 Oct 2023 01:02:07 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=B1=D0=B0=D0=B3=20=D0=B2=20=D1=84=D1=83=D0=BD=D0=BA?=
 =?UTF-8?q?=D1=86=D0=B8=D0=B8=20=D0=BE=D1=82=D0=B2=D0=B5=D1=87=D0=B0=D1=8E?=
 =?UTF-8?q?=D1=89=D0=B5=D0=B9=20=D0=B7=D0=B0=20=D1=80=D0=B5=D0=BA=D1=83?=
 =?UTF-8?q?=D1=80=D1=81=D0=B8=D0=B2=D0=BD=D0=BE=D0=B5=20=D1=83=D0=B4=D0=B0?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D1=81=20=D0=BE=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D1=8B=D0=BC=D0=B8=20=D1=80=D0=B0=D1=81=D1=88?=
 =?UTF-8?q?=D0=B8=D1=80=D0=B5=D0=BD=D0=B8=D1=8F=D0=BC=D0=B8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                                    |  8 ++------
 src/Common/Utils/Utils.java                            |  8 ++++++--
 .../SapforTestingPlaner/SapforTestingPlanner.java      | 10 +++++++---
 src/Visual_DVM_2021/Passes/All/StartSapforTests.java   |  2 +-
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ab5f3dfb..69f62c81 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforScenariosBar/SapforScenariosBar.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforScenario.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/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforScenarioResults_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforScenarioResults_json.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java" beforeDir="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/All/StartSapforTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Utils/Utils.java b/src/Common/Utils/Utils.java
index 36e445c0..82ad1aff 100644
--- a/src/Common/Utils/Utils.java
+++ b/src/Common/Utils/Utils.java
@@ -669,13 +669,17 @@ public class Utils {
         if (files != null) {
             for (File file : files) {
                 if (file.isFile()) {
+                    String file_extension = getExtension(file);
                     for (String ext : extensions) {
-                        if (getExtension(file).equalsIgnoreCase(ext))
+                        if (file_extension.equalsIgnoreCase(ext)) {
                             res.add(file);
+                          //  System.out.println(file.getAbsolutePath() + ":" + Utils.Brackets(file_extension));
+                          //  System.out.println("MATCH");
+                        }
                     }
                 }
                 if (file.isDirectory())
-                    getFilesByExtensions_r(file, res);
+                    getFilesByExtensions_r(file, res, extensions);
             }
         }
     }
diff --git a/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java b/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java
index 3552b20d..9039a1de 100644
--- a/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java
+++ b/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java
@@ -15,7 +15,7 @@ public class SapforTestingPlanner extends ThreadsPlanner {
     SapforScenarioResults_json results_json = new SapforScenarioResults_json();
     public SapforTestingPlanner() throws Exception {
         super(Global.properties.threadsTimeout, Global.properties.threadsNum);
-        scenario_json = (SapforScenario_json) Utils.jsonFromFile(new File(Global.Home, "scenario.txt"), SapforScenario_json.class);
+        scenario_json = (SapforScenario_json) Utils.jsonFromFile(new File(Global.Home, "scenario"), SapforScenario_json.class);
         results_json.StartDate = new Date().getTime();
         //формирование списка задач.
         File sapfor_drv = new File(Global.Home, scenario_json.sapfor_drv);
@@ -49,10 +49,14 @@ public class SapforTestingPlanner extends ThreadsPlanner {
     @Override
     protected void finalize() {
         results_json.EndDate = new Date().getTime();
-        System.out.println("Запись результатов");
+
         //записать результаты всех задач.
         try {
-            Utils.jsonToFile(results_json, new File(Global.Home, "results.txt"));
+            System.out.println("Запись результатов");
+            Utils.jsonToFile(results_json, new File(Global.Home, "results"));
+           // System.out.println("Очистка служебных файлов"); очистку проводить извне чтобы удалялись джарники и ехе
+            //тут же и строить версии.
+            //Utils.deleteFilesByExtensions(new File(Global.Home),"proj","dep", "txt", "bat", "sh", "exe", "jar");
             System.out.println("Нажмите любую клавишу для выхода...");
             System.in.read();
         } catch (Exception e) {
diff --git a/src/Visual_DVM_2021/Passes/All/StartSapforTests.java b/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
index 7f697f9e..77520d7c 100644
--- a/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
+++ b/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
@@ -233,7 +233,7 @@ public class StartSapforTests extends Pass_2021<SapforScenario> {
         //----
         Utils.jsonToFile(properties, new File(target.workspace, "properties"));
         //----
-        File scenarioFile = new File(target.workspace, "scenario.txt");
+        File scenarioFile = new File(target.workspace, "scenario");
         SapforScenario_json scenario_json = new SapforScenario_json();
         scenario_json.sapfor_drv = sapfor.getName();
         scenario_json.tests.addAll(allTests.keySet());