no message

.idea/workspace.xml

@@ -8,9 +8,18 @@
   <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/Common/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Constants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Global.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforScenario.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTasksPackage_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTasksPackage_json.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" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforServerScenario_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage_info.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestsDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTestsOnServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTestsOnServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

src/Common/Constants.java

@@ -380,7 +380,6 @@ public class Constants {
     };
     //все запретные символы через пробел.
     public static String all_forbidden_characters_string = "";
-    public static String aborted = "ABORTED";
     public static final Machine repository_machine = new Machine("Ubuntu", "alex-freenas.ddns.net", 23, MachineType.Server);
     public static final User repository_user = new User("testuser", "mprit_2011", "");
 }

src/Common/Global.java

@@ -89,7 +89,7 @@ public class Global {
     public static File DataBackUpsDirectory;
     public static File PackagesDirectory;
     public static File SapforsDirectory;
-    public static File ScenariosDirectory;
+    public static File SapforPackagesDirectory;
     //------------------------------------------------------------------
     public static Visualiser visualiser = null;
     public static Visualizer_2 visualizer_2 = null;
@@ -146,7 +146,7 @@ public class Global {
         Utils.CheckDirectory(RepoDirectory = Paths.get(Home, Repo).toFile());
         Utils.CheckDirectory(PackagesDirectory = Paths.get(Home, Packages).toFile());
         Utils.CheckDirectory(SapforsDirectory = Paths.get(Home, "Sapfors").toFile());
-        Utils.CheckDirectory(ScenariosDirectory = Paths.get(Home, "Scenarios").toFile());
+        Utils.CheckDirectory(SapforPackagesDirectory = Paths.get(Home, "SapforPackages").toFile());
     }
     public static void CreateLog() {
         Log = new Loggable() {

src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java

@@ -1,8 +1,7 @@
 package Common.UI.Menus_2023.SapforTasksPackagesBar;
 import Common.UI.Menus_2023.DataMenuBar;
-import Visual_DVM_2021.Passes.PassCode_2021;
 public class SapforTasksPackagesBar extends DataMenuBar {
     public SapforTasksPackagesBar() {
-        super("пакеты задач", PassCode_2021.DeleteSapforTasksPackage);
+        super("пакеты задач");
     }
 }

src/SapforTestingSystem/Json/SapforTasksPackage_json.java

@@ -9,5 +9,5 @@ public class SapforTasksPackage_json {
     @Expose
     public List<String> tests = new Vector<>();
     @Expose
-    public List<SapforConfiguration_json> packages = new Vector<>();
+    public List<SapforConfiguration_json> configurations = new Vector<>();
 }

src/SapforTestingSystem/PerformSapforTask.java

@@ -282,7 +282,6 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
     }
     //--
     protected void createVersionProjectData(SapforVersion_json version, boolean isTransformation) throws Exception {
-        System.out.println("Checking version " + version);
         db_project_info project = new db_project_info();
         project.Home = new File(version.version);
         project.name = project.Home.getName();
@@ -314,12 +313,10 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
             //--
         }
         project.CreateVisualiserData();
-        System.out.println("visualiser data created");
         //---
         if (isTransformation && !messages.isEmpty()) {
             project.Open();
             project.db.BeginTransaction();
-            System.out.println("messages size=" + messages.size());
             for (MessageError m : messages) {
                 if (project.db.files.containsKey(m.file)) {
                     DBProjectFile file = project.db.files.Data.get(m.file);
@@ -335,10 +332,8 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
     //-------------------------------------------------->>
     @Override
     protected void body() throws Exception {
-        System.out.println(target.root + " " + Utils.Brackets(sapforConfiguration_json.flags));//!!
         target.versions.add(new SapforVersion_json(target.root, "исходная"));
         for (PassCode_2021 code : sapforConfiguration_json.codes) {
-            System.out.println(code); //!!
             if (parse()) {
                 if (code.equals(PassCode_2021.CreateParallelVariants))
                     variants();
@@ -351,12 +346,9 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
     @Override
     protected void performFinish() throws Exception {
         //теперь строим деревья версий. нельзя делать в body. так как могут быть исключения например неверный код процесса.
-        System.out.println("Построение дерева версий..");
         for (SapforVersion_json version : target.versions)
             createVersionProjectData(version, true);
         for (SapforVersion_json version : target.variants)
             createVersionProjectData(version, false);
-        //---->>>>
-        System.out.println("DONE");
     }
 }

src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java

@@ -17,11 +17,11 @@ public class SapforTasksPackageSupervisor extends ThreadsPlanner {
     SapforTasksResults_json results_json = new SapforTasksResults_json();
     public SapforTasksPackageSupervisor() throws Exception {
         super(Global.properties.threadsTimeout, Global.properties.threadsNum);
-        package_json = (SapforTasksPackage_json) Utils.jsonFromFile(new File(Global.Home, "scenario"), SapforTasksPackage_json.class);
+        package_json = (SapforTasksPackage_json) Utils.jsonFromFile(new File(Global.Home, "package_json"), SapforTasksPackage_json.class);
         results_json.StartDate = new Date().getTime();
         //формирование списка задач.
         File sapfor_drv = new File(Global.Home, package_json.sapfor_drv);
-        for (SapforConfiguration_json sapforConfiguration_json : package_json.packages) {
+        for (SapforConfiguration_json sapforConfiguration_json : package_json.configurations) {
             for (String testName : package_json.tests) {
                 //--- чтобы было можно на нее сослаться после выполнения всех нитей.
                 SapforTask task = new SapforTask();

src/SapforTestingSystem/SapforTasksPackage_info.java

@@ -5,7 +5,7 @@ import com.google.gson.annotations.Expose;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Vector;
-public class SapforServerScenario_info implements Serializable {
+public class SapforTasksPackage_info implements Serializable {
     @Expose
     public int sapforId = Constants.Nan; //файл с сапфором
     @Expose

src/TestingSystem/TestingServer.java

@@ -15,12 +15,12 @@ import Repository.RepositoryRefuseException;
 import Repository.RepositoryServer;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import SapforTestingSystem.Json.SapforTasksPackage_json;
 import SapforTestingSystem.Json.SapforConfiguration_json;
+import SapforTestingSystem.Json.SapforTasksPackage_json;
 import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
 import SapforTestingSystem.SapforConfiguration.SapforConfigurationInterface;
 import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
-import SapforTestingSystem.SapforServerScenario_info;
+import SapforTestingSystem.SapforTasksPackage_info;
 import SapforTestingSystem.ServerSapfor.ServerSapfor;
 import SapforTestingSystem.ServerSapforTestingPlanner.ServerSapforTestingPlanner;
 import TestingSystem.Group.Group;
@@ -315,32 +315,32 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         groups.sort(Comparator.comparing(o -> o.description));
         return groups;
     }
-    public void StartSapforTests(SapforServerScenario_info scenario_info) throws Exception {
+    public void StartSapforTests(SapforTasksPackage_info sapforTasksPackage_info) throws Exception {
         //--
-        SapforTasksPackage_json scenario_json = new SapforTasksPackage_json();
+        SapforTasksPackage_json package_json = new SapforTasksPackage_json();
-        for (String test_id : scenario_info.testsIds)
+        for (String test_id : sapforTasksPackage_info.testsIds)
-            scenario_json.tests.add(db.tests.get(test_id).description);
+            package_json.tests.add(db.tests.get(test_id).description);
         //создание объекта набора задач. для бд.
         SapforTasksPackage sapforTasksPackage = new SapforTasksPackage(); //?может быть все же поменять ключ на сгенерированный из даты.
-        db.Insert(sapforTasksPackage);
+       // db.Insert(sapforTasksPackage);
         //создание рабочего пространства для пакетного режима
-        File scenarioWorkspace = new File(Global.ScenariosDirectory, String.valueOf(sapforTasksPackage.id));
+        File packageWorkspace = new File(Global.SapforPackagesDirectory, String.valueOf(sapforTasksPackage.id));
-        Utils.CheckAndCleanDirectory(scenarioWorkspace);
+        Utils.CheckAndCleanDirectory(packageWorkspace);
-        sapforTasksPackage.workspace = scenarioWorkspace.getAbsolutePath();
+        sapforTasksPackage.workspace = packageWorkspace.getAbsolutePath();
         //копирование тестов по конфигурациям.
-        for (String configuration_id : scenario_info.configurationsIds) {
+        for (String configuration_id : sapforTasksPackage_info.configurationsIds) {
             SapforConfiguration configuration = db.sapforConfigurations.get(configuration_id);
             //--
-            SapforConfiguration_json package_json = new SapforConfiguration_json();
+            SapforConfiguration_json configuration_json = new SapforConfiguration_json();
-            package_json.id = String.valueOf(configuration_id);
+            configuration_json.id = String.valueOf(configuration_id);
-            package_json.flags = SapforConfigurationInterface.getFlags(configuration);
+            configuration_json.flags = SapforConfigurationInterface.getFlags(configuration);
-            package_json.codes.addAll(SapforConfigurationInterface.getPassCodes(configuration));
+            configuration_json.codes.addAll(SapforConfigurationInterface.getPassCodes(configuration));
             //--->>
-            scenario_json.packages.add(package_json);
+            package_json.configurations.add(configuration_json);
             //-->>
-            File configurationWorkspace = new File(scenarioWorkspace, configuration_id);
+            File configurationWorkspace = new File(packageWorkspace, configuration_id);
             FileUtils.forceMkdir(configurationWorkspace);
-            for (String test_id : scenario_info.testsIds) {
+            for (String test_id : sapforTasksPackage_info.testsIds) {
                 Test test = db.tests.get(test_id);
                 File test_root = new File(configurationWorkspace, test.description);
                 Utils.CheckAndCleanDirectory(test_root);
@@ -350,11 +350,11 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         }
         //копирование SAPFOR
         File sapforFile = new File(sapforTasksPackage.workspace, Utils.getDateName("SAPFOR_F"));
-        ServerSapfor sapfor = db.serverSapfors.get(scenario_info.sapforId);
+        ServerSapfor sapfor = db.serverSapfors.get(sapforTasksPackage_info.sapforId);
         FileUtils.copyFile(new File(sapfor.call_command), sapforFile);
         if (!sapforFile.setExecutable(true))
             throw new RepositoryRefuseException("Не удалось сделать файл " + sapforFile.getName() + " исполняемым!");
-        scenario_json.sapfor_drv = sapforFile.getName();
+        package_json.sapfor_drv = sapforFile.getName();
         //--->>
         //копирование визуализатора
         File visualiser = new File(sapforTasksPackage.workspace, "VisualSapfor.jar");
@@ -366,26 +366,26 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         properties.threadsTimeout = Global.properties.threadsTimeout;
         Utils.jsonToFile(properties, new File(sapforTasksPackage.workspace, "properties"));
         //создание инструкции
-        File scenario_file = new File(sapforTasksPackage.workspace, "scenario");
+        File package_json_file = new File(sapforTasksPackage.workspace, "package_json");
-        Utils.jsonToFile(scenario_json, scenario_file);
+        Utils.jsonToFile(package_json, package_json_file);
         //подготовка пакетного режима. Запустит его уже очередь.
-        Utils.createScript(scenarioWorkspace, scenarioWorkspace, "start", "java -jar VisualSapfor.jar");
+        Utils.createScript(packageWorkspace, packageWorkspace, "start", "java -jar VisualSapfor.jar");
         //--
         sapforTasksPackage.sapfor_version = sapfor.version;
         sapforTasksPackage.sapfor_build_date = sapfor.buildDate;
-        sapforTasksPackage.testsNames = String.join(";", scenario_json.tests);
+        sapforTasksPackage.testsNames = String.join(";", package_json.tests);
         sapforTasksPackage.StartDate = new Date().getTime();
-        db.Update(sapforTasksPackage);
+       // db.Update(sapforTasksPackage);
     }
     @Override
     protected void Session() throws Exception {
         DBObject dbObject = null;
-        SapforServerScenario_info scenario = null;
+        SapforTasksPackage_info scenario = null;
         Test test = null;
         switch (code) {
             case StartSapforTests:
                 Print("Запуск тестирования SAPFOR");
-                StartSapforTests((SapforServerScenario_info) request.object);
+                StartSapforTests((SapforTasksPackage_info) request.object);
                 response = new ServerExchangeUnit_2021(ServerCode.OK);
                 break;
             case SynchronizeTests:

src/TestingSystem/TestsDatabase.java

@@ -4,14 +4,12 @@ import GlobalData.Settings.SettingName;
 import SapforTestingSystem.SapforConfiguration.SapforConfigurationDBTable;
 import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
 import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackagesDBTable;
 import SapforTestingSystem.ServerSapfor.ServerSapforsDBTable;
 import TestingSystem.Configuration.UI.ConfigurationDBTable;
 import TestingSystem.Group.GroupsDBTable;
 import TestingSystem.MachineMaxKernels.MachineMaxKernelsDBTable;
 import TestingSystem.TSetting.TSetting;
 import TestingSystem.TSetting.TSettingsDBTable;
-import TestingSystem.TasksPackage.TasksPackageState;
 import TestingSystem.Test.TestDBTable;
 
 import java.nio.file.Paths;
@@ -27,7 +25,7 @@ public class TestsDatabase extends SQLiteDatabase {
     //----
     public ServerSapforsDBTable serverSapfors;
     //--
-    public SapforTasksPackagesDBTable sapforTasksPackages;
+ //   public SapforTasksPackagesDBTable sapforTasksPackages;
  //   public SapforTasksPackagesDBTable sapforTasksPackages;
     //--
     public TestsDatabase() {
@@ -44,7 +42,7 @@ public class TestsDatabase extends SQLiteDatabase {
         addTable(sapforConfigurations = new SapforConfigurationDBTable());
         addTable(sapforConfigurationCommands = new SapforConfigurationCommandsDBTable());
         addTable(serverSapfors = new ServerSapforsDBTable());
-        addTable(sapforTasksPackages = new SapforTasksPackagesDBTable());
+      //  addTable(sapforTasksPackages = new SapforTasksPackagesDBTable());
       //  addTable(sapforTasksPackages = new SapforTasksPackagesDBTable());
     }
     @Override
@@ -69,6 +67,7 @@ public class TestsDatabase extends SQLiteDatabase {
         return res;
     }
     public SapforTasksPackage getFirstActiveSapforScenario() {
+        /*
         SapforTasksPackage first_active = null;
         SapforTasksPackage first_queued = null;
         if (!sapforTasksPackages.Data.isEmpty()) {
@@ -96,6 +95,7 @@ public class TestsDatabase extends SQLiteDatabase {
             }
             return first_queued;
         }
+         */
         return null;
     }
 }

src/Visual_DVM_2021/Passes/All/StartSapforTestsOnServer.java

@@ -5,7 +5,7 @@ import Common.UI.UI;
 import ProjectData.LanguageName;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import SapforTestingSystem.SapforServerScenario_info;
+import SapforTestingSystem.SapforTasksPackage_info;
 import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
 import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
 import TestingSystem.Group.Group;
@@ -16,7 +16,7 @@ import Visual_DVM_2021.Passes.TestingSystemPass;
 import java.io.File;
 import java.util.LinkedHashMap;
 import java.util.Vector;
-public class StartSapforTestsOnServer extends TestingSystemPass<SapforServerScenario_info> {
+public class StartSapforTestsOnServer extends TestingSystemPass<SapforTasksPackage_info> {
     protected int allTasksCount = 0;
     //--
     protected LinkedHashMap<String, Vector<String>> groupsTests = null;
@@ -171,7 +171,7 @@ public class StartSapforTestsOnServer extends TestingSystemPass<SapforServerScen
     //--
     @Override
     protected void ServerAction() throws Exception {
-        target = new SapforServerScenario_info();
+        target = new SapforTasksPackage_info();
         target.sapforId = Current.getServerSapfor().id;
         for (Test test : allTests.values())
             target.testsIds.add(test.id);

src/Visual_DVM_2021/Passes/All/SynchronizeTests.java

@@ -52,7 +52,7 @@ public class SynchronizeTests extends TestingSystemPass<Object> {
             server.db.configurations.ShowUI();
             server.db.groups.ShowUI();
             server.db.sapforConfigurations.ShowUI();
-            server.db.sapforTasksPackages.ShowUI();
+           // server.db.sapforTasksPackages.ShowUI();
             server.db.RestoreLastSelections();
             UI.getMainWindow().getTestingWindow().ShowCheckedTestsCount();
             //для отображения числа ядер.

src/Visual_DVM_2021/UI/Main/TestingForm.java

@@ -151,7 +151,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         Global.testingServer.db.sapforConfigurations.mountUI(sapforConfigurationsPanel);
         Global.testingServer.db.sapforConfigurationCommands.mountUI(sapforConfigurationCommandsPanel);
         Global.testingServer.db.serverSapfors.mountUI(serverSapforsPanel);
-        Global.testingServer.db.sapforTasksPackages.mountUI(sapforScenariosPanel);
+      //  Global.testingServer.db.sapforTasksPackages.mountUI(sapforScenariosPanel);
        // Global.testingServer.db.sapforTasksPackages.mountUI(sapforPackagesPanel);
 
         //Global.db.sapforTasks.mountUI(sapforTasksPanel);
@@ -189,7 +189,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         Global.testingServer.account_db.packages.ShowUI();
         Global.testingServer.db.serverSapfors.ShowUI();
         Global.testingServer.db.sapforConfigurations.ShowUI();
-        Global.testingServer.db.sapforTasksPackages.ShowUI();
+      //  Global.testingServer.db.sapforTasksPackages.ShowUI();
     }
     //-
     @Override