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

промежуточный. частичный рефакторинг с прицелом на библиотечную часть

Browse Source
This commit is contained in:
02090095
2024-10-07 00:58:29 +03:00
parent c211ffb82b
commit 6b1576461d
798 changed files with 3007 additions and 2344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/TestingSystem/Common/Configuration/Configuration.java
View File

@@ -1,8 +1,9 @@
package TestingSystem.Common.Configuration;
import Common.Database.DBObject;
import Common.Database.riDBObject;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject;
import Common.Utils.CommonUtils;
import Common.Utils.TextLog;
import Common.Utils.Utils;
import Common_old.Utils.Utils;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Group.Json.GroupsJson;
import TestingSystem.Common.Settings.Json.SettingsArrayJson;
@@ -33,7 +34,7 @@ public class Configuration extends riDBObject {
autoTesting = (autoTesting == 0) ? 1 : 0;
}
public ImageIcon GetAutoIcon() {
return Utils.getIcon("/icons/" + (autoTesting == 1 ? "RedPick" : "NotPick") + ".png");
return Utils.getIcon("/Common/icons/" + (autoTesting == 1 ? "RedPick" : "NotPick") + ".png");
}
//--
@Description("DEFAULT ''")
@@ -44,13 +45,13 @@ public class Configuration extends riDBObject {
public String packedSettingsJson = "";
//--
public void saveGroupsAsJson(Vector<Group> groups) {
packedGroupsJson = Utils.jsonToPrettyFormat(Utils.gson.toJson(new GroupsJson(groups)));
packedGroupsJson = CommonUtils.gson.toJson(new GroupsJson(groups));
}
public void saveTestsAsJson(Vector<Test> tests) {
packedTestsJson = Utils.jsonToPrettyFormat(Utils.gson.toJson(new TestsJson(tests)));
packedTestsJson = CommonUtils.gson.toJson(new TestsJson(tests));
}
public void saveSettingsAsJson(Vector<Settings> settings) {
packedSettingsJson = Utils.jsonToPrettyFormat(Utils.gson.toJson(new SettingsArrayJson(settings)));
packedSettingsJson = CommonUtils.gson.toJson(new SettingsArrayJson(settings));
}
//--
@Override

12
src/TestingSystem/Common/Group/Group.java
View File

@@ -1,10 +1,10 @@
package TestingSystem.Common.Group;
import Common.Current;
import Common.Database.DBObject;
import Common.Database.riDBObject;
import Common.Global;
import Common.UI.UI;
import Common.Utils.Utils;
import Common_old.Current;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject;
import _VisualDVM.Global;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
import ProjectData.Files.ProjectFile;
import ProjectData.LanguageName;
import TestingSystem.Common.Test.Test;

20
src/TestingSystem/Common/Group/GroupsDBTable.java
View File

@@ -1,9 +1,15 @@
package TestingSystem.Common.Group;
import Common.Current;
import Common.Database.*;
import Common.UI.DataSetControlForm;
import Common.UI.UI;
import Common.UI.Windows.Dialog.DBObjectDialog;
import Common_old.Current;
import Common_old.UI.DataSetControlForm;
import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Visual.DBObjectFilter;
import Common.Visual.DataSetFilter;
import ProjectData.LanguageName;
import TestingSystem.Common.Group.UI.GroupFields;
import TestingSystem.Common.Test.Test;
@@ -19,11 +25,11 @@ public class GroupsDBTable extends iDBTable<Group> {
//------------------------------------------------>>>
@Override
protected void createFilters() {
filters.add(new DataSetFilter<Group>("Тип", this) {
filters.add(new Common.Visual.DataSetFilter<Group>("Тип", this) {
@Override
public void fill() {
for (TestType type : TestType.values())
field_filters.add(new DBObjectFilter<Group>(dataSet, type.getDescription()) {
field_filters.add(new Common.Visual.DBObjectFilter<Group>(dataSet, type.getDescription()) {
@Override
protected boolean validate(Group object) {
return object.type.equals(type);

9
src/TestingSystem/Common/Group/GroupsMenuBar.java
View File

@@ -1,9 +1,8 @@
package TestingSystem.Common.Group;
import Common.Global;
import Common.UI.Menus_2023.DataMenuBar;
import Common.UI.Menus_2023.MenuBarButton;
import Common.Utils.Utils;
import TestingSystem.Common.Group.GroupsDBTable;
import _VisualDVM.Global;
import Common_old.UI.Menus_2023.DataMenuBar;
import Common_old.UI.Menus_2023.MenuBarButton;
import Common_old.Utils.Utils;
import TestingSystem.Common.Group.UI.AddGroupMenu;
import TestingSystem.Common.Group.UI.EditGroupMenu;
import Visual_DVM_2021.Passes.PassCode_2021;

1
src/TestingSystem/Common/Group/Json/GroupJson.java
View File

@@ -1,5 +1,4 @@
package TestingSystem.Common.Group.Json;
import Common.Utils.Utils;
import TestingSystem.Common.Group.Group;
import com.google.gson.annotations.Expose;
public class GroupJson {

2
src/TestingSystem/Common/Group/UI/AddGroupMenu.java
View File

@@ -1,5 +1,5 @@
package TestingSystem.Common.Group.UI;
import Common.UI.Menus_2023.VisualiserMenu;
import Common_old.UI.Menus_2023.VisualiserMenu;
import Visual_DVM_2021.Passes.PassCode_2021;
public class AddGroupMenu extends VisualiserMenu {
public AddGroupMenu() {

3
src/TestingSystem/Common/Group/UI/EditGroupMenu.java
View File

@@ -1,7 +1,6 @@
package TestingSystem.Common.Group.UI;
import Common.UI.Menus_2023.VisualiserMenu;
import Common_old.UI.Menus_2023.VisualiserMenu;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
public class EditGroupMenu extends VisualiserMenu {
public EditGroupMenu() {
super("", "/icons/Edit.png" );

4
src/TestingSystem/Common/Group/UI/GroupFields.java
View File

@@ -1,6 +1,6 @@
package TestingSystem.Common.Group.UI;
import Common.UI.TextField.StyledTextField;
import Common.UI.Windows.Dialog.DialogFields;
import Common_old.UI.TextField.StyledTextField;
import Common_old.UI.Windows.Dialog.DialogFields;
import ProjectData.LanguageName;
import TestingSystem.Common.Test.TestType;

15
src/TestingSystem/Common/MachineProcess/MachineProcess.java
View File

@@ -1,10 +1,11 @@
package TestingSystem.Common.MachineProcess;
import Common.Constants;
import Common.Current;
import Common.Database.DBObject;
import Common.Global;
import Common.GlobalProperties;
import Common.Utils.Utils;
import Common.Utils.CommonUtils;
import Common_old.Constants;
import Common_old.Current;
import Common.Database.Objects.DBObject;
import _VisualDVM.Global;
import Common_old.GlobalProperties;
import Common_old.Utils.Utils;
import TestingSystem.DVM.DVMPackage.DVMPackage;
import org.apache.commons.io.FileUtils;
@@ -101,7 +102,7 @@ public class MachineProcess extends DBObject {
GlobalProperties properties = new GlobalProperties(Global.properties);
properties.Mode = //isLocal()?Current.Mode.LocalMachineQueue:
Current.Mode.MachineQueue;
Utils.jsonToFile(properties, new File(workspace, "properties"));
CommonUtils.jsonToFile(properties, new File(workspace, "properties"));
Vector<String> args = new Vector<>();
args.add(Utils.DQuotes(machineAddress));
args.add(Utils.DQuotes(machinePort));

2
src/TestingSystem/Common/MachineProcess/MachineProcessSet.java
View File

@@ -1,5 +1,5 @@
package TestingSystem.Common.MachineProcess;
import Common.Database.DataSet;
import Common.Database.Tables.DataSet;
import TestingSystem.DVM.DVMPackage.DVMPackage;
import java.util.LinkedHashMap;

4
src/TestingSystem/Common/Settings/Settings.java
View File

@@ -1,6 +1,6 @@
package TestingSystem.Common.Settings;
import Common.Database.DBObject;
import Common.Database.riDBObject;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject;
import Common.Utils.TextLog;
//предопределенный набор настроек тестируемой системы. сохраняется для упрощения.
public abstract class Settings extends riDBObject {

6
src/TestingSystem/Common/TasksPackageState.java
View File

@@ -1,9 +1,7 @@
package TestingSystem.Common;
import Common.Current;
import Common.UI.StatusEnum;
import Common.UI.Themes.VisualiserFonts;
import Common_old.UI.StatusEnum;
import Common_old.UI.Themes.VisualiserFonts;
import java.awt.*;
import java.util.Arrays;
import java.util.Vector;
import java.util.stream.Collectors;

14
src/TestingSystem/Common/Test/Test.java
View File

@@ -1,11 +1,11 @@
package TestingSystem.Common.Test;
import Common.Constants;
import Common.Current;
import Common.Database.DBObject;
import Common.Database.riDBObject;
import Common.Global;
import Common.UI.UI;
import Common.Utils.Utils;
import Common_old.Constants;
import Common_old.Current;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject;
import _VisualDVM.Global;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
import ProjectData.Files.FileState;
import ProjectData.Files.FileType;
import ProjectData.Files.ProjectFile;

9
src/TestingSystem/Common/Test/TestDBTable.java
View File

@@ -1,9 +1,8 @@
package TestingSystem.Common.Test;
import Common.Current;
import Common.Database.iDBTable;
import Common.Global;
import Common.UI.DataSetControlForm;
import Common.UI.Windows.Dialog.DBObjectDialog;
import Common_old.Current;
import Common.Database.Tables.iDBTable;
import Common_old.UI.DataSetControlForm;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.UI.TestFields;

2
src/TestingSystem/Common/Test/TestsMenuBar.java
View File

@@ -1,5 +1,5 @@
package TestingSystem.Common.Test;
import Common.UI.Menus_2023.DataMenuBar;
import Common_old.UI.Menus_2023.DataMenuBar;
import TestingSystem.Common.Test.UI.AddTestMenu;
import TestingSystem.Common.Test.UI.EditTestMenu;
import Visual_DVM_2021.Passes.PassCode_2021;

2
src/TestingSystem/Common/Test/UI/AddTestMenu.java
View File

@@ -1,5 +1,5 @@
package TestingSystem.Common.Test.UI;
import Common.UI.Menus_2023.VisualiserMenu;
import Common_old.UI.Menus_2023.VisualiserMenu;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
public class AddTestMenu extends VisualiserMenu {

2
src/TestingSystem/Common/Test/UI/EditTestMenu.java
View File

@@ -1,5 +1,5 @@
package TestingSystem.Common.Test.UI;
import Common.UI.Menus_2023.VisualiserMenu;
import Common_old.UI.Menus_2023.VisualiserMenu;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
public class EditTestMenu extends VisualiserMenu {

4
src/TestingSystem/Common/Test/UI/TestFields.java
View File

@@ -1,6 +1,6 @@
package TestingSystem.Common.Test.UI;
import Common.UI.TextField.StyledTextField;
import Common.UI.Windows.Dialog.DialogFields;
import Common_old.UI.TextField.StyledTextField;
import Common_old.UI.Windows.Dialog.DialogFields;
import javax.swing.*;
import java.awt.*;

14
src/TestingSystem/Common/TestingBar.java
View File

@@ -1,11 +1,11 @@
package TestingSystem.Common;
import Common.Current;
import Common.Global;
import Common.UI.Menus_2023.MenuBarButton;
import Common.UI.Menus_2023.VisualiserMenuBar;
import Common.UI.Themes.VisualiserFonts;
import Common.UI.UI;
import Common.Utils.Utils;
import Common_old.Current;
import _VisualDVM.Global;
import Common_old.UI.Menus_2023.MenuBarButton;
import Common_old.UI.Menus_2023.VisualiserMenuBar;
import Common_old.UI.Themes.VisualiserFonts;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
import Visual_DVM_2021.Passes.PassCode_2021;
import javax.swing.*;

15
src/TestingSystem/Common/TestingPackage/TestingPackage.java
View File

@@ -1,10 +1,9 @@
package TestingSystem.Common.TestingPackage;
import Common.Constants;
import Common.Database.DBObject;
import Common.Database.riDBObject;
import Common.Utils.Utils;
import Common.Utils.CommonUtils;
import Common_old.Constants;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject;
import TestingSystem.Common.Configuration.Configuration;
import TestingSystem.Common.Configuration.Json.ConfigurationJson;
import TestingSystem.Common.Configuration.Json.ConfigurationsJson;
import TestingSystem.Common.TasksPackageState;
import com.sun.org.glassfish.gmbal.Description;
@@ -72,17 +71,17 @@ public abstract class TestingPackage<J> extends riDBObject {
return new File(getLocalWorkspace(), Constants.LOADED);
}
public void saveJson() throws Exception {
Utils.jsonToFile(package_json, getJsonFile());
CommonUtils.jsonToFile(package_json, getJsonFile());
}
public void readJson() throws Exception {
package_json = (J) Utils.jsonFromFile(getJsonFile(), getJsonClass());
package_json = (J) CommonUtils.jsonFromFile(getJsonFile(), getJsonClass());
}
public void destructor() {
package_json = null;
}
//----------------------------------------------------------
public void saveConfigurationsAsJson(Vector<? extends Configuration> configurations) {
packedConfigurationsJson = Utils.jsonToPrettyFormat(Utils.gson.toJson(new ConfigurationsJson(configurations)));
packedConfigurationsJson = CommonUtils.gson.toJson(new ConfigurationsJson(configurations));
}
//определить завершен пакет с ошибками или нет.
public void checkFinishState() throws Exception{

5
src/TestingSystem/Common/TestingPackageToKill/TestingPackageToKill.java
View File

@@ -1,7 +1,6 @@
package TestingSystem.Common.TestingPackageToKill;
import Common.Constants;
import Common.Database.iDBObject;
import TestingSystem.DVM.DVMPackage.DVMPackage;
import Common_old.Constants;
import Common.Database.Objects.iDBObject;
public class TestingPackageToKill extends iDBObject {
public int packageId = Constants.Nan;
public int type = 0; // 0 - dvm /1 - sapfor

2
src/TestingSystem/Common/TestingPackageToKill/TestingPackagesToKillDBTable.java
View File

@@ -1,5 +1,5 @@
package TestingSystem.Common.TestingPackageToKill;
import Common.Database.iDBTable;
import Common.Database.Tables.iDBTable;
public class TestingPackagesToKillDBTable extends iDBTable<TestingPackageToKill> {
public TestingPackagesToKillDBTable() {
super(TestingPackageToKill.class);

9
src/TestingSystem/Common/TestingPlanner.java
View File

@@ -1,8 +1,8 @@
package TestingSystem.Common;
import Common.Constants;
import Common.Current;
import Common.Global;
import Common.Utils.Utils;
import Common_old.Constants;
import Common_old.Current;
import _VisualDVM.Global;
import Common_old.Utils.Utils;
import GlobalData.Machine.Machine;
import GlobalData.Machine.MachineType;
import GlobalData.User.User;
@@ -11,7 +11,6 @@ import Repository.Server.ServerCode;
import TestingSystem.Common.TestingPackage.TestingPackage;
import TestingSystem.Common.TestingPackageToKill.TestingPackageToKill;
import Repository.RepositoryClient;
import Visual_DVM_2021.Passes.PassException;
import Visual_DVM_2021.UI.Interface.Loggable;
import javafx.util.Pair;
import org.apache.commons.io.FileUtils;

13
src/TestingSystem/Common/TestingServer.java
View File

@@ -1,9 +1,10 @@
package TestingSystem.Common;
import Common.Constants;
import Common.Database.DBObject;
import Common.Global;
import Common.Utils.CommonUtils;
import Common_old.Constants;
import Common.Database.Objects.DBObject;
import _VisualDVM.Global;
import Common.Utils.TextLog;
import Common.Utils.Utils;
import Common_old.Utils.Utils;
import GlobalData.Account.Account;
import ProjectData.LanguageName;
import Repository.Component.Sapfor.Sapfor;
@@ -487,7 +488,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
File json = dvmPackage.getJsonFile();
if (!json.exists())
throw new RepositoryRefuseException("Не найден JSON файл для пакета задач DVM " + Utils.Brackets(package_id));
jsons.add((DVMPackage_json) Utils.jsonFromFile(json, DVMPackage_json.class));
jsons.add((DVMPackage_json) CommonUtils.jsonFromFile(json, DVMPackage_json.class));
}
response = new ServerExchangeUnit_2021(ServerCode.OK);
response.object = jsons;
@@ -502,7 +503,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
File json = sapforPackage.getJsonFile();
if (!json.exists())
throw new RepositoryRefuseException("Не найден JSON файл для пакета задач SAPFOR " + Utils.Brackets(package_id));
jsons.add((SapforPackage_json) Utils.jsonFromFile(json, SapforPackage_json.class));
jsons.add((SapforPackage_json) CommonUtils.jsonFromFile(json, SapforPackage_json.class));
}
response = new ServerExchangeUnit_2021(ServerCode.OK);
response.object = jsons;

6
src/TestingSystem/Common/TestsDatabase.java
View File

@@ -1,9 +1,9 @@
package TestingSystem.Common;
import Common.Constants;
import Common_old.Constants;
import Common.Database.SQLITE.SQLiteDatabase;
import Common.Global;
import _VisualDVM.Global;
import Common.Utils.TextLog;
import Common.Utils.Utils;
import Common_old.Utils.Utils;
import GlobalData.Account.Account;
import Repository.Component.Sapfor.Sapfor;
import Repository.RepositoryRefuseException;

2
src/TestingSystem/Common/ThreadsPlanner/ThreadsPlanner.java
View File

@@ -1,5 +1,5 @@
package TestingSystem.Common.ThreadsPlanner;
import Common.Global;
import _VisualDVM.Global;
import Common.Utils.InterruptThread;
import org.apache.commons.io.FileUtils;