From b6bd529fb1ddec82fd1ed7041592b11a75c12c7f Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 30 Sep 2023 22:30:41 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B7=D0=B0=D0=BF=D0=B8=D1=81=D1=8C=20=D1=80?=
 =?UTF-8?q?=D0=B5=D0=B7=D1=83=D0=BB=D1=8C=D1=82=D0=B0=D1=82=D0=BE=D0=B2=20?=
 =?UTF-8?q?=D0=B2=20=D0=BE=D0=B4=D0=B8=D0=BD=20=D1=84=D0=B0=D0=B9=D0=BB=20?=
 =?UTF-8?q?json?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                             |  9 ++++-----
 ...son.java => SapforScenarioResults_json.java} |  2 +-
 .../Json/SapforTask_json.java                   |  3 ---
 .../SapforTestingPlanner.java                   | 17 ++++++++++++++---
 .../ThreadsPlanner/ThreadsPlanner.java          |  6 ++++--
 .../Passes/All/AnalyseSapforPackageResults.java |  4 ++--
 6 files changed, 25 insertions(+), 16 deletions(-)
 rename src/SapforTestingSystem/Json/{ScenarioResults_json.java => SapforScenarioResults_json.java} (85%)
 delete mode 100644 src/SapforTestingSystem/Json/SapforTask_json.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0c4cd883..fc9fa561 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,13 +7,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.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/SapforTestingSystem/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTest/SapforTest.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTask_json.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/ScenarioResults_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforScenarioResults_json.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/PerformSapforTasksPackage.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/SapforTestingSystem/ThreadsPlanner/ThreadsPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/ThreadsPlanner/ThreadsPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AnalyseSapforPackageResults.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AnalyseSapforPackageResults.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/SapforTestingSystem/Json/ScenarioResults_json.java b/src/SapforTestingSystem/Json/SapforScenarioResults_json.java
similarity index 85%
rename from src/SapforTestingSystem/Json/ScenarioResults_json.java
rename to src/SapforTestingSystem/Json/SapforScenarioResults_json.java
index ba9e726b..6bba4567 100644
--- a/src/SapforTestingSystem/Json/ScenarioResults_json.java
+++ b/src/SapforTestingSystem/Json/SapforScenarioResults_json.java
@@ -4,7 +4,7 @@ import com.google.gson.annotations.Expose;
 
 import java.util.List;
 import java.util.Vector;
-public class ScenarioResults_json {
+public class SapforScenarioResults_json {
     @Expose
     public List<SapforTask> tasks = new Vector<>();
 }
diff --git a/src/SapforTestingSystem/Json/SapforTask_json.java b/src/SapforTestingSystem/Json/SapforTask_json.java
deleted file mode 100644
index 2c5c64e8..00000000
--- a/src/SapforTestingSystem/Json/SapforTask_json.java
+++ /dev/null
@@ -1,3 +0,0 @@
-package SapforTestingSystem.Json;
-public class SapforTask_json {
-}
diff --git a/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java b/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java
index fe78b6e0..9310aae3 100644
--- a/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java
+++ b/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java
@@ -3,25 +3,26 @@ import Common.Global;
 import Common.Utils.Utils;
 import SapforTestingSystem.Json.SapforPackage_json;
 import SapforTestingSystem.Json.SapforScenario_json;
+import SapforTestingSystem.Json.SapforScenarioResults_json;
 import SapforTestingSystem.PerformSapforTask;
 import SapforTestingSystem.SapforTask.SapforTask;
 import SapforTestingSystem.ThreadsPlanner.ThreadsPlanner;
 
 import java.io.File;
-import java.util.Vector;
 public class SapforTestingPlanner extends ThreadsPlanner {
     SapforScenario_json scenario_json = null;
-    Vector<SapforTask> tasks = new Vector<>();
+    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);
+
         //формирование списка задач.
         File sapfor_drv = new File(Global.Home, scenario_json.sapfor_drv);
         for (SapforPackage_json sapforPackage_json : scenario_json.packages) {
             for (String testName : scenario_json.tests) {
                 //--- чтобы было можно на нее сослаться после выполнения всех нитей.
                 SapforTask task = new SapforTask();
-                tasks.add(task);
+                results_json.tasks.add(task);
                 //---
                 addThread(() -> new PerformSapforTask().Do(
                         sapfor_drv,
@@ -46,6 +47,16 @@ public class SapforTestingPlanner extends ThreadsPlanner {
     }
     @Override
     protected void finalize() {
+        System.out.println("Запись результатов");
+        //записать результаты всех задач.
+        try {
+            Utils.jsonToFile(results_json, new File(Global.Home, "results.txt"));
+            System.out.println("Нажмите любую клавишу для выхода...");
+            System.in.read();
+        } catch (Exception e) {
+            Global.Log.PrintException(e);
+        }
+
         System.exit(0);
     }
 }
diff --git a/src/SapforTestingSystem/ThreadsPlanner/ThreadsPlanner.java b/src/SapforTestingSystem/ThreadsPlanner/ThreadsPlanner.java
index e5623361..035cf352 100644
--- a/src/SapforTestingSystem/ThreadsPlanner/ThreadsPlanner.java
+++ b/src/SapforTestingSystem/ThreadsPlanner/ThreadsPlanner.java
@@ -44,8 +44,10 @@ public abstract class ThreadsPlanner {
         } catch (Exception exception) {
             Global.Log.PrintException(exception);
         }
-        Global.Log.Print("Planner finished");
-        finalize();
+        finally {
+            Global.Log.Print("Planner finished");
+            finalize();
+        }
     }
     public void Interrupt() throws Exception {
     }
diff --git a/src/Visual_DVM_2021/Passes/All/AnalyseSapforPackageResults.java b/src/Visual_DVM_2021/Passes/All/AnalyseSapforPackageResults.java
index c7be6b23..f78e842e 100644
--- a/src/Visual_DVM_2021/Passes/All/AnalyseSapforPackageResults.java
+++ b/src/Visual_DVM_2021/Passes/All/AnalyseSapforPackageResults.java
@@ -1,11 +1,11 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Global;
-import SapforTestingSystem.Json.ScenarioResults_json;
+import SapforTestingSystem.Json.SapforScenarioResults_json;
 import SapforTestingSystem.SapforTask.SapforTask;
 import Visual_DVM_2021.Passes.Pass_2021;
 
 import java.io.File;
-public class AnalyseSapforPackageResults extends Pass_2021<ScenarioResults_json> {
+public class AnalyseSapforPackageResults extends Pass_2021<SapforScenarioResults_json> {
     File packageWorkspace;
     File scenarioFile;
     //--