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
2023-10-06 01:03:55 +03:00
parent 6376f72a45
commit e95ca3e179
8 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.idea/workspace.xml generated
View File

@@ -7,7 +7,14 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforScenario/SapforScenariosDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforScenario/SapforScenariosDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTestsOnServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTestsOnServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

15
src/GlobalData/GlobalDatabase.java
View File

@@ -33,11 +33,8 @@ import GlobalData.Tasks.CompilationTask.CompilationTasksDBTable;
import GlobalData.Tasks.RunTask.RunTasksDBTable; import GlobalData.Tasks.RunTask.RunTasksDBTable;
import GlobalData.User.UsersDBTable; import GlobalData.User.UsersDBTable;
import Repository.Component.ComponentType; import Repository.Component.ComponentType;
import SapforTestingSystem.SapforScenario.SapforScenariosDBTable;
import SapforTestingSystem.SapforTask.SapforTaskResult; import SapforTestingSystem.SapforTask.SapforTaskResult;
import SapforTestingSystem.SapforTask.SapforTasksDBTable;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage; import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackagesDBTable;
import TestingSystem.TaskKey.TaskKeysDBTable; import TestingSystem.TaskKey.TaskKeysDBTable;
import Visual_DVM_2021.PassStats.PassStatsDBTable; import Visual_DVM_2021.PassStats.PassStatsDBTable;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
@@ -74,9 +71,9 @@ public class GlobalDatabase extends SQLiteDatabase {
//- //-
public TaskKeysDBTable tasksKeys; public TaskKeysDBTable tasksKeys;
//--------- //---------
public SapforScenariosDBTable sapforScenarios; // public SapforScenariosDBTable sapforScenarios;
public SapforTasksPackagesDBTable sapforTasksPackages; // public SapforTasksPackagesDBTable sapforTasksPackages;
public SapforTasksDBTable sapforTasks = null; // public SapforTasksDBTable sapforTasks = null;
public SapforProfilesDBTable sapforProfiles = null; public SapforProfilesDBTable sapforProfiles = null;
//--------- //---------
public SapforProfileSettingsDBTable sapforProfilesSettings = null; public SapforProfileSettingsDBTable sapforProfilesSettings = null;
@@ -108,9 +105,9 @@ public class GlobalDatabase extends SQLiteDatabase {
addTable(grids = new GridsDBTable()); addTable(grids = new GridsDBTable());
addTable(tasksKeys = new TaskKeysDBTable()); addTable(tasksKeys = new TaskKeysDBTable());
//-- //--
addTable(sapforScenarios = new SapforScenariosDBTable()); // addTable(sapforScenarios = new SapforScenariosDBTable());
addTable(sapforTasksPackages = new SapforTasksPackagesDBTable()); // addTable(sapforTasksPackages = new SapforTasksPackagesDBTable());
addTable(sapforTasks = new SapforTasksDBTable()); // addTable(sapforTasks = new SapforTasksDBTable());
//-- //--
addTable(sapforProfiles = new SapforProfilesDBTable()); addTable(sapforProfiles = new SapforProfilesDBTable());
addTable(sapforProfilesSettings = new SapforProfileSettingsDBTable()); addTable(sapforProfilesSettings = new SapforProfileSettingsDBTable());

5
src/SapforTestingSystem/SapforConfiguration/SapforConfigurationDBTable.java
View File

@@ -1,7 +1,6 @@
package SapforTestingSystem.SapforConfiguration; package SapforTestingSystem.SapforConfiguration;
import Common.Current; import Common.Current;
import Common.Database.*; import Common.Database.*;
import Common.Global;
import Common.UI.DataSetControlForm; import Common.UI.DataSetControlForm;
import Common.UI.Windows.Dialog.DBObjectDialog; import Common.UI.Windows.Dialog.DBObjectDialog;
import Common.Utils.Utils; import Common.Utils.Utils;
@@ -35,12 +34,12 @@ public class SapforConfigurationDBTable extends DBTable<String, SapforConfigurat
@Override @Override
public void ShowCurrentObject() throws Exception { public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject(); super.ShowCurrentObject();
Global.db.sapforTasksPackages.ShowUI(); // Global.db.sapforTasksPackages.ShowUI();
} }
@Override @Override
public void ShowNoCurrentObject() throws Exception { public void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject(); super.ShowNoCurrentObject();
Global.db.sapforTasksPackages.ClearUI(); // Global.db.sapforTasksPackages.ClearUI();
} }
}; };
} }

6
src/SapforTestingSystem/SapforScenario/SapforScenariosDBTable.java
View File

@@ -1,11 +1,9 @@
package SapforTestingSystem.SapforScenario; package SapforTestingSystem.SapforScenario;
import Common.Current; import Common.Current;
import Common.Database.*; import Common.Database.iDBTable;
import Common.UI.DataSetControlForm; import Common.UI.DataSetControlForm;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import java.util.Date; import java.util.Date;
import java.util.LinkedHashMap;
import static Common.UI.Tables.TableRenderers.RendererDate; import static Common.UI.Tables.TableRenderers.RendererDate;
import static Common.UI.Tables.TableRenderers.RendererStatusEnum; import static Common.UI.Tables.TableRenderers.RendererStatusEnum;
@@ -76,10 +74,12 @@ public class SapforScenariosDBTable extends iDBTable<SapforScenario> {
return null; return null;
} }
} }
/*
@Override @Override
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() { public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>(); LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
res.put(SapforTasksPackage.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE)); res.put(SapforTasksPackage.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
return res; return res;
} }
*/
} }

7
src/Visual_DVM_2021/Passes/All/StartSapforTests.java
View File

@@ -28,6 +28,8 @@ import java.nio.file.Paths;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Vector; import java.util.Vector;
import java.util.stream.Collectors; import java.util.stream.Collectors;
//НЕАКТУАЛЬНО, ВСЕ НА СЕРВЕРЕ
public class StartSapforTests extends Pass_2021<SapforScenario> { public class StartSapforTests extends Pass_2021<SapforScenario> {
protected int allTasksCount = 0; protected int allTasksCount = 0;
//-- //--
@@ -285,10 +287,11 @@ public class StartSapforTests extends Pass_2021<SapforScenario> {
} }
@Override @Override
protected void showFinish() throws Exception { protected void showFinish() throws Exception {
Global.db.sapforScenarios.ShowUI(target.getPK()); Pass_2021.passes.get(PassCode_2021.SynchronizeTests).Do();
// Global.testingServer.db.sapforScenarios.ShowUI(target.getPK());
} }
@Override @Override
protected void showDone() throws Exception { protected void showDone() throws Exception {
Global.db.sapforScenarios.ShowUI(); // Global.db.sapforScenarios.ShowUI();
} }
} }

2
src/Visual_DVM_2021/Passes/All/StartSapforTestsOnServer.java
View File

@@ -184,6 +184,6 @@ public class StartSapforTestsOnServer extends TestingSystemPass<SapforServerScen
@Override @Override
protected void performFinish() throws Exception { protected void performFinish() throws Exception {
super.performFinish(); super.performFinish();
// passes.get(PassCode_2021.SynchronizeTests).Do(); passes.get(PassCode_2021.SynchronizeTests).Do();
} }
} }

1
src/Visual_DVM_2021/Passes/All/SynchronizeTests.java
View File

@@ -52,6 +52,7 @@ public class SynchronizeTests extends TestingSystemPass<Object> {
server.db.configurations.ShowUI(); server.db.configurations.ShowUI();
server.db.groups.ShowUI(); server.db.groups.ShowUI();
server.db.sapforConfigurations.ShowUI(); server.db.sapforConfigurations.ShowUI();
server.db.sapforScenarios.ShowUI();
server.db.RestoreLastSelections(); server.db.RestoreLastSelections();
UI.getMainWindow().getTestingWindow().ShowCheckedTestsCount(); UI.getMainWindow().getTestingWindow().ShowCheckedTestsCount();
//для отображения числа ядер. //для отображения числа ядер.

6
src/Visual_DVM_2021/UI/Main/TestingForm.java
View File

@@ -153,8 +153,8 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
Global.testingServer.db.sapforConfigurations.mountUI(sapforConfigurationsPanel); Global.testingServer.db.sapforConfigurations.mountUI(sapforConfigurationsPanel);
Global.testingServer.db.sapforConfigurationCommands.mountUI(sapforConfigurationCommandsPanel); Global.testingServer.db.sapforConfigurationCommands.mountUI(sapforConfigurationCommandsPanel);
Global.testingServer.db.serverSapfors.mountUI(serverSapforsPanel); Global.testingServer.db.serverSapfors.mountUI(serverSapforsPanel);
Global.db.sapforScenarios.mountUI(sapforScenariosPanel); Global.testingServer.db.sapforScenarios.mountUI(sapforScenariosPanel);
Global.db.sapforTasksPackages.mountUI(sapforPackagesPanel); Global.testingServer.db.sapforTasksPackages.mountUI(sapforPackagesPanel);
//Global.db.sapforTasks.mountUI(sapforTasksPanel); //Global.db.sapforTasks.mountUI(sapforTasksPanel);
// Global.testingServer.account_db.sapforTasksPackages.mountUI(sapforPackagesPanel); // Global.testingServer.account_db.sapforTasksPackages.mountUI(sapforPackagesPanel);
@@ -191,7 +191,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
Global.testingServer.account_db.packages.ShowUI(); Global.testingServer.account_db.packages.ShowUI();
Global.testingServer.db.serverSapfors.ShowUI(); Global.testingServer.db.serverSapfors.ShowUI();
Global.testingServer.db.sapforConfigurations.ShowUI(); Global.testingServer.db.sapforConfigurations.ShowUI();
Global.db.sapforScenarios.ShowUI(); Global.testingServer.db.sapforScenarios.ShowUI();
} }
//- //-
@Override @Override