промежуточный. выкинул старые объекты и функционал. Осталось восстановить эксель, и отображение пакетов Сапфор
This commit is contained in:
@@ -3,14 +3,12 @@ import Common.Constants;
|
||||
import Common.Database.SQLITE.SQLiteDatabase;
|
||||
import GlobalData.Settings.SettingName;
|
||||
import TestingSystem.Common.Group.GroupsDBTable;
|
||||
import TestingSystem.Common.TSetting.TSetting;
|
||||
import TestingSystem.Common.TSetting.TSettingsDBTable;
|
||||
import TestingSystem.Common.Test.TestDBTable;
|
||||
import TestingSystem.Common.TestingPackageToKill.TestingPackagesToKillDBTable;
|
||||
import TestingSystem.DVM.Configuration.ConfigurationDBTable;
|
||||
import TestingSystem.DVM.DVMPackage.DVMPackage;
|
||||
import TestingSystem.DVM.DVMPackage.DVMPackageDBTable;
|
||||
import TestingSystem.DVM.DVMTasksSet.DVMRunTasksSet;
|
||||
import TestingSystem.DVM.DVMTasks.DVMRunTasksSet;
|
||||
import TestingSystem.DVM.TasksPackage.TasksPackageState;
|
||||
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationDBTable;
|
||||
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
|
||||
@@ -21,8 +19,6 @@ import Visual_DVM_2021.Passes.PassCode_2021;
|
||||
|
||||
import java.nio.file.Paths;
|
||||
public class TestsDatabase extends SQLiteDatabase {
|
||||
public TSettingsDBTable settings; //todo ВЫВЕСТИ
|
||||
///--
|
||||
public ConfigurationDBTable configurations;
|
||||
public TestDBTable tests;
|
||||
public GroupsDBTable groups;
|
||||
@@ -48,7 +44,6 @@ public class TestsDatabase extends SQLiteDatabase {
|
||||
addTable(tests = new TestDBTable());
|
||||
addTable(dvmPackages = new DVMPackageDBTable());
|
||||
addTable(sapforPackages = new SapforPackageDBTable());
|
||||
addTable(settings = new TSettingsDBTable());
|
||||
addTable(testingPackagesToKill = new TestingPackagesToKillDBTable());
|
||||
//-
|
||||
addTable(sapforConfigurations = new SapforConfigurationDBTable());
|
||||
@@ -56,30 +51,9 @@ public class TestsDatabase extends SQLiteDatabase {
|
||||
addTable(serverSapfors = new ServerSapforsDBTable());
|
||||
}
|
||||
@Override
|
||||
public void Init() throws Exception {
|
||||
if (!settings.containsKey(SettingName.DVMPackageMaxId))
|
||||
Insert(new TSetting(SettingName.DVMPackageMaxId, 0));
|
||||
//-
|
||||
if (!settings.containsKey(SettingName.SAPFORPackageId))
|
||||
Insert(new TSetting(SettingName.SAPFORPackageId, 0));
|
||||
//-
|
||||
if (!settings.containsKey(SettingName.TaskMaxId))
|
||||
Insert(new TSetting(SettingName.TaskMaxId, 0));
|
||||
//-
|
||||
if (!settings.containsKey(SettingName.SapforTaskMaxId))
|
||||
Insert(new TSetting(SettingName.SapforTaskMaxId, 0));
|
||||
}
|
||||
@Override
|
||||
public PassCode_2021 getSynchronizePassCode() {
|
||||
return PassCode_2021.SynchronizeTests;
|
||||
}
|
||||
public long IncKey(SettingName settingName) throws Exception {
|
||||
TSetting setting = settings.get(settingName);
|
||||
long res = setting.value;
|
||||
setting.value++;
|
||||
Update(setting);
|
||||
return res;
|
||||
}
|
||||
public DVMPackage getFirstActiveDVMPackage() {
|
||||
DVMPackage first_active = null;
|
||||
DVMPackage first_queued = null;
|
||||
|
||||
Reference in New Issue
Block a user