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

no message

Browse Source
This commit is contained in:
02090095
2025-03-23 18:44:12 +03:00
parent 4f50c4a559
commit dae9d58d82
9 changed files with 71 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,8 @@ import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.Common.Configuration.Json.ConfigurationJson;
import _VisualDVM.TestingSystem.Common.Configuration.Json.ConfigurationsJson;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Group.GroupsDBTable;
import _VisualDVM.TestingSystem.Common.Test.Test;
@@ -25,6 +27,8 @@ 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.DVMPackageConfiguration.DVMPackageConfiguration;
import _VisualDVM.TestingSystem.DVM.DVMPackageConfiguration.DVMPackageConfigurationsDBTable;
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettingsDBTable;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTasksSet;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
@@ -37,6 +41,8 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationTest.SapforConfigurati
import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationTest.SapforConfigurationTestsDBTable;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackageConfiguration.SapforPackageConfiguration;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackageConfiguration.SapforPackageConfigurationsDBTable;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettingsDBTable;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommandsDBTable;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
@@ -62,6 +68,7 @@ public class TestsDatabase extends SQLiteDatabase {
public DVMConfigurationTestsDBTable dvmConfigurationTests;
public DVMConfigurationSettingsDBTable dvmConfigurationSettings;
public DVMPackageDBTable dvmPackages;
public DVMPackageConfigurationsDBTable dvmPackageConfigurations;
public DVMRunTasksSet dvmRunTasks = new DVMRunTasksSet();
//--
public ServerSapforsDBTable serverSapfors;
@@ -72,6 +79,7 @@ public class TestsDatabase extends SQLiteDatabase {
public SapforConfigurationTestsDBTable sapforConfigurationTests;
public SapforConfigurationSettingsDBTable sapforConfigurationSettings;
public SapforPackageDBTable sapforPackages;
public SapforPackageConfigurationsDBTable sapforPackageConfigurations;
//--
public TestingPackagesToKillDBTable testingPackagesToKill;
//--
@@ -90,6 +98,7 @@ public class TestsDatabase extends SQLiteDatabase {
addTable(dvmConfigurationTests = new DVMConfigurationTestsDBTable());
addTable(dvmConfigurationSettings = new DVMConfigurationSettingsDBTable());
addTable(dvmPackages = new DVMPackageDBTable());
addTable(dvmPackageConfigurations =new DVMPackageConfigurationsDBTable());
//-
addTable(serverSapfors = new ServerSapforsDBTable());
addTable(sapforSettings = new SapforSettingsDBTable());
@@ -99,6 +108,7 @@ public class TestsDatabase extends SQLiteDatabase {
addTable(sapforConfigurationTests = new SapforConfigurationTestsDBTable());
addTable(sapforConfigurationSettings = new SapforConfigurationSettingsDBTable());
addTable(sapforPackages = new SapforPackageDBTable());
addTable(sapforPackageConfigurations = new SapforPackageConfigurationsDBTable());
//--
addTable(testingPackagesToKill = new TestingPackagesToKillDBTable());
}
@@ -383,6 +393,39 @@ public class TestsDatabase extends SQLiteDatabase {
Delete(file);
}
public void Patch() throws Exception {
Vector<DVMPackageConfiguration> dvmPackageConfigurations_ = new Vector<>();
for (DVMPackage dvmPackage: dvmPackages.Data.values()){
if (!dvmPackage.packedConfigurationsJson.isEmpty()) {
ConfigurationsJson configurationsJson = Utils_.gson.fromJson(dvmPackage.packedConfigurationsJson, ConfigurationsJson.class);
for (ConfigurationJson configurationJson : configurationsJson.array) {
DVMPackageConfiguration dvmPackageConfiguration = new DVMPackageConfiguration();
dvmPackageConfiguration.dvmpackage_id = dvmPackage.id;
dvmPackageConfiguration.dvmconfiguration_id = configurationJson.id;
dvmPackageConfigurations_.add(dvmPackageConfiguration);
}
}
}
BeginTransaction();
for (DVMPackageConfiguration dvmPackageConfiguration: dvmPackageConfigurations_)
Insert(dvmPackageConfiguration);
Commit();
//--
Vector<SapforPackageConfiguration> sapforPackageConfigurations_ = new Vector<>();
for (SapforPackage sapforPackage: sapforPackages.Data.values()){
if (!sapforPackage.packedConfigurationsJson.isEmpty()) {
ConfigurationsJson configurationsJson = Utils_.gson.fromJson(sapforPackage.packedConfigurationsJson, ConfigurationsJson.class);
for (ConfigurationJson configurationJson : configurationsJson.array) {
SapforPackageConfiguration sapforPackageConfiguration = new SapforPackageConfiguration();
sapforPackageConfiguration.sapforpackage_id = sapforPackage.id;
sapforPackageConfiguration.sapforconfiguration_id = configurationJson.id;
sapforPackageConfigurations_.add(sapforPackageConfiguration);
}
}
}
BeginTransaction();
for (SapforPackageConfiguration sapforPackageConfiguration: sapforPackageConfigurations_)
Insert(sapforPackageConfiguration);
Commit();
/*
Vector<DVMConfigurationGroup> DVMConfigurationGroups=new Vector<>();
//группы dvm конфигураций