no message
This commit is contained in:
@@ -10,8 +10,8 @@ import _VisualDVM.Passes.PassCode;
|
||||
import _VisualDVM.ServerObjectsCache.VisualCaches;
|
||||
import _VisualDVM.TestingSystem.Common.Group.Group;
|
||||
import _VisualDVM.TestingSystem.Common.Group.GroupsDBTable;
|
||||
import _VisualDVM.TestingSystem.Common.Test.Json.TestFileJson;
|
||||
import _VisualDVM.TestingSystem.Common.Test.Json.TestFilesJson;
|
||||
import _VisualDVM.TestingSystem.Common.Group.Json.GroupJson;
|
||||
import _VisualDVM.TestingSystem.Common.Group.Json.GroupsJson;
|
||||
import _VisualDVM.TestingSystem.Common.Test.Test;
|
||||
import _VisualDVM.TestingSystem.Common.Test.TestDBTable;
|
||||
import _VisualDVM.TestingSystem.Common.TestFile.TestFile;
|
||||
@@ -19,10 +19,14 @@ import _VisualDVM.TestingSystem.Common.TestFile.TestFilesDBTable;
|
||||
import _VisualDVM.TestingSystem.Common.TestingPackageToKill.TestingPackagesToKillDBTable;
|
||||
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.DVMPackage.DVMPackage;
|
||||
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackageDBTable;
|
||||
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettingsDBTable;
|
||||
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTasksSet;
|
||||
import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationGroup.SapforConfigurationGroup;
|
||||
import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationGroup.SapforConfigurationGroupsDBTable;
|
||||
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
|
||||
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationDBTable;
|
||||
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
|
||||
@@ -41,42 +45,48 @@ import java.util.Comparator;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Vector;
|
||||
public class TestsDatabase extends SQLiteDatabase {
|
||||
public DVMConfigurationDBTable dvmConfigurations;
|
||||
public GroupsDBTable groups;
|
||||
//--
|
||||
public TestDBTable tests;
|
||||
public TestFilesDBTable testsFiles;
|
||||
public GroupsDBTable groups;
|
||||
//---
|
||||
public DVMSettingsDBTable dvmSettings;
|
||||
public DVMConfigurationDBTable dvmConfigurations;
|
||||
public DVMConfigurationGroupsDBTable dvmConfigurationGroups;
|
||||
public DVMPackageDBTable dvmPackages;
|
||||
public DVMRunTasksSet dvmRunTasks = new DVMRunTasksSet();
|
||||
//--
|
||||
public ServerSapforsDBTable serverSapfors;
|
||||
public SapforSettingsDBTable sapforSettings;
|
||||
public SapforSettingsCommandsDBTable sapforSettingsCommands;
|
||||
public SapforConfigurationDBTable sapforConfigurations;
|
||||
public SapforConfigurationGroupsDBTable sapforConfigurationsGroups;
|
||||
public SapforPackageDBTable sapforPackages;
|
||||
//--
|
||||
public TestingPackagesToKillDBTable testingPackagesToKill;
|
||||
//--
|
||||
public SapforConfigurationDBTable sapforConfigurations;
|
||||
//----
|
||||
public ServerSapforsDBTable serverSapfors;
|
||||
//---
|
||||
public DVMRunTasksSet dvmRunTasks = new DVMRunTasksSet(); //задачи текущего пакета тестирования DVM
|
||||
public SapforSettingsDBTable sapforSettings;
|
||||
public SapforSettingsCommandsDBTable sapforSettingsCommands;
|
||||
//--
|
||||
public DVMSettingsDBTable dvmSettings;
|
||||
public TestsDatabase() {
|
||||
super(Paths.get(System.getProperty("user.dir"), "Data", Constants.tests_db_name + ".sqlite").toFile());
|
||||
}
|
||||
@Override
|
||||
protected void initAllTables() throws Exception {
|
||||
addTable(dvmConfigurations = new DVMConfigurationDBTable());
|
||||
addTable(groups = new GroupsDBTable());
|
||||
addTable(tests = new TestDBTable());
|
||||
addTable(testsFiles = new TestFilesDBTable());
|
||||
//--
|
||||
addTable(dvmSettings = new DVMSettingsDBTable());
|
||||
addTable(dvmConfigurations = new DVMConfigurationDBTable());
|
||||
addTable(dvmConfigurationGroups = new DVMConfigurationGroupsDBTable());
|
||||
addTable(dvmPackages = new DVMPackageDBTable());
|
||||
addTable(sapforPackages = new SapforPackageDBTable());
|
||||
addTable(testingPackagesToKill = new TestingPackagesToKillDBTable());
|
||||
//-
|
||||
addTable(sapforConfigurations = new SapforConfigurationDBTable());
|
||||
addTable(serverSapfors = new ServerSapforsDBTable());
|
||||
addTable(sapforSettings = new SapforSettingsDBTable());
|
||||
addTable(sapforSettingsCommands = new SapforSettingsCommandsDBTable());
|
||||
addTable(dvmSettings = new DVMSettingsDBTable());
|
||||
addTable(sapforConfigurations = new SapforConfigurationDBTable());
|
||||
addTable(sapforConfigurationsGroups = new SapforConfigurationGroupsDBTable());
|
||||
addTable(sapforPackages = new SapforPackageDBTable());
|
||||
//--
|
||||
addTable(testingPackagesToKill = new TestingPackagesToKillDBTable());
|
||||
}
|
||||
@Override
|
||||
public PassCode getSynchronizePassCode() {
|
||||
@@ -359,28 +369,40 @@ public class TestsDatabase extends SQLiteDatabase {
|
||||
Delete(file);
|
||||
}
|
||||
public void Patch() throws Exception{
|
||||
//файлы тестов.
|
||||
/*
|
||||
Vector<TestFile> testFiles = new Vector<>();
|
||||
for (Test test:tests.Data.values()){
|
||||
TestFilesJson json = Utils_.gson.fromJson(test.packedFilesJson, TestFilesJson.class);
|
||||
for (TestFileJson testFileJson: json.values){
|
||||
TestFile testFile = new TestFile();
|
||||
//-
|
||||
testFile.test_id = test.id;
|
||||
testFile.name = testFileJson.name;
|
||||
testFile.style = testFileJson.style;
|
||||
testFile.languageName = testFileJson.language;
|
||||
testFile.fileType= testFileJson.type;
|
||||
//--
|
||||
testFiles.add(testFile);
|
||||
/*
|
||||
Vector<DVMConfigurationGroup> DVMConfigurationGroups=new Vector<>();
|
||||
//группы dvm конфигураций
|
||||
for (DVMConfiguration dvmConfiguration: dvmConfigurations.Data.values()){
|
||||
GroupsJson groupsJson = Utils_.gson.fromJson(dvmConfiguration.packedGroupsJson, GroupsJson.class);
|
||||
for (GroupJson groupJson: groupsJson.array){
|
||||
DVMConfigurationGroup dvmConfigurationGroup = new DVMConfigurationGroup();
|
||||
dvmConfigurationGroup.group_id = groupJson.id;
|
||||
dvmConfigurationGroup.dvmconfiguration_id = dvmConfiguration.id;
|
||||
DVMConfigurationGroups.add(dvmConfigurationGroup);
|
||||
}
|
||||
}
|
||||
BeginTransaction();
|
||||
for (TestFile testFile: testFiles){
|
||||
Insert(testFile);
|
||||
}
|
||||
for (DVMConfigurationGroup dvmConfigurationGroup: DVMConfigurationGroups)
|
||||
Insert(dvmConfigurationGroup);
|
||||
Commit();
|
||||
*/
|
||||
*/
|
||||
//---
|
||||
/*
|
||||
Vector<SapforConfigurationGroup> sapforConfigurationGroups =new Vector<>();
|
||||
//группы sapfor конфигураций
|
||||
for (SapforConfiguration sapforConfiguration: sapforConfigurations.Data.values()){
|
||||
GroupsJson groupsJson = Utils_.gson.fromJson(sapforConfiguration.packedGroupsJson, GroupsJson.class);
|
||||
for (GroupJson groupJson: groupsJson.array){
|
||||
SapforConfigurationGroup sapforConfigurationGroup = new SapforConfigurationGroup();
|
||||
sapforConfigurationGroup.group_id = groupJson.id;
|
||||
sapforConfigurationGroup.sapforconfiguration_id = sapforConfiguration.id;
|
||||
sapforConfigurationGroups.add(sapforConfigurationGroup);
|
||||
}
|
||||
}
|
||||
BeginTransaction();
|
||||
for (SapforConfigurationGroup sapforConfigurationGroup: sapforConfigurationGroups)
|
||||
Insert(sapforConfigurationGroup);
|
||||
Commit();
|
||||
*/
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user