From 12898b07bb4944aeca9e4119a82bb08ff44f4d18 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 29 Sep 2023 00:45:45 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BD=D1=8B=D0=B9=20json=20=D0=B4=D0=BB=D1=8F=20=D1=81?=
 =?UTF-8?q?=D1=86=D0=B5=D0=BD=D0=B0=D1=80=D0=B8=D1=8F=20=D1=82=D0=B5=D1=81?=
 =?UTF-8?q?=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  7 +++-
 properties                                    |  2 +-
 .../PackageModeSupervisor.java                |  6 ++--
 ...ario_json.java => SapforPackage_json.java} | 11 +++---
 .../Json/SapforScenario_json.java             | 11 ++++++
 .../SapforConfigurationInterface.java         |  9 -----
 .../Passes/All/PerformSapforTasksPackage.java |  8 +++--
 .../Passes/All/PerformScenario.java           |  8 +++--
 .../Passes/All/StartSapforTests.java          | 35 ++++++++++---------
 9 files changed, 55 insertions(+), 42 deletions(-)
 rename src/SapforTestingSystem/Json/{Scenario_json.java => SapforPackage_json.java} (56%)
 create mode 100644 src/SapforTestingSystem/Json/SapforScenario_json.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8b3e658f..d484f556 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,8 +7,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforPackage_json.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/SapforTasksPackage/SapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/ModesSupervisors/PackageModeSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/ModesSupervisors/PackageModeSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/Scenario_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforScenario_json.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationInterface.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PerformSapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PerformSapforTasksPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PerformScenario.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PerformScenario.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" />
diff --git a/properties b/properties
index 749da7ab..a57552a0 100644
--- a/properties
+++ b/properties
@@ -18,7 +18,7 @@
   "BugReportsDBName": "bug_reports.sqlite",
   "TestsDBName": "tests.sqlite",
   "ComponentsWindowWidth": 866,
-  "ComponentsWindowHeight": 297,
+  "ComponentsWindowHeight": 300,
   "VisualiserPath": "C:\\Users\\misha\\Downloads",
   "Sapfor_FPath": "E:\\",
   "Visualizer_2Path": "C:\\Users\\misha\\Documents",
diff --git a/src/Common/ModesSupervisors/PackageModeSupervisor.java b/src/Common/ModesSupervisors/PackageModeSupervisor.java
index 5622064c..28a5fb28 100644
--- a/src/Common/ModesSupervisors/PackageModeSupervisor.java
+++ b/src/Common/ModesSupervisors/PackageModeSupervisor.java
@@ -2,7 +2,7 @@ package Common.ModesSupervisors;
 import Common.Global;
 import Common.Utils.InterruptThread;
 import Common.Utils.Utils;
-import SapforTestingSystem.Json.Scenario_json;
+import SapforTestingSystem.Json.SapforScenario_json;
 import SapforTestingSystem.SapforTest.SapforTest;
 import org.apache.commons.io.FileUtils;
 
@@ -21,7 +21,7 @@ public class PackageModeSupervisor {
     //--->>
     int kernels = 4;
     //--->>
-    Scenario_json scenario;
+    SapforScenario_json scenario;
     //--->>
     File packageWorkspace;
     //--->>
@@ -38,7 +38,7 @@ public class PackageModeSupervisor {
         scenarioFile = new File(packageWorkspace, "scenario.txt");
         sapfor_drv = new File(packageWorkspace, "SAPFOR_F.exe");
         String packed = FileUtils.readFileToString(scenarioFile, Charset.defaultCharset());
-        scenario = Utils.gson.fromJson(packed, Scenario_json.class);
+        scenario = Utils.gson.fromJson(packed, SapforScenario_json.class);
         //--->>
         for (String test : scenario.tests) {
             allTests.put(test, new SapforTest(Global.Home, test));
diff --git a/src/SapforTestingSystem/Json/Scenario_json.java b/src/SapforTestingSystem/Json/SapforPackage_json.java
similarity index 56%
rename from src/SapforTestingSystem/Json/Scenario_json.java
rename to src/SapforTestingSystem/Json/SapforPackage_json.java
index f452d141..41c84e08 100644
--- a/src/SapforTestingSystem/Json/Scenario_json.java
+++ b/src/SapforTestingSystem/Json/SapforPackage_json.java
@@ -1,15 +1,14 @@
 package SapforTestingSystem.Json;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import com.google.gson.annotations.Expose;
-import javafx.util.Pair;
 
 import java.util.List;
 import java.util.Vector;
-public class Scenario_json {
+public class SapforPackage_json {
+    @Expose
+    public String id = "";
+    @Expose
+    public String flags = "";
     @Expose
     public List<PassCode_2021> codes = new Vector<>();
-    @Expose
-    public List<String> tests = new Vector<>();
-    @Expose
-    public List<Pair<String,String>> packages= new Vector<>(); //пары пакеты + флаги
 }
diff --git a/src/SapforTestingSystem/Json/SapforScenario_json.java b/src/SapforTestingSystem/Json/SapforScenario_json.java
new file mode 100644
index 00000000..fec1f689
--- /dev/null
+++ b/src/SapforTestingSystem/Json/SapforScenario_json.java
@@ -0,0 +1,11 @@
+package SapforTestingSystem.Json;
+import com.google.gson.annotations.Expose;
+
+import java.util.List;
+import java.util.Vector;
+public class SapforScenario_json {
+    @Expose
+    public List<String> tests = new Vector<>();
+    @Expose
+    public List<SapforPackage_json> packages= new Vector<>(); //пары пакеты + флаги
+}
diff --git a/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationInterface.java b/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationInterface.java
index 234a2b6e..a1f30274 100644
--- a/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationInterface.java
+++ b/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationInterface.java
@@ -29,15 +29,6 @@ public class SapforConfigurationInterface {
         }
         return res;
     }
-    public static String getTransformationsNames(SapforConfiguration object) {
-        Vector<String> res = new Vector<>();
-        for (SapforConfigurationCommand command : Global.testingServer.db.sapforConfigurationCommands.Data.values()) {
-            if (command.sapforconfiguration_id.equals(object.id)) {
-                res.add(command.passCode.getDescription());
-            }
-        }
-        return String.join(";", res);
-    }
     //todo вывести.
     public static boolean validateCommands(SapforConfiguration sapforConfiguration, TextLog log) {
         //1. получить список всех команд.
diff --git a/src/Visual_DVM_2021/Passes/All/PerformSapforTasksPackage.java b/src/Visual_DVM_2021/Passes/All/PerformSapforTasksPackage.java
index 331d6920..c017d57c 100644
--- a/src/Visual_DVM_2021/Passes/All/PerformSapforTasksPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/PerformSapforTasksPackage.java
@@ -3,7 +3,7 @@ import Common.Utils.Utils;
 import ProjectData.Project.db_project_info;
 import SapforTestingSystem.Json.SapforVersion_json;
 import SapforTestingSystem.Json.ScenarioResults_json;
-import SapforTestingSystem.Json.Scenario_json;
+import SapforTestingSystem.Json.SapforScenario_json;
 import SapforTestingSystem.SapforTask.SapforTask;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.PassException;
@@ -13,7 +13,7 @@ import org.apache.commons.io.FileUtils;
 import java.io.File;
 import java.nio.charset.Charset;
 import java.util.Vector;
-public class PerformSapforTasksPackage extends Pass_2021<Scenario_json> {
+public class PerformSapforTasksPackage extends Pass_2021<SapforScenario_json> {
     File packageWorkspace;
     File sapfor_drv;
     File scenarioFile;
@@ -42,7 +42,7 @@ public class PerformSapforTasksPackage extends Pass_2021<Scenario_json> {
         scenarioFile = new File(packageWorkspace, "scenario.txt");
         sapfor_drv = new File(packageWorkspace, "SAPFOR_F.exe");
         String packed = FileUtils.readFileToString(scenarioFile, Charset.defaultCharset());
-        target = Utils.gson.fromJson(packed, Scenario_json.class);
+        target = Utils.gson.fromJson(packed, SapforScenario_json.class);
         //---
         results = new ScenarioResults_json();
         return true;
@@ -58,6 +58,7 @@ public class PerformSapforTasksPackage extends Pass_2021<Scenario_json> {
             taskResult.sapfortaskspackage_2023_id = Integer.parseInt(packageWorkspace.getName());
             taskResult.versions.add(new SapforVersion_json(parentTask.getAbsolutePath(), "исходная"));
             //--
+            /*
             for (PassCode_2021 code : target.codes) {
                 if (parse()) {
                     if (code.equals(PassCode_2021.CreateParallelVariants))
@@ -67,6 +68,7 @@ public class PerformSapforTasksPackage extends Pass_2021<Scenario_json> {
                 } else
                     break;
             }
+             */
             //---
             results.tasks.add(taskResult);
         }
diff --git a/src/Visual_DVM_2021/Passes/All/PerformScenario.java b/src/Visual_DVM_2021/Passes/All/PerformScenario.java
index afddc961..5abd5cc1 100644
--- a/src/Visual_DVM_2021/Passes/All/PerformScenario.java
+++ b/src/Visual_DVM_2021/Passes/All/PerformScenario.java
@@ -4,7 +4,7 @@ import Common.Utils.Utils;
 import ProjectData.Project.db_project_info;
 import SapforTestingSystem.Json.SapforVersion_json;
 import SapforTestingSystem.Json.ScenarioResults_json;
-import SapforTestingSystem.Json.Scenario_json;
+import SapforTestingSystem.Json.SapforScenario_json;
 import SapforTestingSystem.SapforTask.SapforTask;
 import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
 import Visual_DVM_2021.Passes.PassCode_2021;
@@ -17,7 +17,7 @@ import java.nio.charset.Charset;
 import java.nio.file.Paths;
 import java.util.Vector;
 //создание дерева версий одного теста по заданному сценарию.
-public class PerformScenario extends Pass_2021<Scenario_json> {
+public class PerformScenario extends Pass_2021<SapforScenario_json> {
     SapforTasksPackage tasks_package;
     File scenarioFile;
     //---
@@ -49,7 +49,7 @@ public class PerformScenario extends Pass_2021<Scenario_json> {
         //---
       //  scenarioFile = new File(tasks_package.workspace, "scenario.txt");
         String packed = FileUtils.readFileToString(scenarioFile, Charset.defaultCharset());
-        target = Utils.gson.fromJson(packed, Scenario_json.class);
+        target = Utils.gson.fromJson(packed, SapforScenario_json.class);
         //---
         results = new ScenarioResults_json();
         return true;
@@ -76,6 +76,7 @@ public class PerformScenario extends Pass_2021<Scenario_json> {
             taskResult.sapfortaskspackage_2023_id = tasks_package.id;
             taskResult.versions.add(new SapforVersion_json(parentTask.getAbsolutePath(), "исходная"));
             //--
+            /*
             for (PassCode_2021 code : target.codes) {
                 ShowMessage2("Синтаксический анализ");
                 if (parse()) {
@@ -87,6 +88,7 @@ public class PerformScenario extends Pass_2021<Scenario_json> {
                 } else
                     break;
             }
+             */
             //---
             results.tasks.add(taskResult);
         }
diff --git a/src/Visual_DVM_2021/Passes/All/StartSapforTests.java b/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
index 4e545233..4339a104 100644
--- a/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
+++ b/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
@@ -8,6 +8,8 @@ import GlobalData.Settings.SettingName;
 import ProjectData.LanguageName;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
+import SapforTestingSystem.Json.SapforPackage_json;
+import SapforTestingSystem.Json.SapforScenario_json;
 import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
 import SapforTestingSystem.SapforConfiguration.SapforConfigurationInterface;
 import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
@@ -25,6 +27,7 @@ import java.io.File;
 import java.nio.file.Paths;
 import java.util.LinkedHashMap;
 import java.util.Vector;
+import java.util.stream.Collectors;
 public class StartSapforTests extends Pass_2021<SapforScenario> {
     protected int allTasksCount = 0;
     //--
@@ -225,15 +228,22 @@ public class StartSapforTests extends Pass_2021<SapforScenario> {
         File propertiesFile = new File(target.workspace, "properties");
         FileUtils.write(propertiesFile, Utils.jsonToPrettyFormat(Utils.gson.toJson(properties)));
         //----
+        File scenarioFile = new File(target.workspace, "scenario.txt");
+        SapforScenario_json scenario_json = new SapforScenario_json();
+        scenario_json.tests.addAll(allTests.keySet());
+        //scenario_json.flags = SapforConfigurationInterface.getFlags(configuration);
+        //----
         Global.db.Update(target);
         ShowMessage1("Создание рабочих пространств...");
         for (SapforConfiguration configuration : Global.testingServer.db.sapforConfigurations.getCheckedItems()) {
             SapforTasksPackage sapforTasksPackage = new SapforTasksPackage();
+            Vector<PassCode_2021> codes = SapforConfigurationInterface.getPassCodes(configuration);
+            Vector<String> passesNames = codes.stream().map(PassCode_2021::getDescription).collect(Collectors.toCollection(Vector::new));
             //--
             sapforTasksPackage.sapforscenario_id = target.id;
             sapforTasksPackage.sapforconfiguration_id = configuration.id;
             sapforTasksPackage.flags = SapforConfigurationInterface.getFlags(configuration);
-            sapforTasksPackage.passesNames = SapforConfigurationInterface.getTransformationsNames(configuration);
+            sapforTasksPackage.passesNames = String.join(";", passesNames);
             //--
             Global.db.Insert(sapforTasksPackage);
             sapforTasksPackage.workspace = Paths.get(
@@ -243,15 +253,6 @@ public class StartSapforTests extends Pass_2021<SapforScenario> {
             ).toFile().getAbsolutePath();
             //---
             Utils.CheckAndCleanDirectory(new File(sapforTasksPackage.workspace));
-
-
-            ShowMessage2("");
-            //-
-            /*
-            File scenarioFile = new File(sapforTasksPackage.workspace, "scenario.txt");
-            Scenario_json scenario_json = new Scenario_json();
-            scenario_json.tests.addAll(testsNames);
-             */
             //---
             for (Vector<String> testIds : groupsTests.values()) {
                 for (String testId : testIds) {
@@ -264,15 +265,17 @@ public class StartSapforTests extends Pass_2021<SapforScenario> {
                     Utils.copyDirectory(new File(Global.TestsDirectory, test.id), taskWorkspace);
                 }
             }
-            //---
-            //scenario_json.flags = SapforConfigurationInterface.getFlags(configuration);
-            //scenario_json.codes.addAll(codes);
-            //---
-            //FileUtils.write(scenarioFile, Utils.jsonToPrettyFormat(Utils.gson.toJson(scenario_json)));
-            //---
             Global.db.Update(sapforTasksPackage);
+            //--->>
+            SapforPackage_json package_json = new SapforPackage_json();
+            package_json.id = String.valueOf(sapforTasksPackage.id);
+            package_json.flags = sapforTasksPackage.flags;
+            package_json.codes.addAll(codes);
+            //--->>
+            scenario_json.packages.add(package_json);
         }
         //--
+        FileUtils.write(scenarioFile, Utils.jsonToPrettyFormat(Utils.gson.toJson(scenario_json)));
     }
     @Override
     protected void showFinish() throws Exception {