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 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
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 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 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 getGroups() {
Vector groups = new Vector<>();
@@ -69,20 +74,30 @@ public class ConfigurationCache extends VisualCache {
}
public Vector getTests() {
Vector 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 getGroupTests(Group group) {
Vector 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
-
+
-
+
@@ -27,7 +27,7 @@
-
+
@@ -98,6 +98,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
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
return RendererMultiline.class;
}
},
+
new ColumnInfo("тестов") {
@Override
public Object getFieldAt(DVMConfiguration object) {