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

процесс рефакторинга. Так как нужно запускать тесты на многих флагах, понадобилось внести дополнительные объекты.

Browse Source
This commit is contained in:
02090095
2023-09-27 00:43:23 +03:00
parent 0026701347
commit 42338700f4
25 changed files with 297 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/GlobalData/GlobalDatabase.java
View File

@@ -33,10 +33,11 @@ import GlobalData.Tasks.CompilationTask.CompilationTasksDBTable;
import GlobalData.Tasks.RunTask.RunTasksDBTable;
import GlobalData.User.UsersDBTable;
import Repository.Component.ComponentType;
import SapforTestingSystem.SapforScenario.SapforScenariosDBTable;
import SapforTestingSystem.SapforTask.SapforTaskResult;
import SapforTestingSystem.SapforTask.SapforTask_2023;
import SapforTestingSystem.SapforTask.SapforTask;
import SapforTestingSystem.SapforTask.SapforTasksDBTable;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackagesDBTable;
import TestingSystem.TaskKey.TaskKeysDBTable;
import Visual_DVM_2021.PassStats.PassStatsDBTable;
@@ -74,6 +75,7 @@ public class GlobalDatabase extends SQLiteDatabase {
//-
public TaskKeysDBTable tasksKeys;
//---------
public SapforScenariosDBTable sapforScenarios;
public SapforTasksPackagesDBTable sapforTasksPackages;
public SapforTasksDBTable sapforTasks = null;
public SapforProfilesDBTable sapforProfiles = null;
@@ -107,6 +109,7 @@ public class GlobalDatabase extends SQLiteDatabase {
addTable(grids = new GridsDBTable());
addTable(tasksKeys = new TaskKeysDBTable());
//--
addTable(sapforScenarios = new SapforScenariosDBTable());
addTable(sapforTasksPackages = new SapforTasksPackagesDBTable());
addTable(sapforTasks = new SapforTasksDBTable());
//--
@@ -156,16 +159,16 @@ public class GlobalDatabase extends SQLiteDatabase {
Global.properties.Update();
return res;
}
public LinkedHashMap<Long, SapforTask_2023> getSapforPackageTasks(int package_id) throws Exception {
LinkedHashMap<Long, SapforTask_2023> res = new LinkedHashMap<>();
for (SapforTask_2023 task : sapforTasks.Data.values()) {
public LinkedHashMap<Long, SapforTask> getSapforPackageTasks(int package_id) throws Exception {
LinkedHashMap<Long, SapforTask> res = new LinkedHashMap<>();
for (SapforTask task : sapforTasks.Data.values()) {
if (task.sapfortaskspackage_2023_id == package_id) {
res.put(task.id, task);
}
}
return res;
}
public DataSet<String, SapforTaskResult> getSapforPackagesMasterDataSet(SapforTasksPackage_2023 package_in) throws Exception {
public DataSet<String, SapforTaskResult> getSapforPackagesMasterDataSet(SapforTasksPackage package_in) throws Exception {
DataSet<String, SapforTaskResult> res = new DataSet<String, SapforTaskResult>(String.class, SapforTaskResult.class) {
@Override
protected DataSetControlForm createUI() {
@@ -204,13 +207,13 @@ public class GlobalDatabase extends SQLiteDatabase {
return Current.SapforEtalonTaskResult;
}
};
for (SapforTask_2023 task : sapforTasks.Data.values())
for (SapforTask task : sapforTasks.Data.values())
if (task.sapfortaskspackage_2023_id == package_in.id)
res.put(task.test_description, new SapforTaskResult(package_in, task));
return res;
}
//--
public DataSet<String, SapforTaskResult> getSapforPackagesSlaveDataSet(SapforTasksPackage_2023 package_in) throws Exception {
public DataSet<String, SapforTaskResult> getSapforPackagesSlaveDataSet(SapforTasksPackage package_in) throws Exception {
DataSet<String, SapforTaskResult> res = new DataSet<String, SapforTaskResult>(String.class, SapforTaskResult.class) {
@Override
protected DataSetControlForm createUI() {
@@ -222,7 +225,7 @@ public class GlobalDatabase extends SQLiteDatabase {
}
@Override
public void MouseAction2() throws Exception {
Pass_2021.passes.get(PassCode_2021.OpenSapforTest).Do(Current.SapforTaskResult);
Pass_2021.passes.get(PassCode_2021.OpenSapforTest).Do(Current.SapforTaskResult);
}
@Override
public void ShowCurrentObject() throws Exception {
@@ -253,7 +256,7 @@ public class GlobalDatabase extends SQLiteDatabase {
return Current.SapforTaskResult;
}
};
for (SapforTask_2023 task : sapforTasks.Data.values())
for (SapforTask task : sapforTasks.Data.values())
if (task.sapfortaskspackage_2023_id == package_in.id)
res.put(task.test_description, new SapforTaskResult(package_in, task));
return res;