++

ввод флага для конфигураций, учитывать только группы

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;

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;

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() {

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>

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

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) {