M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

промежуточный.привожу в порядок индексы.

Browse Source
This commit is contained in:
02090095
2025-03-23 02:14:23 +03:00
parent 10c213feae
commit f6cc447481
35 changed files with 526 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

269
src/_VisualDVM/TestingSystem/Common/TestsDatabase.java
View File

@@ -10,10 +10,6 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Group.GroupsDBTable;
import _VisualDVM.TestingSystem.Common.Settings.Json.SettingsArrayJson;
import _VisualDVM.TestingSystem.Common.Settings.Json.SettingsJson;
import _VisualDVM.TestingSystem.Common.Test.Json.TestJson;
import _VisualDVM.TestingSystem.Common.Test.Json.TestsJson;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.TestingSystem.Common.Test.TestDBTable;
import _VisualDVM.TestingSystem.Common.TestFile.TestFile;
@@ -23,6 +19,10 @@ import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfigurationDBTable;
import _VisualDVM.TestingSystem.DVM.DVMConfigurationGroup.DVMConfigurationGroup;
import _VisualDVM.TestingSystem.DVM.DVMConfigurationGroup.DVMConfigurationGroupsDBTable;
import _VisualDVM.TestingSystem.DVM.DVMConfigurationSettings.DVMConfigurationSettings;
import _VisualDVM.TestingSystem.DVM.DVMConfigurationSettings.DVMConfigurationSettingsDBTable;
import _VisualDVM.TestingSystem.DVM.DVMConfigurationTest.DVMConfigurationTest;
import _VisualDVM.TestingSystem.DVM.DVMConfigurationTest.DVMConfigurationTestsDBTable;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackageDBTable;
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettingsDBTable;
@@ -31,6 +31,10 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationDBTable;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationGroup.SapforConfigurationGroup;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationGroup.SapforConfigurationGroupsDBTable;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationSettings.SapforConfigurationSettings;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationSettings.SapforConfigurationSettingsDBTable;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationTest.SapforConfigurationTest;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationTest.SapforConfigurationTestsDBTable;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettingsDBTable;
@@ -55,6 +59,8 @@ public class TestsDatabase extends SQLiteDatabase {
public DVMSettingsDBTable dvmSettings;
public DVMConfigurationDBTable dvmConfigurations;
public DVMConfigurationGroupsDBTable dvmConfigurationGroups;
public DVMConfigurationTestsDBTable dvmConfigurationTests;
public DVMConfigurationSettingsDBTable dvmConfigurationSettings;
public DVMPackageDBTable dvmPackages;
public DVMRunTasksSet dvmRunTasks = new DVMRunTasksSet();
//--
@@ -62,7 +68,9 @@ public class TestsDatabase extends SQLiteDatabase {
public SapforSettingsDBTable sapforSettings;
public SapforSettingsCommandsDBTable sapforSettingsCommands;
public SapforConfigurationDBTable sapforConfigurations;
public SapforConfigurationGroupsDBTable sapforConfigurationsGroups;
public SapforConfigurationGroupsDBTable sapforConfigurationGroups;
public SapforConfigurationTestsDBTable sapforConfigurationTests;
public SapforConfigurationSettingsDBTable sapforConfigurationSettings;
public SapforPackageDBTable sapforPackages;
//--
public TestingPackagesToKillDBTable testingPackagesToKill;
@@ -79,13 +87,17 @@ public class TestsDatabase extends SQLiteDatabase {
addTable(dvmSettings = new DVMSettingsDBTable());
addTable(dvmConfigurations = new DVMConfigurationDBTable());
addTable(dvmConfigurationGroups = new DVMConfigurationGroupsDBTable());
addTable(dvmConfigurationTests = new DVMConfigurationTestsDBTable());
addTable(dvmConfigurationSettings = new DVMConfigurationSettingsDBTable());
addTable(dvmPackages = new DVMPackageDBTable());
//-
addTable(serverSapfors = new ServerSapforsDBTable());
addTable(sapforSettings = new SapforSettingsDBTable());
addTable(sapforSettingsCommands = new SapforSettingsCommandsDBTable());
addTable(sapforConfigurations = new SapforConfigurationDBTable());
addTable(sapforConfigurationsGroups = new SapforConfigurationGroupsDBTable());
addTable(sapforConfigurationGroups = new SapforConfigurationGroupsDBTable());
addTable(sapforConfigurationTests = new SapforConfigurationTestsDBTable());
addTable(sapforConfigurationSettings = new SapforConfigurationSettingsDBTable());
addTable(sapforPackages = new SapforPackageDBTable());
//--
addTable(testingPackagesToKill = new TestingPackagesToKillDBTable());
@@ -387,10 +399,8 @@ public class TestsDatabase extends SQLiteDatabase {
for (DVMConfigurationGroup dvmConfigurationGroup: DVMConfigurationGroups)
Insert(dvmConfigurationGroup);
Commit();
*/
//---
/*
Vector<SapforConfigurationGroup> sapforConfigurationGroups =new Vector<>();
Vector<SapforConfigurationGroup> SapforConfigurationGroups =new Vector<>();
//группы sapfor конфигураций
for (SapforConfiguration sapforConfiguration: sapforConfigurations.Data.values()){
GroupsJson groupsJson = Utils_.gson.fromJson(sapforConfiguration.packedGroupsJson, GroupsJson.class);
@@ -398,116 +408,165 @@ public class TestsDatabase extends SQLiteDatabase {
SapforConfigurationGroup sapforConfigurationGroup = new SapforConfigurationGroup();
sapforConfigurationGroup.group_id = groupJson.id;
sapforConfigurationGroup.sapforconfiguration_id = sapforConfiguration.id;
sapforConfigurationGroups.add(sapforConfigurationGroup);
SapforConfigurationGroups.add(sapforConfigurationGroup);
}
}
BeginTransaction();
for (SapforConfigurationGroup sapforConfigurationGroup: sapforConfigurationGroups)
for (SapforConfigurationGroup sapforConfigurationGroup: SapforConfigurationGroups)
Insert(sapforConfigurationGroup);
Commit();
//тесты двм конфигураций
Vector<DVMConfigurationTest> DvmConfigurationTests_ = new Vector<>();
for (DVMConfiguration configuration: dvmConfigurations.Data.values()){
TestsJson testsJson = Utils_.gson.fromJson(configuration.packedTestsJson,TestsJson.class);
for (TestJson testJson: testsJson.array){
DVMConfigurationTest test= new DVMConfigurationTest();
test.test_id=testJson.id;
test.dvmconfiguration_id=configuration.id;
DvmConfigurationTests_.add(test);
}
}
BeginTransaction();
for (DVMConfigurationTest test:DvmConfigurationTests_)
Insert(test);
Commit();
//-
//тесты сапфор конфигураций
Vector<SapforConfigurationTest> SapforConfigurationTests_ = new Vector<>();
for (SapforConfiguration configuration: sapforConfigurations.Data.values()){
TestsJson testsJson = Utils_.gson.fromJson(configuration.packedTestsJson,TestsJson.class);
for (TestJson testJson: testsJson.array){
SapforConfigurationTest test= new SapforConfigurationTest();
test.test_id=testJson.id;
test.sapforconfiguration_id=configuration.id;
SapforConfigurationTests_.add(test);
}
}
BeginTransaction();
for (SapforConfigurationTest test: SapforConfigurationTests_)
Insert(test);
Commit();
//--
Vector<DVMConfigurationSettings> DvmConfigurationSettings_ = new Vector<>();
for (DVMConfiguration configuration: dvmConfigurations.Data.values()){
SettingsArrayJson settingsArrayJson = Utils_.gson.fromJson(configuration.packedSettingsJson,SettingsArrayJson.class);
for (SettingsJson settingsJson: settingsArrayJson.array){
DVMConfigurationSettings Settings= new DVMConfigurationSettings();
Settings.dvmsettings_id=settingsJson.id;
Settings.dvmconfiguration_id=configuration.id;
DvmConfigurationSettings_.add(Settings);
}
}
BeginTransaction();
for (DVMConfigurationSettings Settings:DvmConfigurationSettings_)
Insert(Settings);
Commit();
//-
Vector<SapforConfigurationSettings> SapforConfigurationSettings_ = new Vector<>();
for (SapforConfiguration configuration: sapforConfigurations.Data.values()){
SettingsArrayJson settingsArrayJson = Utils_.gson.fromJson(configuration.packedSettingsJson,SettingsArrayJson.class);
for (SettingsJson settingsJson: settingsArrayJson.array){
SapforConfigurationSettings Settings= new SapforConfigurationSettings();
Settings.sapforsettings_id=settingsJson.id;
Settings.sapforconfiguration_id=configuration.id;
SapforConfigurationSettings_.add(Settings);
}
}
BeginTransaction();
for (SapforConfigurationSettings Settings:SapforConfigurationSettings_)
Insert(Settings);
Commit();
//-
*/
}
public static boolean containsGroup(DVMConfigurationGroup group_, Vector<DVMConfigurationGroup> groups) {
for (DVMConfigurationGroup group : groups) {
if (group.isEqual(group_)) {
return true;
}
}
return false;
}
public static boolean containsGroup(SapforConfigurationGroup group_, Vector<SapforConfigurationGroup> groups) {
for (SapforConfigurationGroup group : groups) {
if (group.isEqual(group_)) {
return true;
}
}
return false;
}
public void RefreshDVMConfigurationGroups(DVMConfiguration dvmConfiguration) throws Exception{
if (dvmConfiguration.configurationGroups != null) {
Vector<DVMConfigurationGroup> old_ = getVectorByFK(dvmConfiguration, DVMConfigurationGroup.class);
Vector<DVMConfigurationGroup> new_ = dvmConfiguration.configurationGroups;
//--
Vector<DVMConfigurationGroup> to_delete = new Vector<>();
Vector<DVMConfigurationGroup> to_add = new Vector<>();
for (DVMConfigurationGroup group: old_){
if (!containsGroup(group, new_))
to_delete.add(group);
}
for (DVMConfigurationGroup group : new_) {
if (!containsGroup(group, old_))
to_add.add(group);
}
for (DVMConfigurationGroup group: to_delete)
Delete(group);
for (DVMConfigurationGroup group: to_add)
Insert(group);
dvmConfiguration.configurationGroups=null;
}
}
//--
public void RefreshSapforConfigurationGroups(SapforConfiguration sapforConfiguration) throws Exception{
if (sapforConfiguration.configurationGroups != null) {
Vector<SapforConfigurationGroup> old_ = getVectorByFK(sapforConfiguration, SapforConfigurationGroup.class);
Vector<SapforConfigurationGroup> new_ = sapforConfiguration.configurationGroups;
//--
Vector<SapforConfigurationGroup> to_delete = new Vector<>();
Vector<SapforConfigurationGroup> to_add = new Vector<>();
for (SapforConfigurationGroup group: old_){
if (!containsGroup(group, new_))
to_delete.add(group);
}
for (SapforConfigurationGroup group : new_) {
if (!containsGroup(group, old_))
to_add.add(group);
}
for (SapforConfigurationGroup group: to_delete)
Delete(group);
for (SapforConfigurationGroup group: to_add)
Insert(group);
}
}
//--
public Vector<Integer> getDVMConfigurationGroupsIds(DVMConfiguration configuration){
public Vector<Integer> getDVMConfigurationGroupsIds(DVMConfiguration configuration) {
Vector<Integer> res = new Vector<>();
for (DVMConfigurationGroup dvmConfigurationGroup: dvmConfigurationGroups.Data.values()){
if (dvmConfigurationGroup.dvmconfiguration_id==configuration.id)
for (DVMConfigurationGroup dvmConfigurationGroup : dvmConfigurationGroups.Data.values()) {
if (dvmConfigurationGroup.dvmconfiguration_id == configuration.id)
res.add(dvmConfigurationGroup.group_id);
}
return res;
}
public Vector<Integer> getDVMConfigurationSettingsIds(DVMConfiguration configuration) {
Vector<Integer> res=new Vector<>();
//временно
SettingsArrayJson settingsArrayJson = Utils_.gson.fromJson(configuration.packedSettingsJson,SettingsArrayJson.class);
for (SettingsJson settingsJson: settingsArrayJson.array){
res.add(settingsJson.id);
}
return res;
}
public LinkedHashMap<Integer, Vector<Integer>> getDVMConfigurationGroupsTestsIds(DVMConfiguration configuration) {
LinkedHashMap<Integer,Vector<Integer>> res =new LinkedHashMap<>();
for (int group_id: getDVMConfigurationGroupsIds(configuration)) {
if (configuration.groupsOnly == 0) {
Vector<Integer> test_ids = new Vector<>();
//--
//временно.
TestsJson testsJson = Utils_.gson.fromJson(configuration.packedTestsJson, TestsJson.class);
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)
test_ids.add(test.id);
}
}
//--
res.put(group_id, test_ids);
} else {
res.put(group_id, getFKi(group_id, Group.class, Test.class));
public Vector<Integer> getDVMConfigurationTestsIds(DVMConfiguration configuration) {
Vector<Integer> res = new Vector<>();
if (configuration.groupsOnly == 0) {
for (DVMConfigurationTest dvmConfigurationTest : dvmConfigurationTests.Data.values()) {
if (dvmConfigurationTest.dvmconfiguration_id == configuration.id)
res.add(dvmConfigurationTest.test_id);
}
} else {
Vector<Integer> groups_ids = getDVMConfigurationGroupsIds(configuration);
for (int groud_id : groups_ids)
res.addAll(getFKi(groud_id, Group.class, Test.class));
}
return res;
}
public Vector<Integer> getDVMConfigurationSettingsIds(DVMConfiguration configuration) {
Vector<Integer> res = new Vector<>();
for (DVMConfigurationSettings dvmConfigurationSettings : dvmConfigurationSettings.Data.values()) {
if (dvmConfigurationSettings.dvmconfiguration_id == configuration.id)
res.add(dvmConfigurationSettings.dvmsettings_id);
}
return res;
}
//--
public Vector<Integer> getSapforConfigurationGroupsIds(SapforConfiguration configuration) {
Vector<Integer> res = new Vector<>();
for (SapforConfigurationGroup sapforConfigurationGroup : sapforConfigurationGroups.Data.values()) {
if (sapforConfigurationGroup.sapforconfiguration_id == configuration.id)
res.add(sapforConfigurationGroup.group_id);
}
return res;
}
public Vector<Integer> getSapforConfigurationTestsIds(SapforConfiguration configuration) {
Vector<Integer> res = new Vector<>();
if (configuration.groupsOnly == 0) {
for (SapforConfigurationTest sapforConfigurationTest : sapforConfigurationTests.Data.values()) {
if (sapforConfigurationTest.sapforconfiguration_id == configuration.id)
res.add(sapforConfigurationTest.test_id);
}
} else {
Vector<Integer> groups_ids = getSapforConfigurationGroupsIds(configuration);
for (int groud_id : groups_ids)
res.addAll(getFKi(groud_id, Group.class, Test.class));
}
return res;
}
public Vector<Integer> getSapforConfigurationSettingsIds(SapforConfiguration configuration) {
Vector<Integer> res = new Vector<>();
for (SapforConfigurationSettings sapforConfigurationSettings : sapforConfigurationSettings.Data.values()) {
if (sapforConfigurationSettings.sapforconfiguration_id == configuration.id)
res.add(sapforConfigurationSettings.sapforsettings_id);
}
return res;
}
//--
public LinkedHashMap<Integer, Vector<Integer>> getDVMConfigurationGroupsTestsIds(DVMConfiguration configuration) {
LinkedHashMap<Integer, Vector<Integer>> res = new LinkedHashMap<>();
Vector<Integer> all_tests_ids = getDVMConfigurationTestsIds(configuration);
for (int group_id : getDVMConfigurationGroupsIds(configuration)) {
Vector<Integer> test_ids = new Vector<>();
for (int test_id : all_tests_ids) {
if (tests.get(test_id).group_id == group_id)
test_ids.add(test_id);
}
res.put(group_id, test_ids);
}
return res;
}
public LinkedHashMap<Integer, Vector<Integer>> getSapforConfigurationGroupsTestsIds(SapforConfiguration configuration) {
LinkedHashMap<Integer, Vector<Integer>> res = new LinkedHashMap<>();
Vector<Integer> all_tests_ids = getSapforConfigurationTestsIds(configuration);
for (int group_id : getSapforConfigurationGroupsIds(configuration)) {
Vector<Integer> test_ids = new Vector<>();
for (int test_id : all_tests_ids) {
if (tests.get(test_id).group_id == group_id)
test_ids.add(test_id);
}
res.put(group_id, test_ids);
}
return res;
}
//--
}