From 39dbf5f146322f78931700e715d3f48365a43f05 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 23 Sep 2024 21:16:52 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  9 ----
 .../SapforConfiguration.java                  |  3 +-
 .../StartSelectedSAPFORConfigurations.java    | 50 +++----------------
 3 files changed, 9 insertions(+), 53 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3514efb9..5c23b014 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,18 +7,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Common/Utils/Vector_.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/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Constants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java" 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/Common/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Configuration/Configuration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Configuration/Configuration.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/TestPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/TestPass.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/SAPFOR/SapforConfiguration/SapforConfiguration.java b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
index 4017dcdb..c45a6383 100644
--- a/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
+++ b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
@@ -95,11 +95,10 @@ public class SapforConfiguration extends Configuration {
                         " запрещено применять более одного раза!");
             } else matches.add(code);
         }
-        //2. Проверка входящих групп и тестов на корректность
+        //2. Проверка входящих групп на единственный язык фортран
         ConfigurationCache cache = (ConfigurationCache) VisualCaches.GetCache(this);
         //--
         Vector<Group> groups = cache.getGroups();
-        Vector<Test> tests = cache.getTests();
         Vector<LanguageName> groupsLanguages = new Vector<>();
         //-
         for (Group group : groups) {
diff --git a/src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java b/src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java
index 702910df..e03e6a36 100644
--- a/src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java
+++ b/src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java
@@ -26,12 +26,9 @@ import java.util.LinkedHashMap;
 import java.util.Vector;
 public class StartSelectedSAPFORConfigurations extends PublishServerObject<TestingServer, SapforPackage> {
     Vector<SapforConfiguration> configurations;
-    Vector<Group> groups;
-    Vector<Test> tests;
     SapforTestingSet_json testingSet; //то, что добавляем.
     //--
     protected LinkedHashMap<String, Test> testsByDescriptions = null;
-    protected Vector<String> testsNames_lower = null; //все тесты что участвуют здесь
     protected File sapfor = null;
     //--
     protected Vector<SapforTask> new_tasks = null;
@@ -40,39 +37,12 @@ public class StartSelectedSAPFORConfigurations extends PublishServerObject<Testi
         return "/icons/Start.png";
     }
     //--
-    protected boolean checkTestName(Test test) {
-        String name = test.description.toLowerCase();
-        if (testsNames_lower.contains(name)) {
-            Log.Writeln_("В пакет не могут входить тесты с одинаковыми именами (без учета регистра):" + test.description.toLowerCase());
-            return false;
-        }
-        testsNames_lower.add(name);
-        return true;
-    }
-    protected boolean checkTestsDescriptions(int groupId, Vector<Test> groupTests) {
-        if (groupTests.isEmpty()) {
-            Log.Writeln_("Пустая группа тестов: " + groupId);
-            return false;
-        }
-        for (Test test : groupTests) {
-            if (!checkTestName(test))
-                return false;
-            else
-                testsByDescriptions.put(test.description, test);
-        }
-        return true;
-    }
-    //--
     public StartSelectedSAPFORConfigurations() {
         super(Global.testingServer, SapforPackage.class);
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
         //--
-        groups = new Vector<>();
-        tests = new Vector<>();
-        //--
-        testsNames_lower = new Vector<>();
         testsByDescriptions = new LinkedHashMap<>();
         //--
         new_tasks= new Vector<>();
@@ -101,19 +71,15 @@ public class StartSelectedSAPFORConfigurations extends PublishServerObject<Testi
             //-
             ConfigurationCache cache = (ConfigurationCache) VisualCaches.GetCache(configuration);
             //--
-            groups = cache.getGroups();
-            tests = cache.getTests();
-            //--
-            for (Group group : groups) {
-                Vector<Test> groupTests = new Vector<>();
-                for (Test test : tests) {
-                    if (test.group_id == group.id)
-                        groupTests.add(test);
-                }
-                //---
-                if (!checkTestsDescriptions(group.id,groupTests))
+            Vector<Test>tests= cache.getTests();
+            for (Test test:tests){
+                String l_description = test.description.toLowerCase();
+                if (testsByDescriptions.containsKey(l_description)) {
+                    Log.Writeln_("В пакет не могут входить тесты с одинаковыми именами (без учета регистра):" + test.description.toLowerCase());
                     return false;
-                //-
+                }else {
+                    testsByDescriptions.put(l_description, test);
+                }
             }
         }
         target = new SapforPackage(Current.getAccount(), Current.getServerSapfor(), max_kernels);