From 3f4ef5f198d9f53d2263ab538b8eff10e5ab45a2 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 18 Mar 2025 19:26:32 +0300
Subject: [PATCH] =?UTF-8?q?++=20=D0=B2=D0=B2=D0=BE=D0=B4=20=D1=84=D0=BB?=
 =?UTF-8?q?=D0=B0=D0=B3=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D0=BA=D0=BE=D0=BD?=
 =?UTF-8?q?=D1=84=D0=B8=D0=B3=D1=83=D1=80=D0=B0=D1=86=D0=B8=D0=B9,=20?=
 =?UTF-8?q?=D1=83=D1=87=D0=B8=D1=82=D1=8B=D0=B2=D0=B0=D1=82=D1=8C=20=D1=82?=
 =?UTF-8?q?=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20=D0=B3=D1=80=D1=83=D0=BF=D0=BF?=
 =?UTF-8?q?=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 16 ++++-----
 properties                                    |  6 ++--
 src/_VisualDVM/Constants.java                 |  2 +-
 .../All/StartSelectedDVMConfigurations.java   | 10 ++++++
 .../ConfigurationCache.java                   | 33 ++++++++++++++-----
 .../Common/Configuration/Configuration.java   | 11 +++++--
 .../TestingSystem/Common/TestsDatabase.java   |  2 ++
 .../UI/DVMConfigurationDialog.java            |  2 ++
 .../UI/DVMConfigurationFields.form            | 19 +++++++++--
 .../UI/DVMConfigurationFields.java            |  1 +
 .../UI/DVMConfigurationsForm.java             |  1 +
 11 files changed, 77 insertions(+), 26 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fa79ac0f..fa972b3e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,17 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteRemoteWorkspace.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/TaskState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/TaskState.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/TestPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/TestPass.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/RepositoryServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationDialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationFields.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index cfa8b771..1ee7de6c 100644
--- a/properties
+++ b/properties
@@ -32,9 +32,9 @@
   "CompleteRunEnvironments": true,
   "CreateEthalonTasks": true,
   "ErasePackageWorkspace": true,
-  "lastMachineId": 1,
-  "lastUserId": 17,
-  "lastCompilerId": 15,
+  "lastMachineId": 28,
+  "lastUserId": 36,
+  "lastCompilerId": 110,
   "RegisterOn": false,
   "SpacesOn": false,
   "EmptyLinesOn": false,
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index c0f4dc24..12b94ece 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
-    public static final int version = 1217;
+    public static final int version = 1218;
     public static final int planner_version = 24;
     public static final int testingMaxKernels = 64;
     //--
diff --git a/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java b/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java
index b39e40e2..5964b017 100644
--- a/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java
+++ b/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java
@@ -66,6 +66,12 @@ public class StartSelectedDVMConfigurations extends PublishServerObject<TestingS
             return false;
         }
         Vector<DVMConfiguration> configurations = Global.testingServer.db.dvmConfigurations.getUI().getSelectedOrCurrent();
+       // for (DVMConfiguration configuration:configurations){
+       //     Global.testingServer.db.actualizeConfigurationGroups(configuration);
+       // }
+        //---
+        //проверить конфигурации на соответствие группам.
+        //если конфигурации количество тестов 0, но есть группы.проверить на пустоту этих групп,и заполнить заново всеми их тестами.
         //---
         target = new DVMPackage(
                 Global.mainModule.getAccount(),
@@ -84,6 +90,10 @@ public class StartSelectedDVMConfigurations extends PublishServerObject<TestingS
         return UI.Question("Будет запущено " + target.tasksCount + " задач. Продолжить");
     }
     @Override
+    protected void showPreparation() throws Exception {
+       getDb().getTable(DVMConfiguration.class).ShowUI();
+    }
+    @Override
     protected void ServerAction() throws Exception {
         Command(new SafeServerExchangeUnit(ServerCode.PublishObject, user.password, target));
         pk = server_response.object;
diff --git a/src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java b/src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java
index aeb20e54..14e79b06 100644
--- a/src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java
+++ b/src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java
@@ -14,13 +14,16 @@ import _VisualDVM.TestingSystem.Common.Test.Test;
 import java.util.LinkedHashMap;
 import java.util.Vector;
 public class ConfigurationCache extends VisualCache {
+
     public GroupsJson groupsJson = null;
     public TestsJson testsJson = null;
+    public int groupsOnly = 0;
     public SettingsArrayJson settingsJson = null;
     public String settingsSummary = null;
     public Vector<String> groupsSummary = null;
     //--
     public ConfigurationCache(Configuration configuration) {
+        groupsOnly = configuration.groupsOnly;
         if (configuration.packedGroupsJson.isEmpty())
             groupsJson = new GroupsJson(); //просто пустой
         else
@@ -57,7 +60,9 @@ public class ConfigurationCache extends VisualCache {
         settingsSummary = String.join(";", settingsDescriptionsVector);
     }
     public int getTestsCount() {
-        return testsJson.array.size();
+        return getTests().size();
+             //   testsJson.array.size(); временно, до обновления БД.
+
     }
     public Vector<Group> getGroups() {
         Vector<Group> groups = new Vector<>();
@@ -69,20 +74,30 @@ public class ConfigurationCache extends VisualCache {
     }
     public Vector<Test> getTests() {
         Vector<Test> tests = new Vector<>();
-        for (TestJson testJson : testsJson.array) {
-            if (Global.testingServer.db.tests.containsKey(testJson.id))
-                tests.add(Global.testingServer.db.tests.get(testJson.id));
+        if (groupsOnly==0) {
+            for (TestJson testJson : testsJson.array) {
+                if (Global.testingServer.db.tests.containsKey(testJson.id))
+                    tests.add(Global.testingServer.db.tests.get(testJson.id));
+            }
+        }else {
+            for (Group group: getGroups()){
+                tests.addAll(Global.testingServer.db.getVectorByFK(group,Test.class));
+            }
         }
         return tests;
     }
     public Vector<Test> getGroupTests(Group group) {
         Vector<Test> tests = new Vector<>();
-        for (TestJson testJson : testsJson.array) {
-            if (Global.testingServer.db.tests.containsKey(testJson.id)) {
-                Test test = Global.testingServer.db.tests.get(testJson.id);
-                if (test.group_id == group.id)
-                    tests.add(test);
+        if (groupsOnly==0) {
+            for (TestJson testJson : testsJson.array) {
+                if (Global.testingServer.db.tests.containsKey(testJson.id)) {
+                    Test test = Global.testingServer.db.tests.get(testJson.id);
+                    if (test.group_id == group.id)
+                        tests.add(test);
+                }
             }
+        }else {
+            return Global.testingServer.db.getVectorByFK(group, Test.class);
         }
         return tests;
     }
diff --git a/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java b/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java
index a74c858f..0086951d 100644
--- a/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java
+++ b/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java
@@ -40,10 +40,16 @@ public class Configuration extends riDBObject {
     @Description("DEFAULT ''")
     public String packedSettingsJson = "";
     @Description("DEFAULT -1")
-    public int ethalon_id = CommonConstants.Nan; //пакет-эталон
+    public int ethalon_id = CommonConstants.Nan; //пакет-эталон ( в двм тестировании не нужен.)
+    @Description("DEFAULT 0")
+    public int groupsOnly = 0;
+    //если флаг выставлен, то при формировании пакета берутся все тесты из участвущих групп. тесты конфигурации игнорируются.
     //----
     public String printAuto() {
-        return autoTesting > 0 ? "Да" : "Нет";
+        return autoTesting != 0 ? "Да" : "Нет";
+    }
+    public String printGroupsOnly() {
+        return groupsOnly !=0 ? "Да" : "Нет";
     }
     public String printEthalon() {
         return (ethalon_id == CommonConstants.Nan) ? "—" : String.valueOf(ethalon_id);
@@ -74,6 +80,7 @@ public class Configuration extends riDBObject {
         maxtime = c.maxtime;
         autoTesting = c.autoTesting;
         kernels = c.kernels;
+        groupsOnly = c.groupsOnly;
         //-
         packedGroupsJson = c.packedGroupsJson;
         packedTestsJson = c.packedTestsJson;
diff --git a/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java b/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java
index 9a10b287..40aab753 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java
@@ -8,7 +8,9 @@ import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.Files.ProjectFile;
+import _VisualDVM.ServerObjectsCache.ConfigurationCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
+import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
 import _VisualDVM.TestingSystem.Common.Group.Group;
 import _VisualDVM.TestingSystem.Common.Group.GroupsDBTable;
 import _VisualDVM.TestingSystem.Common.Test.Json.TestFileJson;
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationDialog.java b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationDialog.java
index 5dc54644..6aa6f6a8 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationDialog.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationDialog.java
@@ -20,6 +20,7 @@ public class DVMConfigurationDialog extends DBObjectDialog<DVMConfiguration, DVM
         fields.sCompilationMaxtime.setValue(Result.c_maxtime);
         fields.sRunMaxtime.setValue(Result.maxtime);
         fields.sKernels.setValue(Result.kernels);
+        fields.cbGroupsOnly.setSelected(Result.groupsOnly != 0);
     }
     @Override
     public void ProcessResult() {
@@ -27,6 +28,7 @@ public class DVMConfigurationDialog extends DBObjectDialog<DVMConfiguration, DVM
         Result.c_maxtime = (int) fields.sCompilationMaxtime.getValue();
         Result.maxtime = (int) fields.sRunMaxtime.getValue();
         Result.kernels = (int) fields.sKernels.getValue();
+        Result.groupsOnly = fields.cbGroupsOnly.isSelected() ? 1 : 0;
     }
     @Override
     public void SetReadonly() {
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationFields.form b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationFields.form
index a4b3165d..8cc6d12b 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationFields.form
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationFields.form
@@ -3,12 +3,12 @@
   <grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="20" y="20" width="467" height="163"/>
+      <xy x="20" y="20" width="467" height="195"/>
     </constraints>
     <properties/>
     <border type="none"/>
     <children>
-      <grid id="5bf8c" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="5bf8c" layout-manager="GridLayoutManager" row-count="6" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -27,7 +27,7 @@
           </component>
           <vspacer id="68a9">
             <constraints>
-              <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+              <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
             </constraints>
           </vspacer>
           <component id="fdaa3" class="javax.swing.JTextField" binding="tfName" custom-create="true">
@@ -98,6 +98,19 @@
             </constraints>
             <properties/>
           </component>
+          <component id="89323" class="javax.swing.JCheckBox" binding="cbGroupsOnly">
+            <constraints>
+              <grid row="4" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <font name="Times New Roman" size="16" style="2"/>
+              <horizontalAlignment value="0"/>
+              <icon value="Common/icons/NotPick.png"/>
+              <selectedIcon value="Common/icons/Pick.png"/>
+              <text value="учитывать только группы"/>
+              <toolTipText value="При формировании пакета, брать все тест из входящих групп"/>
+            </properties>
+          </component>
         </children>
       </grid>
     </children>
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationFields.java b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationFields.java
index f9334c42..5c42742f 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationFields.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationFields.java
@@ -12,6 +12,7 @@ public class DVMConfigurationFields implements DialogFields {
     public JSpinner sKernels;
     //-
     private JPanel content;
+    public JCheckBox cbGroupsOnly;
     public DVMConfigurationFields() {
         sCompilationMaxtime.setModel(new SpinnerNumberModel(40,
                 5, 3600, 1
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java
index 4bf0f300..df7ae5ef 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java
@@ -57,6 +57,7 @@ public class DVMConfigurationsForm extends RDataSetControlForm<DVMConfiguration>
                         return RendererMultiline.class;
                     }
                 },
+
                 new ColumnInfo<DVMConfiguration>("тестов") {
                     @Override
                     public Object getFieldAt(DVMConfiguration object) {