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-11-17 00:04:21 +03:00
parent 1ff88fc5fb
commit beb1359544
132 changed files with 617 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

137
.idea/workspace.xml generated
View File

@@ -7,19 +7,138 @@
</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 afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteGroup.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishServerSapfor.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTestProject.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Current.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Current.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Global.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestingBar/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestingBar/TestingBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/RunTask/RunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/RunTask/RunTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/User/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/User.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Files/DBProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/DBProjectFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Project/db_project_info.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/ServerSapfor/ServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/ServerSapfor/ServerSapfor.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforConfiguration_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTasksPackage_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforTasksPackage_json.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedGroups.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTasksResults_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforTasksResults_json.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTest_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforTest_json.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PackageModeSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfiguration/SapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationInterface.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommand.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommandInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandInterface.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/MatchState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/MatchState.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/SapforTasksDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/ConfigurationSummary.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/ConfigurationSummary.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/GroupSummary.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/GroupSummary.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/MatchesSummary.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/MatchesSummary.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/PackageSummary.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/PackageSummary.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/SapforPackageTreeNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/SapforTasksPackageTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/StateSummary.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/TreeSummary.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/TreeSummary.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/VersionSummary.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/VersionSummary.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/ServerSapfor/ServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/ServerSapfor/ServerSapforsDBTable.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/TaskThread.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/TaskThread.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Configuration/Configuration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/Configuration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Configuration/ConfigurationInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/ConfigurationInterface.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Configuration/UI/ConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/UI/ConfigurationDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Configuration/UI/ConfigurationFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/UI/ConfigurationFields.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Configuration/UI/ConfigurationFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/UI/ConfigurationFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Group/Group.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Group/GroupInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/Group.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Group/UI/GroupFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/UI/GroupFields.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Group/UI/GroupFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/UI/GroupFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/TSetting/TSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TSetting/TSetting.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/TSetting/TSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TSetting/TSettingsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Tasks/TestCompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Tasks/TestCompilationTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Tasks/TestCompilationTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Tasks/TestCompilationTasksDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Tasks/TestRunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Tasks/TestRunTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Tasks/TestRunTaskInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Tasks/TestRunTaskInterface.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Tasks/TestRunTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Tasks/TestRunTasksDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Tasks/TestTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Tasks/TestTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/TasksDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TasksDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/TasksPackage/TasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/TasksPackage/TasksPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackageDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/TasksPackage/TasksPackageState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackageState.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/TasksPackageToKill/TasksPackageToKill.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TasksPackageToKill/TasksPackageToKill.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/TasksPackageToKill/TasksPackageToKillDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TasksPackageToKill/TasksPackageToKillDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Test/ProjectFiles_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/ProjectFiles_json.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Test/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/Test.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Test/TestDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/TestDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Test/TestInterface.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Test/TestType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/TestType.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Test/UI/TestFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/UI/TestFields.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Test/UI/TestFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/UI/TestFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/TestsSupervisor_2022/TestsSupervisor_2022.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/TestsSupervisor_2022.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/UserConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortSelectedPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortSelectedPackages.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteGroup.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteGroup.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedConfigurations.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditConfigurationOnServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditConfigurationOnServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditGroup.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditGroup.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommand.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommandOnServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommandOnServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationOnServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationOnServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditTestOnServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditTestOnServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PauseTesting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PauseTesting.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PlayTesting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PlayTesting.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishGroup.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishGroup.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishSapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishSapforConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishSapforConfigurationCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishSapforConfigurationCommand.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishServerSapfor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.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/StartTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SwitchTestingEmail.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SwitchTestingEmail.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTestsTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTestsTasks.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UnpackSapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UnpackSapforTasksPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/EditServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/EditServerObject.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/TestingSystemPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/TestingSystemPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestRunTasksComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestRunTasksComparisonForm.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" />
@@ -61,7 +180,7 @@
<setting file="file://$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTest.java" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTest.java" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishGroup.java" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishGroup.java" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/src/TestingSystem/TestingServer.java" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" root0="FORCE_HIGHLIGHTING" />
</component> </component>
<component name="KotlinCodeInsightWorkspaceSettings"> <component name="KotlinCodeInsightWorkspaceSettings">
<option name="optimizeImportsOnTheFly" value="true" /> <option name="optimizeImportsOnTheFly" value="true" />
@@ -117,11 +236,11 @@
<recent name="C:\Users\misha\Documents\visual_dvm_2020\src\icons\Editor" /> <recent name="C:\Users\misha\Documents\visual_dvm_2020\src\icons\Editor" />
</key> </key>
<key name="MoveMembersDialog.RECENTS_KEY"> <key name="MoveMembersDialog.RECENTS_KEY">
<recent name="TestingSystem.Group.GroupsDBTable" />
<recent name="Common.Constants" /> <recent name="Common.Constants" />
<recent name="SapforTestingSystem.SapforTask.SapforTask" /> <recent name="SapforTestingSystem.SapforTask.SapforTask" />
<recent name="TestingSystem.TestingServer" /> <recent name="TestingSystem.TestingServer" />
<recent name="Common.Constants.Constants" /> <recent name="Common.Constants.Constants" />
<recent name="Constants" />
</key> </key>
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="C:\Users\misha\Documents\visual_dvm_2020\src\Visual_DVM_2021\Passes\UI" /> <recent name="C:\Users\misha\Documents\visual_dvm_2020\src\Visual_DVM_2021\Passes\UI" />

42
src/Common/Current.java
View File

@@ -18,12 +18,12 @@ import ProjectData.SapforData.Functions.FuncInfo;
import ProjectData.SapforData.Regions.ParallelRegion; import ProjectData.SapforData.Regions.ParallelRegion;
import Repository.BugReport.BugReport; import Repository.BugReport.BugReport;
import Repository.Subscribes.Subscriber; import Repository.Subscribes.Subscriber;
import SapforTestingSystem.SapforConfiguration.SapforConfiguration; import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import TestingSystem.Configuration.Configuration; import TestingSystem.DVM.Configuration.Configuration;
import TestingSystem.Tasks.TestCompilationTask; import TestingSystem.DVM.Tasks.TestCompilationTask;
import TestingSystem.Tasks.TestRunTask; import TestingSystem.DVM.Tasks.TestRunTask;
import TestingSystem.TasksPackage.TasksPackage; import TestingSystem.DVM.TasksPackage.TasksPackage;
import TestingSystem.Test.Test; import TestingSystem.Common.Test.Test;
import Visual_DVM_2021.Passes.UI.PassForm; import Visual_DVM_2021.Passes.UI.PassForm;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
@@ -224,22 +224,22 @@ public enum Current {
public static boolean HasGroup() { public static boolean HasGroup() {
return get(Current.Group) != null; return get(Current.Group) != null;
} }
public static TestingSystem.Group.Group getGroup() { public static TestingSystem.Common.Group.Group getGroup() {
return (TestingSystem.Group.Group) get(Current.Group); return (TestingSystem.Common.Group.Group) get(Current.Group);
} }
//-- //--
public static boolean HasConfiguration() { public static boolean HasConfiguration() {
return get(Current.Configuration) != null; return get(Current.Configuration) != null;
} }
public static TestingSystem.Configuration.Configuration getConfiguration() { public static TestingSystem.DVM.Configuration.Configuration getConfiguration() {
return (Configuration) get(Current.Configuration); return (Configuration) get(Current.Configuration);
} }
public static SapforConfiguration getSapforConfiguration() { public static SapforConfiguration getSapforConfiguration() {
return (SapforTestingSystem.SapforConfiguration.SapforConfiguration) get(Current.SapforConfiguration); return (TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration) get(Current.SapforConfiguration);
} }
//-- //--
public static Test getTest() { public static Test getTest() {
return (TestingSystem.Test.Test) get(Current.Test); return (TestingSystem.Common.Test.Test) get(Current.Test);
} }
public static boolean HasTest() { public static boolean HasTest() {
return get(Current.Test) != null; return get(Current.Test) != null;
@@ -248,7 +248,7 @@ public enum Current {
return get(Current.Version) != null; return get(Current.Version) != null;
} }
public static TestCompilationTask getTestCompilationTask() { public static TestCompilationTask getTestCompilationTask() {
return (TestingSystem.Tasks.TestCompilationTask) get(Current.TestCompilationTask); return (TestingSystem.DVM.Tasks.TestCompilationTask) get(Current.TestCompilationTask);
} }
public static boolean HasTestCompilationTask() { public static boolean HasTestCompilationTask() {
return get(Current.TestCompilationTask) != null; return get(Current.TestCompilationTask) != null;
@@ -257,7 +257,7 @@ public enum Current {
return get(Current.TestRunTask) != null; return get(Current.TestRunTask) != null;
} }
public static TestRunTask getTestRunTask() { public static TestRunTask getTestRunTask() {
return (TestingSystem.Tasks.TestRunTask) get(Current.TestRunTask); return (TestingSystem.DVM.Tasks.TestRunTask) get(Current.TestRunTask);
} }
public static RemoteFile getComponentServerBackup() { public static RemoteFile getComponentServerBackup() {
return (RemoteFile) get(Current.ComponentServerBackup); return (RemoteFile) get(Current.ComponentServerBackup);
@@ -332,8 +332,8 @@ public enum Current {
public static boolean HasSapforTask() { public static boolean HasSapforTask() {
return get(Current.SapforTask) != null; return get(Current.SapforTask) != null;
} }
public static SapforTestingSystem.SapforTask.SapforTask getSapforTask() { public static TestingSystem.SAPFOR.SapforTask.SapforTask getSapforTask() {
return (SapforTestingSystem.SapforTask.SapforTask) get(Current.SapforTask); return (TestingSystem.SAPFOR.SapforTask.SapforTask) get(Current.SapforTask);
} }
public static ProjectData.ProjectView getProjectView() { public static ProjectData.ProjectView getProjectView() {
return (ProjectData.ProjectView) get(ProjectView); return (ProjectData.ProjectView) get(ProjectView);
@@ -360,8 +360,8 @@ public enum Current {
public static boolean CheckID(Current name, int id) { public static boolean CheckID(Current name, int id) {
return (get(name) != null) && (((iDBObject) get(name)).id == id); return (get(name) != null) && (((iDBObject) get(name)).id == id);
} }
public static SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand getSapforConfigurationCommand() { public static TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand getSapforConfigurationCommand() {
return (SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand) get(Current.SapforConfigurationCommand); return (TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand) get(Current.SapforConfigurationCommand);
} }
public static boolean HasSapforProfile() { public static boolean HasSapforProfile() {
return get(Current.SapforProfile) != null; return get(Current.SapforProfile) != null;
@@ -372,15 +372,15 @@ public enum Current {
public static boolean HasSapforTasksPackage() { public static boolean HasSapforTasksPackage() {
return get(Current.SapforTasksPackage) != null; return get(Current.SapforTasksPackage) != null;
} }
public static SapforTestingSystem.SapforTasksPackage.SapforTasksPackage getSapforTasksPackage() { public static TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage getSapforTasksPackage() {
return (SapforTestingSystem.SapforTasksPackage.SapforTasksPackage) get(Current.SapforTasksPackage); return (TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage) get(Current.SapforTasksPackage);
} }
//сапфоры установленные на тестовый сервер. //сапфоры установленные на тестовый сервер.
public static boolean HasServerSapfor() { public static boolean HasServerSapfor() {
return get(Current.ServerSapfor) != null; return get(Current.ServerSapfor) != null;
} }
public static SapforTestingSystem.ServerSapfor.ServerSapfor getServerSapfor() { public static TestingSystem.SAPFOR.ServerSapfor.ServerSapfor getServerSapfor() {
return (SapforTestingSystem.ServerSapfor.ServerSapfor) get(Current.ServerSapfor); return (TestingSystem.SAPFOR.ServerSapfor.ServerSapfor) get(Current.ServerSapfor);
} }
//-------------------------------------------- //--------------------------------------------
public String getDescription() { public String getDescription() {

4
src/Common/Global.java
View File

@@ -13,8 +13,8 @@ import Repository.Component.Sapfor.MessagesServer;
import Repository.Component.Sapfor.Sapfor_F; import Repository.Component.Sapfor.Sapfor_F;
import Repository.Component.Sapfor.TransformationPermission; import Repository.Component.Sapfor.TransformationPermission;
import Repository.Server.ComponentsServer; import Repository.Server.ComponentsServer;
import SapforTestingSystem.PackageModeSupervisor.PackageModeSupervisor; import TestingSystem.SAPFOR.PackageModeSupervisor;
import TestingSystem.TestingServer; import TestingSystem.Common.TestingServer;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021; import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.UI.Interface.Loggable; import Visual_DVM_2021.UI.Interface.Loggable;

6
src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java
View File

@@ -3,7 +3,7 @@ import Common.Global;
import Common.UI.Menus_2023.DataMenuBar; import Common.UI.Menus_2023.DataMenuBar;
import Common.UI.Menus_2023.MenuBarButton; import Common.UI.Menus_2023.MenuBarButton;
import Common.Utils.Utils; import Common.Utils.Utils;
import TestingSystem.Group.GroupInterface; import TestingSystem.Common.Group.GroupsDBTable;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import javax.swing.*; import javax.swing.*;
@@ -21,13 +21,13 @@ public class GroupsMenuBar extends DataMenuBar {
setToolTipText("Отображать только группы тестов авторства пользователя"); setToolTipText("Отображать только группы тестов авторства пользователя");
Mark(); Mark();
addActionListener(e -> { addActionListener(e -> {
GroupInterface.filterMyOnly = !GroupInterface.filterMyOnly; GroupsDBTable.filterMyOnly = !GroupsDBTable.filterMyOnly;
Mark(); Mark();
Global.testingServer.db.groups.ShowUI(); Global.testingServer.db.groups.ShowUI();
}); });
} }
public void Mark() { public void Mark() {
setIcon(Utils.getIcon(GroupInterface.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png")); setIcon(Utils.getIcon(GroupsDBTable.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png"));
} }
}); });
} }

2
src/Common/UI/Menus_2023/TestingBar/TestingBar.java
View File

@@ -6,7 +6,7 @@ import Common.UI.Menus_2023.VisualiserMenuBar;
import Common.UI.Themes.VisualiserFonts; import Common.UI.Themes.VisualiserFonts;
import Common.UI.UI; import Common.UI.UI;
import Common.Utils.Utils; import Common.Utils.Utils;
import TestingSystem.TestingServer; import TestingSystem.Common.TestingServer;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import javax.swing.*; import javax.swing.*;

22
src/Common/UI/UI.java
View File

@@ -57,7 +57,7 @@ import GlobalData.Tasks.RunTask.RunTasksDBTable;
import GlobalData.User.UsersDBTable; import GlobalData.User.UsersDBTable;
import ProjectData.DBArray.ArraysDBTable; import ProjectData.DBArray.ArraysDBTable;
import ProjectData.Files.UI.FilesTreeCellRenderer; import ProjectData.Files.UI.FilesTreeCellRenderer;
import SapforTestingSystem.SapforTasksPackage.UI.SapforVersionsTreeCellRenderer; import TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforVersionsTreeCellRenderer;
import ProjectData.Project.UI.VersionsTreeCellRenderer; import ProjectData.Project.UI.VersionsTreeCellRenderer;
import ProjectData.SapforData.Arrays.ArraysSet; import ProjectData.SapforData.Arrays.ArraysSet;
import ProjectData.SapforData.Arrays.UI.DimensionRenderer; import ProjectData.SapforData.Arrays.UI.DimensionRenderer;
@@ -69,16 +69,16 @@ import ProjectData.SapforData.Variants.VariantsSet;
import Repository.BugReport.BugReportsDBTable; import Repository.BugReport.BugReportsDBTable;
import Repository.Component.UI.ComponentsForm; import Repository.Component.UI.ComponentsForm;
import Repository.Subscribes.SubsribersDBTable; import Repository.Subscribes.SubsribersDBTable;
import SapforTestingSystem.SapforConfiguration.SapforConfigurationDBTable; import TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationDBTable;
import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommandsDBTable; import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
import SapforTestingSystem.SapforTask.SapforTasksDBTable; import TestingSystem.SAPFOR.SapforTask.SapforTasksDBTable;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackagesDBTable; import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackagesDBTable;
import SapforTestingSystem.ServerSapfor.ServerSapforsDBTable; import TestingSystem.SAPFOR.ServerSapfor.ServerSapforsDBTable;
import TestingSystem.Configuration.UI.ConfigurationDBTable; import TestingSystem.DVM.Configuration.UI.ConfigurationDBTable;
import TestingSystem.Group.GroupsDBTable; import TestingSystem.Common.Group.GroupsDBTable;
import TestingSystem.Tasks.TestRunTasksDBTable; import TestingSystem.DVM.Tasks.TestRunTasksDBTable;
import TestingSystem.TasksPackage.TasksPackageDBTable; import TestingSystem.DVM.TasksPackage.TasksPackageDBTable;
import TestingSystem.Test.TestDBTable; import TestingSystem.Common.Test.TestDBTable;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.UI.Interface.DebugWindow; import Visual_DVM_2021.UI.Interface.DebugWindow;
import Visual_DVM_2021.UI.Interface.VersionsWindow; import Visual_DVM_2021.UI.Interface.VersionsWindow;

2
src/GlobalData/Tasks/RunTask/RunTask.java
View File

@@ -10,7 +10,7 @@ import GlobalData.Tasks.CompilationTask.CompilationTask;
import GlobalData.Tasks.Task; import GlobalData.Tasks.Task;
import GlobalData.Tasks.TaskState; import GlobalData.Tasks.TaskState;
import ProjectData.Project.db_project_info; import ProjectData.Project.db_project_info;
import TestingSystem.Tasks.TestRunTaskInterface; import TestingSystem.DVM.Tasks.TestRunTaskInterface;
import com.sun.org.glassfish.gmbal.Description; import com.sun.org.glassfish.gmbal.Description;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;

2
src/GlobalData/User/User.java
View File

@@ -3,7 +3,7 @@ import Common.Constants;
import Common.Current; import Common.Current;
import Common.Database.iDBObject; import Common.Database.iDBObject;
import GlobalData.Machine.Machine; import GlobalData.Machine.Machine;
import TestingSystem.UserConnection; import TestingSystem.DVM.UserConnection;
import Visual_DVM_2021.Passes.SSH.ConnectionPass; import Visual_DVM_2021.Passes.SSH.ConnectionPass;
import com.sun.org.glassfish.gmbal.Description; import com.sun.org.glassfish.gmbal.Description;

15
src/ProjectData/Files/DBProjectFile.java
View File

@@ -472,4 +472,19 @@ public class DBProjectFile extends ProjectFile {
} }
return res; return res;
} }
//---
public String getStyleOptions() {
if (languageName == LanguageName.fortran) {
switch (style) {
case fixed:
case extended:
return "-FI";
case free:
return "-f90";
case none:
break;
}
}
return "";
}
} }

7
src/ProjectData/Project/db_project_info.java
View File

@@ -31,9 +31,8 @@ import ProjectData.SapforData.Regions.ParallelRegion;
import ProjectData.SapforData.Regions.RegionsSet; import ProjectData.SapforData.Regions.RegionsSet;
import ProjectData.SapforData.Variants.ParallelVariant; import ProjectData.SapforData.Variants.ParallelVariant;
import ProjectData.SapforData.Variants.VariantsSet; import ProjectData.SapforData.Variants.VariantsSet;
import TestingSystem.Test.ProjectFiles_json; import TestingSystem.Common.Test.ProjectFiles_json;
import TestingSystem.Test.Test; import TestingSystem.Common.Test.Test;
import TestingSystem.Test.TestInterface;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassException; import Visual_DVM_2021.Passes.PassException;
import com.mxgraph.swing.mxGraphComponent; import com.mxgraph.swing.mxGraphComponent;
@@ -212,7 +211,7 @@ public class db_project_info extends DBObject {
} }
//для запуска тестов. //для запуска тестов.
public db_project_info(Test test) throws Exception { public db_project_info(Test test) throws Exception {
Home = TestInterface.getServerPath(test); Home = test.getServerPath();
//- //-
CheckVisualiserDirectories(); CheckVisualiserDirectories();
db = new ProjectDatabase(this); db = new ProjectDatabase(this);

1
src/Repository/Server/ServerCode.java
View File

@@ -79,4 +79,5 @@ public enum ServerCode {
OLD, OLD,
//- //-
PublishAIObject, //публикация объекта с автоинкрементом. PublishAIObject, //публикация объекта с автоинкрементом.
PublishTestProject, //отправка теста на сервер в архиве.
} }

6
src/SapforTestingSystem/PerformSapforTask.java
View File

@@ -4,9 +4,9 @@ import Common.Global;
import Common.Utils.Utils; import Common.Utils.Utils;
import GlobalData.Tasks.TaskState; import GlobalData.Tasks.TaskState;
import ProjectData.Messages.Errors.MessageError; import ProjectData.Messages.Errors.MessageError;
import SapforTestingSystem.Json.SapforConfiguration_json; import TestingSystem.SAPFOR.Json.SapforConfiguration_json;
import SapforTestingSystem.Json.SapforVersion_json; import TestingSystem.SAPFOR.Json.SapforVersion_json;
import SapforTestingSystem.SapforTask.SapforTask; import TestingSystem.SAPFOR.SapforTask.SapforTask;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021; import Visual_DVM_2021.Passes.Pass_2021;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;

121
src/SapforTestingSystem/ServerSapfor/ServerSapforsDBTable.java
View File

@@ -1,121 +0,0 @@
package SapforTestingSystem.ServerSapfor;
import Common.Current;
import Common.Database.iDBTable;
import Common.UI.DataSetControlForm;
import Common.UI.Tables.TableRenderers;
public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
public ServerSapforsDBTable() {
super(ServerSapfor.class);
}
@Override
public String getSingleDescription() {
return "SAPFOR";
}
@Override
public String getPluralDescription() {
return "SAPFOR";
}
@Override
public Current CurrentName() {
return Current.ServerSapfor;
}
@Override
public String[] getUIColumnNames() {
return new String[]{"версия", "дата сборки"};
}
@Override
public Object getFieldAt(ServerSapfor object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.version;
case 2:
return object.getBuildDate();
}
return null;
}
@Override
protected DataSetControlForm createUI() {
return new DataSetControlForm(this) {
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
columns.get(2).setRenderer(TableRenderers.RendererDate);
}
};
}
//---
/*
@Override
public DBObjectDialog<RemoteSapfor, RemoteSapforFields> getDialog() {
return new DBObjectDialog<RemoteSapfor, RemoteSapforFields>(RemoteSapforFields.class) {
@Override
public void validateFields() {
//<editor-fold desc="расположение">
String home = fields.tfHome.getText();
if (!home.isEmpty()) {
if (home.startsWith("/")) {
if (Utils.ContainsCyrillic(home))
Log.Writeln("Расположение системы SAPFOR не может содержать кириллицу");
else {
new PathValidator(home, "Расположение системы SAPFOR", Log).Validate();
}
} else
Log.Writeln("Расположение системы SAPFOR может быть либо пустой строкой, либо путём к файлу");
}
//</editor-fold>
//<editor-fold desc="команда вызова">
String call_command = fields.tfCallCommand.getText();
if (call_command.isEmpty()) Log.Writeln("Команда вызова системы SAPFOR не может быть пустой");
else if (Utils.ContainsCyrillic(call_command))
Log.Writeln("Команда вызова системы SAPFOR не может содержать кириллицу");
else {
switch (call_command.charAt(0)) {
case ' ':
Log.Writeln("Команда вызова системы SAPFOR не может начинаться с пробела.");
break;
case '/':
if (call_command.endsWith("/"))
Log.Writeln("Каталог не может быть указан в качестве команды.");
else new PathValidator(call_command, "Команда вызова системы SAPFOR", Log).Validate();
break;
default:
//это команда.
//самое опасное место. теоретически тут можно ввести любую команду ОС, в том числе rm -rf
if (call_command.contains(" "))
Log.Writeln("Прямая команда вызова системы SAPFOR не может содержать пробелы");
if (!call_command.contains("+") && Utils.ContainsForbiddenName(call_command))
Log.Writeln("Прямая команда вызова системы SAPFOR содержит запрещённые символы");
else {
if (Utils.isLinuxSystemCommand(call_command))
Log.Writeln(Utils.DQuotes(call_command) + " является системной командой Linux");
}
break;
}
}
//</editor-fold>
}
@Override
public void fillFields() {
fields.tfDescription.setText(Result.description);
fields.tfCallCommand.setText(Result.call_command);
fields.tfHome.setText(Result.home_path);
UI.TrySelect(fields.cbLanguageName, Result.languageName);
fields.tfVersion.setText(Result.version);
fields.events_on = true;
}
@Override
public void ProcessResult() {
Result.machine_id = Current.getMachine().id;
Result.description = fields.tfDescription.getText();
Result.call_command = fields.tfCallCommand.getText();
Result.home_path = fields.tfHome.getText();
Result.languageName = (LanguageName) fields.cbLanguageName.getSelectedItem();
Result.version = fields.tfVersion.getText();
}
@Override
public int getDefaultHeight() {
return 300;
}
};
*/
}

4
src/SapforTestingSystem/TaskThread.java
View File

@@ -1,6 +1,6 @@
package SapforTestingSystem; package SapforTestingSystem;
import SapforTestingSystem.Json.SapforConfiguration_json; import TestingSystem.SAPFOR.Json.SapforConfiguration_json;
import SapforTestingSystem.SapforTask.SapforTask; import TestingSystem.SAPFOR.SapforTask.SapforTask;
import java.io.File; import java.io.File;
public class TaskThread extends Thread { public class TaskThread extends Thread {

94
src/TestingSystem/Group/GroupInterface.java → src/TestingSystem/Common/Group/Group.java
View File

@@ -1,55 +1,33 @@
package TestingSystem.Group; package TestingSystem.Common.Group;
import Common.Current; import Common.Current;
import Common.Database.DBObject;
import Common.Database.riDBObject;
import Common.Global; import Common.Global;
import Common.UI.UI;
import Common.Utils.Utils; import Common.Utils.Utils;
import ProjectData.Files.DBProjectFile; import ProjectData.Files.DBProjectFile;
import ProjectData.LanguageName; import ProjectData.LanguageName;
import ProjectData.Project.db_project_info; import ProjectData.Project.db_project_info;
import TestingSystem.Common.Test.TestType;
import com.sun.org.glassfish.gmbal.Description;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Vector; import java.util.Vector;
//dynamic cats возможен через рефлексию. public class Group extends riDBObject {
//https://stackoverflow.com/questions/2127318/java-how-can-i-do-dynamic-casting-of-a-variable-from-one-type-to-another @Description("DEFAULT 'Default'")
public class GroupInterface { public TestType type = TestType.Default;
//- @Description("DEFAULT 'fortran'")
public static boolean filterMyOnly = false; public LanguageName language = LanguageName.fortran;
//-- //--
public static boolean isVisible(Group object) { @Description("IGNORE")
return (!filterMyOnly || Current.getAccount().email.equals(object.sender_address)) && public LinkedHashMap<String, byte[]> testsFiles = new LinkedHashMap<>(); //транспорт.
Global.testingServer.db.groups.applyFilters(object); //--
} @Override
public static String getStyleOptions(DBProjectFile program) { public boolean isVisible() {
if (program.languageName == LanguageName.fortran) { return (!GroupsDBTable.filterMyOnly || Current.getAccount().email.equals(sender_address)) &&
switch (program.style) { Global.testingServer.db.groups.applyFilters(this);
case fixed:
case extended:
return "-FI";
case free:
return "-f90";
case none:
break;
}
}
return "";
}
public static String getLanguageCompileCommand(LanguageName language) {
switch (language) {
case fortran:
return "f";
case c:
return "c";
}
return "";
}
public static String getLanguageLinkCommand(LanguageName language) {
switch (language) {
case fortran:
return "flink";
case c:
return "clink";
}
return "";
} }
//-
public static void generateForLanguage( public static void generateForLanguage(
String dvm_drv, String dvm_drv,
LinkedHashMap<LanguageName, Vector<DBProjectFile>> programs, LinkedHashMap<LanguageName, Vector<DBProjectFile>> programs,
@@ -75,7 +53,7 @@ public class GroupInterface {
String.join(" ", String.join(" ",
Utils.MFVar(LANG_ + "COMMAND"), Utils.MFVar(LANG_ + "COMMAND"),
Utils.MFVar(LANG_ + "FLAGS"), Utils.MFVar(LANG_ + "FLAGS"),
getStyleOptions(program), program.getStyleOptions(),
"-c", "-c",
program.getQSourceName(), program.getQSourceName(),
"-o", "-o",
@@ -85,7 +63,7 @@ public class GroupInterface {
} }
titles.add(String.join("\n", titles.add(String.join("\n",
LANG_ + "COMMAND=" + Utils.DQuotes(dvm_drv) + " " + LANG_ + "COMMAND=" + Utils.DQuotes(dvm_drv) + " " +
getLanguageCompileCommand(language), language.getDVMCompile(),
LANG_ + "FLAGS=" + flags_in, LANG_ + "FLAGS=" + flags_in,
LANG_ + "OBJECTS=" + String.join(" ", module_objects), LANG_ + "OBJECTS=" + String.join(" ", module_objects),
"" ""
@@ -94,7 +72,7 @@ public class GroupInterface {
bodies.add(module_body); bodies.add(module_body);
} }
} }
public static String GenerateMakefile(Group object, db_project_info project, String dvm_drv, String flags_in) { public String GenerateMakefile(db_project_info project, String dvm_drv, String flags_in) {
//----->> //----->>
LinkedHashMap<LanguageName, Vector<DBProjectFile>> programs = project.getPrograms(); LinkedHashMap<LanguageName, Vector<DBProjectFile>> programs = project.getPrograms();
Vector<String> titles = new Vector<>(); Vector<String> titles = new Vector<>();
@@ -102,11 +80,11 @@ public class GroupInterface {
Vector<String> bodies = new Vector<>(); Vector<String> bodies = new Vector<>();
String binary = Utils.DQuotes("0"); String binary = Utils.DQuotes("0");
//----->> //----->>
generateForLanguage(dvm_drv, programs, object.language, titles, objects, bodies, flags_in); generateForLanguage(dvm_drv, programs, language, titles, objects, bodies, flags_in);
//----->> //----->>
return String.join("\n", return String.join("\n",
"LINK_COMMAND=" + Utils.DQuotes(dvm_drv) + " " + "LINK_COMMAND=" + Utils.DQuotes(dvm_drv) + " " +
getLanguageLinkCommand(object.language), language.getDVMLink(),
"LINK_FLAGS=" + flags_in + "\n", "LINK_FLAGS=" + flags_in + "\n",
String.join("\n", titles), String.join("\n", titles),
"all: " + binary, "all: " + binary,
@@ -114,7 +92,27 @@ public class GroupInterface {
"\t" + Utils.MFVar("LINK_COMMAND") + " " + Utils.MFVar("LINK_FLAGS") + " " + String.join(" ", objects) + " -o " + binary, "\t" + Utils.MFVar("LINK_COMMAND") + " " + Utils.MFVar("LINK_FLAGS") + " " + String.join(" ", objects) + " -o " + binary,
String.join(" ", bodies)); String.join(" ", bodies));
} }
public static String getSummary(Group group) { public String getSummary() {
return group.description + " " + group.language.getDescription(); return description + " " + language.getDescription();
}
//-
@Override
public void SynchronizeFields(DBObject src) {
super.SynchronizeFields(src);
Group g = (Group) src;
type = g.type;
language = g.language;
}
public Group(Group group) {
this.SynchronizeFields(group);
}
public Group() {
}
@Override
public void select(boolean flag) {
super.select(flag);
if (Current.hasUI())
UI.getMainWindow().ShowCheckedTestsCount();
} }
} }

9
src/TestingSystem/Group/GroupsDBTable.java → src/TestingSystem/Common/Group/GroupsDBTable.java
View File

@@ -1,4 +1,4 @@
package TestingSystem.Group; package TestingSystem.Common.Group;
import Common.Current; import Common.Current;
import Common.Database.*; import Common.Database.*;
import Common.UI.DataSetControlForm; import Common.UI.DataSetControlForm;
@@ -7,15 +7,16 @@ import Common.UI.Menus_2023.VisualiserMenu;
import Common.UI.UI; import Common.UI.UI;
import Common.UI.Windows.Dialog.DBObjectDialog; import Common.UI.Windows.Dialog.DBObjectDialog;
import ProjectData.LanguageName; import ProjectData.LanguageName;
import TestingSystem.Group.UI.GroupFields; import TestingSystem.Common.Group.UI.GroupFields;
import TestingSystem.Test.Test; import TestingSystem.Common.Test.Test;
import TestingSystem.Test.TestType; import TestingSystem.Common.Test.TestType;
import javax.swing.*; import javax.swing.*;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Vector; import java.util.Vector;
//- //-
public class GroupsDBTable extends iDBTable<Group> { public class GroupsDBTable extends iDBTable<Group> {
public static boolean filterMyOnly = false;
public Vector<TableFilter<Group>> typeFilters; public Vector<TableFilter<Group>> typeFilters;
public Vector<TableFilter<Group>> languageFilters; public Vector<TableFilter<Group>> languageFilters;
//------------------------------------------------>>> //------------------------------------------------>>>

2
src/TestingSystem/Group/UI/GroupFields.form → src/TestingSystem/Common/Group/UI/GroupFields.form
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="TestingSystem.Group.UI.GroupFields"> <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="TestingSystem.Common.Group.UI.GroupFields">
<grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> <grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/> <margin top="0" left="0" bottom="0" right="0"/>
<constraints> <constraints>

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

@@ -1,8 +1,8 @@
package TestingSystem.Group.UI; package TestingSystem.Common.Group.UI;
import Common.UI.TextField.StyledTextField; import Common.UI.TextField.StyledTextField;
import Common.UI.Windows.Dialog.DialogFields; import Common.UI.Windows.Dialog.DialogFields;
import ProjectData.LanguageName; import ProjectData.LanguageName;
import TestingSystem.Test.TestType; import TestingSystem.Common.Test.TestType;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;

2
src/TestingSystem/TSetting/TSetting.java → src/TestingSystem/Common/TSetting/TSetting.java
View File

@@ -1,4 +1,4 @@
package TestingSystem.TSetting; package TestingSystem.Common.TSetting;
import Common.Database.DBObject; import Common.Database.DBObject;
import GlobalData.Settings.SettingName; import GlobalData.Settings.SettingName;
import com.sun.org.glassfish.gmbal.Description; import com.sun.org.glassfish.gmbal.Description;

2
src/TestingSystem/TSetting/TSettingsDBTable.java → src/TestingSystem/Common/TSetting/TSettingsDBTable.java
View File

@@ -1,4 +1,4 @@
package TestingSystem.TSetting; package TestingSystem.Common.TSetting;
import Common.Database.DBTable; import Common.Database.DBTable;
public class TSettingsDBTable extends DBTable<String, TSetting> { public class TSettingsDBTable extends DBTable<String, TSetting> {
public TSettingsDBTable() { public TSettingsDBTable() {

28
src/TestingSystem/TasksDatabase.java → src/TestingSystem/Common/TasksDatabase.java
View File

@@ -1,21 +1,21 @@
package TestingSystem; package TestingSystem.Common;
import Common.Constants; import Common.Constants;
import Common.Database.SQLITE.SQLiteDatabase; import Common.Database.SQLITE.SQLiteDatabase;
import Common.Global; import Common.Global;
import GlobalData.Settings.SettingName; import GlobalData.Settings.SettingName;
import SapforTestingSystem.SapforTask.SapforTasksDBTable; import TestingSystem.SAPFOR.SapforTask.SapforTasksDBTable;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage; import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackagesDBTable; import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackagesDBTable;
import TestingSystem.TSetting.TSetting; import TestingSystem.Common.TSetting.TSetting;
import TestingSystem.TSetting.TSettingsDBTable; import TestingSystem.Common.TSetting.TSettingsDBTable;
import TestingSystem.Tasks.TestCompilationTask; import TestingSystem.DVM.Tasks.TestCompilationTask;
import TestingSystem.Tasks.TestCompilationTasksDBTable; import TestingSystem.DVM.Tasks.TestCompilationTasksDBTable;
import TestingSystem.Tasks.TestRunTask; import TestingSystem.DVM.Tasks.TestRunTask;
import TestingSystem.Tasks.TestRunTasksDBTable; import TestingSystem.DVM.Tasks.TestRunTasksDBTable;
import TestingSystem.TasksPackage.TasksPackage; import TestingSystem.DVM.TasksPackage.TasksPackage;
import TestingSystem.TasksPackage.TasksPackageDBTable; import TestingSystem.DVM.TasksPackage.TasksPackageDBTable;
import TestingSystem.TasksPackage.TasksPackageState; import TestingSystem.DVM.TasksPackage.TasksPackageState;
import TestingSystem.TasksPackageToKill.TasksPackageToKillDBTable; import TestingSystem.Common.TasksPackageToKill.TasksPackageToKillDBTable;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import javafx.util.Pair; import javafx.util.Pair;

2
src/TestingSystem/TasksPackageToKill/TasksPackageToKill.java → src/TestingSystem/Common/TasksPackageToKill/TasksPackageToKill.java
View File

@@ -1,4 +1,4 @@
package TestingSystem.TasksPackageToKill; package TestingSystem.Common.TasksPackageToKill;
import Common.Database.iDBObject; import Common.Database.iDBObject;
public class TasksPackageToKill extends iDBObject { public class TasksPackageToKill extends iDBObject {
public String packageName = ""; public String packageName = "";

2
src/TestingSystem/TasksPackageToKill/TasksPackageToKillDBTable.java → src/TestingSystem/Common/TasksPackageToKill/TasksPackageToKillDBTable.java
View File

@@ -1,4 +1,4 @@
package TestingSystem.TasksPackageToKill; package TestingSystem.Common.TasksPackageToKill;
import Common.Database.iDBTable; import Common.Database.iDBTable;
public class TasksPackageToKillDBTable extends iDBTable<TasksPackageToKill> { public class TasksPackageToKillDBTable extends iDBTable<TasksPackageToKill> {
public TasksPackageToKillDBTable() { public TasksPackageToKillDBTable() {

2
src/TestingSystem/Test/ProjectFiles_json.java → src/TestingSystem/Common/Test/ProjectFiles_json.java
View File

@@ -1,4 +1,4 @@
package TestingSystem.Test; package TestingSystem.Common.Test;
import ProjectData.Files.DBProjectFile; import ProjectData.Files.DBProjectFile;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;

30
src/TestingSystem/Test/Test.java → src/TestingSystem/Common/Test/Test.java
View File

@@ -1,23 +1,23 @@
package TestingSystem.Test; package TestingSystem.Common.Test;
import Common.Constants; import Common.Constants;
import Common.Current; import Common.Current;
import Common.Database.DBObject; import Common.Database.DBObject;
import Common.Database.riDBObject; import Common.Database.riDBObject;
import Common.Global;
import Common.UI.UI; import Common.UI.UI;
import GlobalData.User.UserState;
import com.sun.org.glassfish.gmbal.Description; import com.sun.org.glassfish.gmbal.Description;
import java.io.File;
public class Test extends riDBObject { public class Test extends riDBObject {
@Override
public boolean isVisible() {
return TestInterface.isVisible(this);
}
@Description("DEFAULT 1") @Description("DEFAULT 1")
public int dim = 1; //размерность теста. для удобства пусть будет и внешним полем. public int dim = 1; //размерность теста. для удобства пусть будет и внешним полем.
@Description("DEFAULT ''") @Description("DEFAULT ''")
public String args = ""; //аргументы командной строки. на всякий случай поле зарезервирую. пусть будут. public String args = ""; //аргументы командной строки. на всякий случай поле зарезервирую. пусть будут.
@Description("DEFAULT -1") @Description("DEFAULT -1")
public int group_id = Constants.Nan; public int group_id = Constants.Nan;
@Description("IGNORE") @Description("DEFAULT 'initial'")
public byte[] project_archive_bytes = null; public UserState state = UserState.initial; //загружен ли тестовый проект.
@Override @Override
public void SynchronizeFields(DBObject src) { public void SynchronizeFields(DBObject src) {
super.SynchronizeFields(src); super.SynchronizeFields(src);
@@ -37,4 +37,20 @@ public class Test extends riDBObject {
if (Current.hasUI()) if (Current.hasUI())
UI.getMainWindow().ShowCheckedTestsCount(); UI.getMainWindow().ShowCheckedTestsCount();
} }
//---
@Override
public boolean isVisible() {
return Current.HasGroup() && (Current.getGroup().id == group_id);
}
//-
public File getArchive() {
return new File(Global.TestsDirectory, id + ".zip");
}
//-
public File getServerPath() {
return new File(Global.TestsDirectory, String.valueOf(id));
}
public File getHomePath() {
return new File(Global.visualiser.getWorkspace(), String.valueOf(id));
}
} }

13
src/TestingSystem/Test/TestDBTable.java → src/TestingSystem/Common/Test/TestDBTable.java
View File

@@ -1,12 +1,12 @@
package TestingSystem.Test; package TestingSystem.Common.Test;
import Common.Current; import Common.Current;
import Common.Database.DBTable; import Common.Database.iDBTable;
import Common.UI.DataSetControlForm; import Common.UI.DataSetControlForm;
import Common.UI.Windows.Dialog.DBObjectDialog; import Common.UI.Windows.Dialog.DBObjectDialog;
import TestingSystem.Test.UI.TestFields; import TestingSystem.Common.Test.UI.TestFields;
public class TestDBTable extends DBTable<String, Test> { public class TestDBTable extends iDBTable<Test> {
public TestDBTable() { public TestDBTable() {
super(String.class, Test.class); super(Test.class);
} }
@Override @Override
public String getSingleDescription() { public String getSingleDescription() {
@@ -21,13 +21,12 @@ public class TestDBTable extends DBTable<String, Test> {
return new DataSetControlForm(this) { return new DataSetControlForm(this) {
@Override @Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(0).setVisible(false); //columns.get(0).setVisible(false);
} }
@Override @Override
public boolean hasCheckBox() { public boolean hasCheckBox() {
return true; return true;
} }
}; };
} }
@Override @Override

2
src/TestingSystem/Test/TestType.java → src/TestingSystem/Common/Test/TestType.java
View File

@@ -1,4 +1,4 @@
package TestingSystem.Test; package TestingSystem.Common.Test;
public enum TestType { public enum TestType {
Default, Default,
Correctness, Correctness,

2
src/TestingSystem/Test/UI/TestFields.form → src/TestingSystem/Common/Test/UI/TestFields.form
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="TestingSystem.Test.UI.TestFields"> <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="TestingSystem.Common.Test.UI.TestFields">
<grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> <grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/> <margin top="0" left="0" bottom="0" right="0"/>
<constraints> <constraints>

2
src/TestingSystem/Test/UI/TestFields.java → src/TestingSystem/Common/Test/UI/TestFields.java
View File

@@ -1,4 +1,4 @@
package TestingSystem.Test.UI; package TestingSystem.Common.Test.UI;
import Common.UI.TextField.StyledTextField; import Common.UI.TextField.StyledTextField;
import Common.UI.Windows.Dialog.DialogFields; import Common.UI.Windows.Dialog.DialogFields;

17
src/TestingSystem/TestingPlanner.java → src/TestingSystem/Common/TestingPlanner.java
View File

@@ -1,4 +1,4 @@
package TestingSystem; package TestingSystem.Common;
import Common.Global; import Common.Global;
import Common.Utils.Utils; import Common.Utils.Utils;
import GlobalData.Machine.Machine; import GlobalData.Machine.Machine;
@@ -6,13 +6,14 @@ import GlobalData.User.User;
import Repository.EmailMessage; import Repository.EmailMessage;
import Repository.Server.ServerCode; import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021; import Repository.Server.ServerExchangeUnit_2021;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage; import TestingSystem.DVM.UserConnection;
import SapforTestingSystem.SapforTasksPackageSupervisor.SapforTasksPackageSupervisor; import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
import TestingSystem.Tasks.TestCompilationTask; import TestingSystem.SAPFOR.SapforTasksPackageSupervisor.SapforTasksPackageSupervisor;
import TestingSystem.Tasks.TestTask; import TestingSystem.DVM.Tasks.TestCompilationTask;
import TestingSystem.TasksPackage.TasksPackage; import TestingSystem.DVM.Tasks.TestTask;
import TestingSystem.TasksPackage.TasksPackageState; import TestingSystem.DVM.TasksPackage.TasksPackage;
import TestingSystem.TestsSupervisor_2022.TestsSupervisor_2022; import TestingSystem.DVM.TasksPackage.TasksPackageState;
import TestingSystem.DVM.TestsSupervisor_2022;
import Visual_DVM_2021.Passes.PassException; import Visual_DVM_2021.Passes.PassException;
import Visual_DVM_2021.Passes.SSH.ConnectionPass; import Visual_DVM_2021.Passes.SSH.ConnectionPass;
import Visual_DVM_2021.Passes.Server.TestingSystemPass; import Visual_DVM_2021.Passes.Server.TestingSystemPass;

47
src/TestingSystem/TestingServer.java → src/TestingSystem/Common/TestingServer.java
View File

@@ -1,4 +1,4 @@
package TestingSystem; package TestingSystem.Common;
import Common.Constants; import Common.Constants;
import Common.Database.DBObject; import Common.Database.DBObject;
import Common.Global; import Common.Global;
@@ -14,19 +14,18 @@ import Repository.RepositoryRefuseException;
import Repository.RepositoryServer; import Repository.RepositoryServer;
import Repository.Server.ServerCode; import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021; import Repository.Server.ServerExchangeUnit_2021;
import SapforTestingSystem.SapforTask.SapforTask; import TestingSystem.DVM.UserConnection;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage; import TestingSystem.SAPFOR.SapforTask.SapforTask;
import SapforTestingSystem.ServerSapfor.ServerSapfor; import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
import TestingSystem.Group.Group; import TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import TestingSystem.Group.GroupInterface; import TestingSystem.Common.Group.Group;
import TestingSystem.Tasks.TestCompilationTask; import TestingSystem.DVM.Tasks.TestCompilationTask;
import TestingSystem.Tasks.TestRunTask; import TestingSystem.DVM.Tasks.TestRunTask;
import TestingSystem.Tasks.TestTask; import TestingSystem.DVM.Tasks.TestTask;
import TestingSystem.TasksPackage.TasksPackage; import TestingSystem.DVM.TasksPackage.TasksPackage;
import TestingSystem.TasksPackageToKill.TasksPackageToKill; import TestingSystem.Common.TasksPackageToKill.TasksPackageToKill;
import TestingSystem.Test.Test; import TestingSystem.Common.Test.Test;
import TestingSystem.Test.TestInterface; import TestingSystem.Common.Test.TestType;
import TestingSystem.Test.TestType;
import Visual_DVM_2021.Passes.All.DownloadRepository; import Visual_DVM_2021.Passes.All.DownloadRepository;
import Visual_DVM_2021.Passes.All.UnzipFolderPass; import Visual_DVM_2021.Passes.All.UnzipFolderPass;
import Visual_DVM_2021.Passes.All.ZipFolderPass; import Visual_DVM_2021.Passes.All.ZipFolderPass;
@@ -92,7 +91,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
task.state = TaskState.Waiting; task.state = TaskState.Waiting;
task.id = db.IncMaxTaskId(); task.id = db.IncMaxTaskId();
task.taskspackage_id = tasksPackage.id; task.taskspackage_id = tasksPackage.id;
task.makefile_text = GroupInterface.GenerateMakefile(group, project, tasksPackage.dvm_drv, task.flags); task.makefile_text = group.GenerateMakefile(project, tasksPackage.dvm_drv, task.flags);
task.test_home = tasksPackage.user_workspace + "/projects/" + test_id; task.test_home = tasksPackage.user_workspace + "/projects/" + test_id;
//-->> //-->>
task.remote_workspace = task.remote_workspace =
@@ -120,21 +119,21 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
} }
} else if (object instanceof Test) { } else if (object instanceof Test) {
Test new_test = (Test) object; Test new_test = (Test) object;
Utils.unpackFile(new_test.project_archive_bytes, TestInterface.getArchive(new_test)); // Utils.unpackFile(new_test.project_archive_bytes, new_test.getArchive());
//распаковать архив в папку с тестами. для тестирования удобнее хранить их уже открытыми. //распаковать архив в папку с тестами. для тестирования удобнее хранить их уже открытыми.
UnzipFolderPass unzipFolderPass = new UnzipFolderPass(); UnzipFolderPass unzipFolderPass = new UnzipFolderPass();
if (!unzipFolderPass.Do( if (!unzipFolderPass.Do(
TestInterface.getArchive(new_test).getAbsolutePath(), new_test.getArchive().getAbsolutePath(),
TestInterface.getServerPath(new_test).getParentFile().getAbsolutePath())) new_test.getServerPath().getParentFile().getAbsolutePath()))
throw new RepositoryRefuseException("Не удалось распаковать Тест с именем " + new_test.id); throw new RepositoryRefuseException("Не удалось распаковать Тест с id " + new_test.id);
} }
} }
@Override @Override
public void DeleteAction(DBObject object) throws Exception { public void DeleteAction(DBObject object) throws Exception {
if (object instanceof Test) { if (object instanceof Test) {
Test test = (Test) object; Test test = (Test) object;
Utils.forceDeleteWithCheck(TestInterface.getArchive(test)); Utils.forceDeleteWithCheck(test.getArchive());
Utils.forceDeleteWithCheck(TestInterface.getServerPath(test)); Utils.forceDeleteWithCheck(test.getServerPath());
} else if (object instanceof Group) { } else if (object instanceof Group) {
Group group = (Group) object; Group group = (Group) object;
Vector<Test> tests = new Vector<>(); Vector<Test> tests = new Vector<>();
@@ -144,8 +143,8 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
} }
for (Test group_test : tests) { for (Test group_test : tests) {
db.Delete(group_test); db.Delete(group_test);
Utils.forceDeleteWithCheck(TestInterface.getArchive(group_test)); Utils.forceDeleteWithCheck(group_test.getArchive());
Utils.forceDeleteWithCheck(TestInterface.getServerPath(group_test)); Utils.forceDeleteWithCheck(group_test.getServerPath());
} }
} else if (object instanceof ServerSapfor) { } else if (object instanceof ServerSapfor) {
Utils.forceDeleteWithCheck( Utils.forceDeleteWithCheck(
@@ -396,7 +395,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
Print("Отправить клиенту тест " + request.arg); Print("Отправить клиенту тест " + request.arg);
if (db.tests.containsKey(request.arg)) { if (db.tests.containsKey(request.arg)) {
test = db.tests.get(request.arg); test = db.tests.get(request.arg);
response = new ServerExchangeUnit_2021(ServerCode.OK, "", Utils.packFile(TestInterface.getArchive(test))); response = new ServerExchangeUnit_2021(ServerCode.OK, "", Utils.packFile(test.getArchive()));
} else } else
throw new RepositoryRefuseException("Теста с именем " + request.arg + " не существует"); throw new RepositoryRefuseException("Теста с именем " + request.arg + " не существует");
break; break;

18
src/TestingSystem/TestsDatabase.java → src/TestingSystem/Common/TestsDatabase.java
View File

@@ -1,15 +1,15 @@
package TestingSystem; package TestingSystem.Common;
import Common.Constants; import Common.Constants;
import Common.Database.SQLITE.SQLiteDatabase; import Common.Database.SQLITE.SQLiteDatabase;
import GlobalData.Settings.SettingName; import GlobalData.Settings.SettingName;
import SapforTestingSystem.SapforConfiguration.SapforConfigurationDBTable; import TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationDBTable;
import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommandsDBTable; import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
import SapforTestingSystem.ServerSapfor.ServerSapforsDBTable; import TestingSystem.SAPFOR.ServerSapfor.ServerSapforsDBTable;
import TestingSystem.Configuration.UI.ConfigurationDBTable; import TestingSystem.DVM.Configuration.UI.ConfigurationDBTable;
import TestingSystem.Group.GroupsDBTable; import TestingSystem.Common.Group.GroupsDBTable;
import TestingSystem.TSetting.TSetting; import TestingSystem.Common.TSetting.TSetting;
import TestingSystem.TSetting.TSettingsDBTable; import TestingSystem.Common.TSetting.TSettingsDBTable;
import TestingSystem.Test.TestDBTable; import TestingSystem.Common.Test.TestDBTable;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import java.nio.file.Paths; import java.nio.file.Paths;

2
src/TestingSystem/Configuration/Configuration.java → src/TestingSystem/DVM/Configuration/Configuration.java
View File

@@ -1,4 +1,4 @@
package TestingSystem.Configuration; package TestingSystem.DVM.Configuration;
import Common.Database.DBObject; import Common.Database.DBObject;
import Common.Database.rDBObject; import Common.Database.rDBObject;
public class Configuration extends rDBObject { public class Configuration extends rDBObject {

10
src/TestingSystem/Configuration/ConfigurationInterface.java → src/TestingSystem/DVM/Configuration/ConfigurationInterface.java
View File

@@ -1,19 +1,19 @@
package TestingSystem.Configuration; package TestingSystem.DVM.Configuration;
import Common.Utils.Utils; import Common.Utils.Utils;
import GlobalData.RunConfiguration.RunConfiguration; import GlobalData.RunConfiguration.RunConfiguration;
import java.util.Vector; import java.util.Vector;
public class ConfigurationInterface { public class ConfigurationInterface {
public static Vector<String> getFlags(TestingSystem.Configuration.Configuration object) { public static Vector<String> getFlags(TestingSystem.DVM.Configuration.Configuration object) {
return Utils.unpackStrings(object.flags); return Utils.unpackStrings(object.flags);
} }
public static Vector<String> getEnvironments(TestingSystem.Configuration.Configuration object) { public static Vector<String> getEnvironments(TestingSystem.DVM.Configuration.Configuration object) {
return Utils.unpackStrings(object.environments); return Utils.unpackStrings(object.environments);
} }
public static Vector<String> getParams(TestingSystem.Configuration.Configuration object) { public static Vector<String> getParams(TestingSystem.DVM.Configuration.Configuration object) {
return Utils.unpackStrings(object.usr_par); return Utils.unpackStrings(object.usr_par);
} }
public static Vector<String> getMatrixes(TestingSystem.Configuration.Configuration object, int testDim) { public static Vector<String> getMatrixes(TestingSystem.DVM.Configuration.Configuration object, int testDim) {
Vector<Vector<Integer>> res_ = new Vector<>(); Vector<Vector<Integer>> res_ = new Vector<>();
Vector<String> res = new Vector<>(); Vector<String> res = new Vector<>();
if ((object.max_proc_count==0) || (object.min_dim_proc_count == 0 && object.max_dim_proc_count == 0)) { if ((object.max_proc_count==0) || (object.min_dim_proc_count == 0 && object.max_dim_proc_count == 0)) {

6
src/TestingSystem/Configuration/UI/ConfigurationDBTable.java → src/TestingSystem/DVM/Configuration/UI/ConfigurationDBTable.java
View File

@@ -1,4 +1,4 @@
package TestingSystem.Configuration.UI; package TestingSystem.DVM.Configuration.UI;
import Common.Current; import Common.Current;
import Common.Database.DBObject; import Common.Database.DBObject;
import Common.Database.DBTable; import Common.Database.DBTable;
@@ -7,8 +7,8 @@ import Common.UI.Tables.TableRenderers;
import Common.UI.VisualiserStringList; import Common.UI.VisualiserStringList;
import Common.UI.Windows.Dialog.DBObjectDialog; import Common.UI.Windows.Dialog.DBObjectDialog;
import Common.Utils.Utils; import Common.Utils.Utils;
import TestingSystem.Configuration.Configuration; import TestingSystem.DVM.Configuration.Configuration;
import TestingSystem.Configuration.ConfigurationInterface; import TestingSystem.DVM.Configuration.ConfigurationInterface;
public class ConfigurationDBTable extends DBTable<String, Configuration> { public class ConfigurationDBTable extends DBTable<String, Configuration> {
public ConfigurationDBTable() { public ConfigurationDBTable() {
super(String.class, Configuration.class); super(String.class, Configuration.class);

2
src/TestingSystem/Configuration/UI/ConfigurationFields.form → src/TestingSystem/DVM/Configuration/UI/ConfigurationFields.form
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="TestingSystem.Configuration.UI.ConfigurationFields"> <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="TestingSystem.DVM.Configuration.UI.ConfigurationFields">
<grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> <grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/> <margin top="0" left="0" bottom="0" right="0"/>
<constraints> <constraints>

2
src/TestingSystem/Configuration/UI/ConfigurationFields.java → src/TestingSystem/DVM/Configuration/UI/ConfigurationFields.java
View File

@@ -1,4 +1,4 @@
package TestingSystem.Configuration.UI; package TestingSystem.DVM.Configuration.UI;
import Common.Current; import Common.Current;
import Common.UI.VisualiserStringList; import Common.UI.VisualiserStringList;
import Common.UI.TextField.StyledTextField; import Common.UI.TextField.StyledTextField;

8
src/TestingSystem/Tasks/TestCompilationTask.java → src/TestingSystem/DVM/Tasks/TestCompilationTask.java
View File

@@ -1,8 +1,8 @@
package TestingSystem.Tasks; package TestingSystem.DVM.Tasks;
import Common.Database.DBObject; import Common.Database.DBObject;
import TestingSystem.Configuration.Configuration; import TestingSystem.DVM.Configuration.Configuration;
import TestingSystem.Group.Group; import TestingSystem.Common.Group.Group;
import TestingSystem.Test.Test; import TestingSystem.Common.Test.Test;
import com.sun.org.glassfish.gmbal.Description; import com.sun.org.glassfish.gmbal.Description;
import java.util.Vector; import java.util.Vector;

2
src/TestingSystem/Tasks/TestCompilationTasksDBTable.java → src/TestingSystem/DVM/Tasks/TestCompilationTasksDBTable.java
View File

@@ -1,4 +1,4 @@
package TestingSystem.Tasks; package TestingSystem.DVM.Tasks;
import Common.Current; import Common.Current;
import Common.Database.DBTable; import Common.Database.DBTable;
public class TestCompilationTasksDBTable extends DBTable<Integer, TestCompilationTask> { public class TestCompilationTasksDBTable extends DBTable<Integer, TestCompilationTask> {

8
src/TestingSystem/Tasks/TestRunTask.java → src/TestingSystem/DVM/Tasks/TestRunTask.java
View File

@@ -1,11 +1,11 @@
package TestingSystem.Tasks; package TestingSystem.DVM.Tasks;
import Common.Constants; import Common.Constants;
import Common.Database.DBObject; import Common.Database.DBObject;
import GlobalData.Tasks.TaskState; import GlobalData.Tasks.TaskState;
import ProjectData.LanguageName; import ProjectData.LanguageName;
import TestingSystem.Configuration.Configuration; import TestingSystem.DVM.Configuration.Configuration;
import TestingSystem.Group.Group; import TestingSystem.Common.Group.Group;
import TestingSystem.Test.Test; import TestingSystem.Common.Test.Test;
import com.sun.org.glassfish.gmbal.Description; import com.sun.org.glassfish.gmbal.Description;
import java.util.Vector; import java.util.Vector;

2
src/TestingSystem/Tasks/TestRunTaskInterface.java → src/TestingSystem/DVM/Tasks/TestRunTaskInterface.java
View File

@@ -1,4 +1,4 @@
package TestingSystem.Tasks; package TestingSystem.DVM.Tasks;
import Common.Current; import Common.Current;
import Common.Global; import Common.Global;
import Common.Utils.StringTemplate; import Common.Utils.StringTemplate;

2
src/TestingSystem/Tasks/TestRunTasksDBTable.java → src/TestingSystem/DVM/Tasks/TestRunTasksDBTable.java
View File

@@ -1,4 +1,4 @@
package TestingSystem.Tasks; package TestingSystem.DVM.Tasks;
import Common.Current; import Common.Current;
import Common.Database.DBTable; import Common.Database.DBTable;
import Common.Database.TableFilter; import Common.Database.TableFilter;

10
src/TestingSystem/Tasks/TestTask.java → src/TestingSystem/DVM/Tasks/TestTask.java
View File

@@ -1,11 +1,11 @@
package TestingSystem.Tasks; package TestingSystem.DVM.Tasks;
import Common.Constants; import Common.Constants;
import Common.Database.DBObject; import Common.Database.DBObject;
import GlobalData.Tasks.TaskState; import GlobalData.Tasks.TaskState;
import TestingSystem.Configuration.Configuration; import TestingSystem.DVM.Configuration.Configuration;
import TestingSystem.Group.Group; import TestingSystem.Common.Group.Group;
import TestingSystem.Test.Test; import TestingSystem.Common.Test.Test;
import TestingSystem.Test.TestType; import TestingSystem.Common.Test.TestType;
import com.sun.org.glassfish.gmbal.Description; import com.sun.org.glassfish.gmbal.Description;
import java.util.Date; import java.util.Date;

4
src/TestingSystem/TasksPackage/TasksPackage.java → src/TestingSystem/DVM/TasksPackage/TasksPackage.java
View File

@@ -1,8 +1,8 @@
package TestingSystem.TasksPackage; package TestingSystem.DVM.TasksPackage;
import Common.Database.DBObject; import Common.Database.DBObject;
import Common.Database.nDBObject; import Common.Database.nDBObject;
import GlobalData.Machine.MachineType; import GlobalData.Machine.MachineType;
import TestingSystem.Tasks.TestCompilationTask; import TestingSystem.DVM.Tasks.TestCompilationTask;
import com.sun.org.glassfish.gmbal.Description; import com.sun.org.glassfish.gmbal.Description;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;

4
src/TestingSystem/TasksPackage/TasksPackageDBTable.java → src/TestingSystem/DVM/TasksPackage/TasksPackageDBTable.java
View File

@@ -1,9 +1,9 @@
package TestingSystem.TasksPackage; package TestingSystem.DVM.TasksPackage;
import Common.Current; import Common.Current;
import Common.Database.*; import Common.Database.*;
import Common.UI.DataSetControlForm; import Common.UI.DataSetControlForm;
import Common.UI.UI; import Common.UI.UI;
import TestingSystem.Tasks.TestRunTask; import TestingSystem.DVM.Tasks.TestRunTask;
import java.util.Date; import java.util.Date;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;

2
src/TestingSystem/TasksPackage/TasksPackageState.java → src/TestingSystem/DVM/TasksPackage/TasksPackageState.java
View File

@@ -1,4 +1,4 @@
package TestingSystem.TasksPackage; package TestingSystem.DVM.TasksPackage;
import Common.Current; import Common.Current;
import Common.UI.StatusEnum; import Common.UI.StatusEnum;
import Common.UI.Themes.VisualiserFonts; import Common.UI.Themes.VisualiserFonts;

19
src/TestingSystem/TestsSupervisor_2022/TestsSupervisor_2022.java → src/TestingSystem/DVM/TestsSupervisor_2022.java
View File

@@ -1,19 +1,18 @@
package TestingSystem.TestsSupervisor_2022; package TestingSystem.DVM;
import Common.Constants; import Common.Constants;
import Common.Global; import Common.Global;
import Common.Utils.Utils; import Common.Utils.Utils;
import GlobalData.RemoteFile.RemoteFile; import GlobalData.RemoteFile.RemoteFile;
import GlobalData.Tasks.TaskState; import GlobalData.Tasks.TaskState;
import Repository.Server.ServerCode; import Repository.Server.ServerCode;
import TestingSystem.Tasks.TestCompilationTask; import TestingSystem.DVM.Tasks.TestCompilationTask;
import TestingSystem.Tasks.TestRunTask; import TestingSystem.DVM.Tasks.TestRunTask;
import TestingSystem.Tasks.TestRunTaskInterface; import TestingSystem.DVM.Tasks.TestRunTaskInterface;
import TestingSystem.Tasks.TestTask; import TestingSystem.DVM.Tasks.TestTask;
import TestingSystem.TasksPackage.TasksPackage; import TestingSystem.DVM.TasksPackage.TasksPackage;
import TestingSystem.TasksPackage.TasksPackageState; import TestingSystem.DVM.TasksPackage.TasksPackageState;
import TestingSystem.Test.TestType; import TestingSystem.Common.Test.TestType;
import TestingSystem.TestingPlanner; import TestingSystem.Common.TestingPlanner;
import TestingSystem.UserConnection;
import com.jcraft.jsch.ChannelSftp; import com.jcraft.jsch.ChannelSftp;
import javafx.util.Pair; import javafx.util.Pair;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;

2
src/TestingSystem/UserConnection.java → src/TestingSystem/DVM/UserConnection.java
View File

@@ -1,4 +1,4 @@
package TestingSystem; package TestingSystem.DVM;
import Common.Constants; import Common.Constants;
import Common.Global; import Common.Global;
import Common.Utils.Utils; import Common.Utils.Utils;

42
src/TestingSystem/Group/Group.java
View File

@@ -1,42 +0,0 @@
package TestingSystem.Group;
import Common.Current;
import Common.Database.DBObject;
import Common.Database.riDBObject;
import Common.UI.UI;
import ProjectData.LanguageName;
import TestingSystem.Test.TestType;
import com.sun.org.glassfish.gmbal.Description;
import java.util.LinkedHashMap;
public class Group extends riDBObject {
@Override
public boolean isVisible() {
return GroupInterface.isVisible(this);
}
@Description("DEFAULT 'Default'")
public TestType type = TestType.Default;
@Description("DEFAULT 'fortran'")
public LanguageName language = LanguageName.fortran;
//--
@Description("IGNORE")
public LinkedHashMap<String, byte[]> testsFiles = new LinkedHashMap<>(); //транспорт.
//--
@Override
public void SynchronizeFields(DBObject src) {
super.SynchronizeFields(src);
Group g = (Group) src;
type = g.type;
language = g.language;
}
public Group(Group group) {
this.SynchronizeFields(group);
}
public Group() {
}
@Override
public void select(boolean flag) {
super.select(flag);
if (Current.hasUI())
UI.getMainWindow().ShowCheckedTestsCount();
}
}

2
src/SapforTestingSystem/Json/SapforConfiguration_json.java → src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java
View File

@@ -1,4 +1,4 @@
package SapforTestingSystem.Json; package TestingSystem.SAPFOR.Json;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;

2
src/SapforTestingSystem/Json/SapforTasksPackage_json.java → src/TestingSystem/SAPFOR/Json/SapforTasksPackage_json.java
View File

@@ -1,4 +1,4 @@
package SapforTestingSystem.Json; package TestingSystem.SAPFOR.Json;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import java.util.List; import java.util.List;

10
src/SapforTestingSystem/Json/SapforTasksResults_json.java → src/TestingSystem/SAPFOR/Json/SapforTasksResults_json.java
View File

@@ -1,10 +1,10 @@
package SapforTestingSystem.Json; package TestingSystem.SAPFOR.Json;
import Common.Utils.Utils; import Common.Utils.Utils;
import GlobalData.Tasks.TaskState; import GlobalData.Tasks.TaskState;
import SapforTestingSystem.SapforTask.MatchState; import TestingSystem.SAPFOR.SapforTask.MatchState;
import SapforTestingSystem.SapforTask.SapforTask; import TestingSystem.SAPFOR.SapforTask.SapforTask;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage; import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
import SapforTestingSystem.SapforTasksPackage.UI.*; import TestingSystem.SAPFOR.SapforTasksPackage.UI.*;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;

2
src/SapforTestingSystem/Json/SapforTest_json.java → src/TestingSystem/SAPFOR/Json/SapforTest_json.java
View File

@@ -1,4 +1,4 @@
package SapforTestingSystem.Json; package TestingSystem.SAPFOR.Json;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
public class SapforTest_json { public class SapforTest_json {
@Expose @Expose

4
src/SapforTestingSystem/Json/SapforVersion_json.java → src/TestingSystem/SAPFOR/Json/SapforVersion_json.java
View File

@@ -1,4 +1,4 @@
package SapforTestingSystem.Json; package TestingSystem.SAPFOR.Json;
import Common.Constants; import Common.Constants;
import Common.Global; import Common.Global;
import Common.Utils.Utils; import Common.Utils.Utils;
@@ -8,7 +8,7 @@ import ProjectData.Files.ProjectFile;
import ProjectData.LanguageName; import ProjectData.LanguageName;
import ProjectData.Messages.Errors.MessageError; import ProjectData.Messages.Errors.MessageError;
import ProjectData.Project.db_project_info; import ProjectData.Project.db_project_info;
import SapforTestingSystem.SapforTask.SapforTask; import TestingSystem.SAPFOR.SapforTask.SapforTask;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;

12
src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java → src/TestingSystem/SAPFOR/PackageModeSupervisor.java
View File

@@ -1,12 +1,12 @@
package SapforTestingSystem.PackageModeSupervisor; package TestingSystem.SAPFOR;
import Common.Constants; import Common.Constants;
import Common.Global; import Common.Global;
import Common.Utils.Utils; import Common.Utils.Utils;
import SapforTestingSystem.Json.SapforConfiguration_json; import TestingSystem.SAPFOR.Json.SapforConfiguration_json;
import SapforTestingSystem.Json.SapforTasksPackage_json; import TestingSystem.SAPFOR.Json.SapforTasksPackage_json;
import SapforTestingSystem.Json.SapforTasksResults_json; import TestingSystem.SAPFOR.Json.SapforTasksResults_json;
import SapforTestingSystem.Json.SapforTest_json; import TestingSystem.SAPFOR.Json.SapforTest_json;
import SapforTestingSystem.SapforTask.SapforTask; import TestingSystem.SAPFOR.SapforTask.SapforTask;
import SapforTestingSystem.TaskThread; import SapforTestingSystem.TaskThread;
import SapforTestingSystem.ThreadsPlanner.ThreadsPlanner; import SapforTestingSystem.ThreadsPlanner.ThreadsPlanner;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;

2
src/SapforTestingSystem/SapforConfiguration/SapforConfiguration.java → src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
View File

@@ -1,4 +1,4 @@
package SapforTestingSystem.SapforConfiguration; package TestingSystem.SAPFOR.SapforConfiguration;
import Common.Database.rDBObject; import Common.Database.rDBObject;
public class SapforConfiguration extends rDBObject { public class SapforConfiguration extends rDBObject {
//настройки. //настройки.

6
src/SapforTestingSystem/SapforConfiguration/SapforConfigurationDBTable.java → src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
View File

@@ -1,11 +1,11 @@
package SapforTestingSystem.SapforConfiguration; package TestingSystem.SAPFOR.SapforConfiguration;
import Common.Current; import Common.Current;
import Common.Database.*; import Common.Database.*;
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;
import SapforTestingSystem.SapforConfiguration.UI.SapforConfigurationFields; import TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfigurationFields;
import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand; import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
public class SapforConfigurationDBTable extends DBTable<String, SapforConfiguration> { public class SapforConfigurationDBTable extends DBTable<String, SapforConfiguration> {

4
src/SapforTestingSystem/SapforConfiguration/SapforConfigurationInterface.java → src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationInterface.java
View File

@@ -1,7 +1,7 @@
package SapforTestingSystem.SapforConfiguration; package TestingSystem.SAPFOR.SapforConfiguration;
import Common.Global; import Common.Global;
import Common.Utils.TextLog; import Common.Utils.TextLog;
import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand; import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import java.util.Vector; import java.util.Vector;

2
src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.form → src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.form
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="SapforTestingSystem.SapforConfiguration.UI.SapforConfigurationFields"> <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfigurationFields">
<grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> <grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/> <margin top="0" left="0" bottom="0" right="0"/>
<constraints> <constraints>

2
src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.java → src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java
View File

@@ -1,4 +1,4 @@
package SapforTestingSystem.SapforConfiguration.UI; package TestingSystem.SAPFOR.SapforConfiguration.UI;
import Common.UI.TextField.StyledTextField; import Common.UI.TextField.StyledTextField;
import Common.UI.Windows.Dialog.DialogFields; import Common.UI.Windows.Dialog.DialogFields;

2
src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommand.java → src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommand.java
View File

@@ -1,4 +1,4 @@
package SapforTestingSystem.SapforConfigurationCommand; package TestingSystem.SAPFOR.SapforConfigurationCommand;
import Common.Database.rDBObject; import Common.Database.rDBObject;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import com.sun.org.glassfish.gmbal.Description; import com.sun.org.glassfish.gmbal.Description;

2
src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommandInterface.java → src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandInterface.java
View File

@@ -1,4 +1,4 @@
package SapforTestingSystem.SapforConfigurationCommand; package TestingSystem.SAPFOR.SapforConfigurationCommand;
import Common.Current; import Common.Current;
public class SapforConfigurationCommandInterface { public class SapforConfigurationCommandInterface {
public static boolean isVisible(SapforConfigurationCommand object) { public static boolean isVisible(SapforConfigurationCommand object) {

4
src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java → src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java
View File

@@ -1,10 +1,10 @@
package SapforTestingSystem.SapforConfigurationCommand; package TestingSystem.SAPFOR.SapforConfigurationCommand;
import Common.Current; import Common.Current;
import Common.Database.DBTable; import Common.Database.DBTable;
import Common.UI.DataSetControlForm; import Common.UI.DataSetControlForm;
import Common.UI.UI; import Common.UI.UI;
import Common.UI.Windows.Dialog.DBObjectDialog; import Common.UI.Windows.Dialog.DBObjectDialog;
import SapforTestingSystem.SapforConfigurationCommand.UI.SapforConfigurationCommandFields; import TestingSystem.SAPFOR.SapforConfigurationCommand.UI.SapforConfigurationCommandFields;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
public class SapforConfigurationCommandsDBTable extends DBTable<String, SapforConfigurationCommand> { public class SapforConfigurationCommandsDBTable extends DBTable<String, SapforConfigurationCommand> {
public SapforConfigurationCommandsDBTable() { public SapforConfigurationCommandsDBTable() {

2
src/SapforTestingSystem/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.form → src/TestingSystem/SAPFOR/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.form
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="SapforTestingSystem.SapforConfigurationCommand.UI.SapforConfigurationCommandFields"> <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="TestingSystem.SAPFOR.SapforConfigurationCommand.UI.SapforConfigurationCommandFields">
<grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> <grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/> <margin top="0" left="0" bottom="0" right="0"/>
<constraints> <constraints>

2
src/SapforTestingSystem/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.java → src/TestingSystem/SAPFOR/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.java
View File

@@ -1,4 +1,4 @@
package SapforTestingSystem.SapforConfigurationCommand.UI; package TestingSystem.SAPFOR.SapforConfigurationCommand.UI;
import Common.Current; import Common.Current;
import Common.UI.Tables.StyledCellLabel; import Common.UI.Tables.StyledCellLabel;
import Common.UI.Windows.Dialog.DialogFields; import Common.UI.Windows.Dialog.DialogFields;

2
src/SapforTestingSystem/SapforTask/MatchState.java → src/TestingSystem/SAPFOR/SapforTask/MatchState.java
View File

@@ -1,4 +1,4 @@
package SapforTestingSystem.SapforTask; package TestingSystem.SAPFOR.SapforTask;
import Common.Current; import Common.Current;
import Common.UI.StatusEnum; import Common.UI.StatusEnum;
import Common.UI.Themes.VisualiserFonts; import Common.UI.Themes.VisualiserFonts;

6
src/SapforTestingSystem/SapforTask/SapforTask.java → src/TestingSystem/SAPFOR/SapforTask/SapforTask.java
View File

@@ -1,11 +1,11 @@
package SapforTestingSystem.SapforTask; package TestingSystem.SAPFOR.SapforTask;
import Common.Constants; import Common.Constants;
import Common.Current; import Common.Current;
import Common.Database.DBObject; import Common.Database.DBObject;
import Common.Utils.Utils; import Common.Utils.Utils;
import GlobalData.Tasks.TaskState; import GlobalData.Tasks.TaskState;
import SapforTestingSystem.Json.SapforVersion_json; import TestingSystem.SAPFOR.Json.SapforVersion_json;
import SapforTestingSystem.SapforTasksPackage.UI.VersionSummary; import TestingSystem.SAPFOR.SapforTasksPackage.UI.VersionSummary;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import com.sun.org.glassfish.gmbal.Description; import com.sun.org.glassfish.gmbal.Description;

2
src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java → src/TestingSystem/SAPFOR/SapforTask/SapforTasksDBTable.java
View File

@@ -1,4 +1,4 @@
package SapforTestingSystem.SapforTask; package TestingSystem.SAPFOR.SapforTask;
import Common.Current; import Common.Current;
import Common.Database.DBTable; import Common.Database.DBTable;
import Common.UI.DataSetControlForm; import Common.UI.DataSetControlForm;

8
src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java → src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackage.java
View File

@@ -1,12 +1,12 @@
package SapforTestingSystem.SapforTasksPackage; package TestingSystem.SAPFOR.SapforTasksPackage;
import Common.Constants; import Common.Constants;
import Common.Database.DBObject; import Common.Database.DBObject;
import Common.Database.nDBObject; import Common.Database.nDBObject;
import Common.Global; import Common.Global;
import Common.Utils.Utils; import Common.Utils.Utils;
import SapforTestingSystem.Json.SapforTasksResults_json; import TestingSystem.SAPFOR.Json.SapforTasksResults_json;
import SapforTestingSystem.SapforTask.SapforTask; import TestingSystem.SAPFOR.SapforTask.SapforTask;
import TestingSystem.TasksPackage.TasksPackageState; import TestingSystem.DVM.TasksPackage.TasksPackageState;
import com.sun.org.glassfish.gmbal.Description; import com.sun.org.glassfish.gmbal.Description;
import java.io.File; import java.io.File;

4
src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java → src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java
View File

@@ -1,8 +1,8 @@
package SapforTestingSystem.SapforTasksPackage; package TestingSystem.SAPFOR.SapforTasksPackage;
import Common.Current; import Common.Current;
import Common.Database.*; import Common.Database.*;
import Common.UI.DataSetControlForm; import Common.UI.DataSetControlForm;
import SapforTestingSystem.SapforTask.SapforTask; import TestingSystem.SAPFOR.SapforTask.SapforTask;
import java.util.Date; import java.util.Date;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;

4
src/SapforTestingSystem/SapforTasksPackage/UI/ConfigurationSummary.java → src/TestingSystem/SAPFOR/SapforTasksPackage/UI/ConfigurationSummary.java
View File

@@ -1,6 +1,6 @@
package SapforTestingSystem.SapforTasksPackage.UI; package TestingSystem.SAPFOR.SapforTasksPackage.UI;
import Common.Utils.Utils; import Common.Utils.Utils;
import SapforTestingSystem.SapforTask.SapforTask; import TestingSystem.SAPFOR.SapforTask.SapforTask;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import java.util.Arrays; import java.util.Arrays;

2
src/SapforTestingSystem/SapforTasksPackage/UI/GroupSummary.java → src/TestingSystem/SAPFOR/SapforTasksPackage/UI/GroupSummary.java
View File

@@ -1,4 +1,4 @@
package SapforTestingSystem.SapforTasksPackage.UI; package TestingSystem.SAPFOR.SapforTasksPackage.UI;
public class GroupSummary extends SapforPackageTreeNode { public class GroupSummary extends SapforPackageTreeNode {
public String group_name = ""; public String group_name = "";
@Override @Override

4
src/SapforTestingSystem/SapforTasksPackage/UI/MatchesSummary.java → src/TestingSystem/SAPFOR/SapforTasksPackage/UI/MatchesSummary.java
View File

@@ -1,5 +1,5 @@
package SapforTestingSystem.SapforTasksPackage.UI; package TestingSystem.SAPFOR.SapforTasksPackage.UI;
import SapforTestingSystem.SapforTask.MatchState; import TestingSystem.SAPFOR.SapforTask.MatchState;
public class MatchesSummary extends SapforPackageTreeNode { public class MatchesSummary extends SapforPackageTreeNode {
public MatchState state; public MatchState state;
public int count = 0; public int count = 0;

2
src/SapforTestingSystem/SapforTasksPackage/UI/PackageSummary.java → src/TestingSystem/SAPFOR/SapforTasksPackage/UI/PackageSummary.java
View File

@@ -1,4 +1,4 @@
package SapforTestingSystem.SapforTasksPackage.UI; package TestingSystem.SAPFOR.SapforTasksPackage.UI;
public class PackageSummary extends SapforPackageTreeNode { public class PackageSummary extends SapforPackageTreeNode {
public int count = 0; public int count = 0;
@Override @Override

2
src/SapforTestingSystem/SapforTasksPackage/UI/SapforPackageTreeNode.java → src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java
View File

@@ -1,4 +1,4 @@
package SapforTestingSystem.SapforTasksPackage.UI; package TestingSystem.SAPFOR.SapforTasksPackage.UI;
import javax.swing.*; import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
import java.util.Objects; import java.util.Objects;

4
src/SapforTestingSystem/SapforTasksPackage/UI/SapforTasksPackageTree.java → src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java
View File

@@ -1,9 +1,9 @@
package SapforTestingSystem.SapforTasksPackage.UI; package TestingSystem.SAPFOR.SapforTasksPackage.UI;
import Common.Current; import Common.Current;
import Common.UI.Trees.DataTree; import Common.UI.Trees.DataTree;
import Common.UI.Trees.TreeRenderers; import Common.UI.Trees.TreeRenderers;
import Common.UI.UI; import Common.UI.UI;
import SapforTestingSystem.Json.SapforVersion_json; import TestingSystem.SAPFOR.Json.SapforVersion_json;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreePath; import javax.swing.tree.TreePath;

2
src/SapforTestingSystem/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java → src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java
View File

@@ -1,4 +1,4 @@
package SapforTestingSystem.SapforTasksPackage.UI; package TestingSystem.SAPFOR.SapforTasksPackage.UI;
import Common.UI.Trees.StyledTreeCellRenderer; import Common.UI.Trees.StyledTreeCellRenderer;
import javax.swing.*; import javax.swing.*;

2
src/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.java → src/TestingSystem/SAPFOR/SapforTasksPackage/UI/StateSummary.java
View File

@@ -1,4 +1,4 @@
package SapforTestingSystem.SapforTasksPackage.UI; package TestingSystem.SAPFOR.SapforTasksPackage.UI;
import GlobalData.Tasks.TaskState; import GlobalData.Tasks.TaskState;
public class StateSummary extends SapforPackageTreeNode { public class StateSummary extends SapforPackageTreeNode {
public TaskState state; public TaskState state;

2
src/SapforTestingSystem/SapforTasksPackage/UI/TreeSummary.java → src/TestingSystem/SAPFOR/SapforTasksPackage/UI/TreeSummary.java
View File

@@ -1,4 +1,4 @@
package SapforTestingSystem.SapforTasksPackage.UI; package TestingSystem.SAPFOR.SapforTasksPackage.UI;
import javax.swing.*; import javax.swing.*;
import java.util.Objects; import java.util.Objects;
public abstract class TreeSummary { public abstract class TreeSummary {

4
src/SapforTestingSystem/SapforTasksPackage/UI/VersionSummary.java → src/TestingSystem/SAPFOR/SapforTasksPackage/UI/VersionSummary.java
View File

@@ -1,5 +1,5 @@
package SapforTestingSystem.SapforTasksPackage.UI; package TestingSystem.SAPFOR.SapforTasksPackage.UI;
import SapforTestingSystem.Json.SapforVersion_json; import TestingSystem.SAPFOR.Json.SapforVersion_json;
public class VersionSummary extends SapforPackageTreeNode{ public class VersionSummary extends SapforPackageTreeNode{
public String version_name = ""; public String version_name = "";

26
src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java → src/TestingSystem/SAPFOR/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
View File

@@ -1,22 +1,22 @@
package SapforTestingSystem.SapforTasksPackageSupervisor; package TestingSystem.SAPFOR.SapforTasksPackageSupervisor;
import Common.Constants; import Common.Constants;
import Common.Current; import Common.Current;
import Common.Global; import Common.Global;
import Common.GlobalProperties; import Common.GlobalProperties;
import Common.Utils.Utils; import Common.Utils.Utils;
import Repository.Server.ServerCode; import Repository.Server.ServerCode;
import SapforTestingSystem.Json.SapforConfiguration_json; import TestingSystem.SAPFOR.Json.SapforConfiguration_json;
import SapforTestingSystem.Json.SapforTasksPackage_json; import TestingSystem.SAPFOR.Json.SapforTasksPackage_json;
import SapforTestingSystem.Json.SapforTasksResults_json; import TestingSystem.SAPFOR.Json.SapforTasksResults_json;
import SapforTestingSystem.Json.SapforTest_json; import TestingSystem.SAPFOR.Json.SapforTest_json;
import SapforTestingSystem.SapforConfiguration.SapforConfiguration; import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import SapforTestingSystem.SapforConfiguration.SapforConfigurationInterface; import TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationInterface;
import SapforTestingSystem.SapforTask.SapforTask; import TestingSystem.SAPFOR.SapforTask.SapforTask;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage; import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
import TestingSystem.Group.Group; import TestingSystem.Common.Group.Group;
import TestingSystem.TasksPackage.TasksPackageState; import TestingSystem.DVM.TasksPackage.TasksPackageState;
import TestingSystem.Test.Test; import TestingSystem.Common.Test.Test;
import TestingSystem.TestingPlanner; import TestingSystem.Common.TestingPlanner;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import javafx.util.Pair; import javafx.util.Pair;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;

2
src/SapforTestingSystem/ServerSapfor/ServerSapfor.java → src/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java
View File

@@ -1,4 +1,4 @@
package SapforTestingSystem.ServerSapfor; package TestingSystem.SAPFOR.ServerSapfor;
import Common.Database.riDBObject; import Common.Database.riDBObject;
import Common.Utils.Utils; import Common.Utils.Utils;
import ProjectData.LanguageName; import ProjectData.LanguageName;

46
src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java Normal file
View File

@@ -0,0 +1,46 @@
package TestingSystem.SAPFOR.ServerSapfor;
import Common.Current;
import Common.Database.iDBTable;
import Common.UI.DataSetControlForm;
import Common.UI.Tables.TableRenderers;
public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
public ServerSapforsDBTable() {
super(ServerSapfor.class);
}
@Override
public String getSingleDescription() {
return "SAPFOR";
}
@Override
public String getPluralDescription() {
return "SAPFOR";
}
@Override
public Current CurrentName() {
return Current.ServerSapfor;
}
@Override
public String[] getUIColumnNames() {
return new String[]{"версия", "дата сборки"};
}
@Override
public Object getFieldAt(ServerSapfor object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.version;
case 2:
return object.getBuildDate();
}
return null;
}
@Override
protected DataSetControlForm createUI() {
return new DataSetControlForm(this) {
@Override
protected void AdditionalInitColumns() {
// columns.get(0).setVisible(false);
columns.get(2).setRenderer(TableRenderers.RendererDate);
}
};
}
}

24
src/TestingSystem/Test/TestInterface.java
View File

@@ -1,24 +0,0 @@
package TestingSystem.Test;
import Common.Current;
import Common.Global;
import java.io.File;
import java.nio.file.Paths;
public class TestInterface {
public static boolean isVisible(Test object) {
return Current.HasGroup() && (Current.getGroup().id == object.group_id);
}
public static File getArchive(Test object) {
return Paths.get(System.getProperty("user.dir"), "Tests", object.id + ".zip").toFile();
}
public static File getServerPath(Test object) {
return Paths.get(System.getProperty("user.dir"), "Tests", String.valueOf(object.id)).toFile();
}
public static File getHomePath(Test object) {
return Paths.get(Global.visualiser.getWorkspace().getAbsolutePath(), String.valueOf(object.id)).toFile();
}
public static String getSummary(Test test) {
return test.description;
}
//--
}

4
src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java
View File

@@ -2,8 +2,8 @@ package Visual_DVM_2021.Passes.All;
import Common.Current; import Common.Current;
import Repository.Server.ServerCode; import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021; import Repository.Server.ServerExchangeUnit_2021;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage; import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
import TestingSystem.TasksPackageToKill.TasksPackageToKill; import TestingSystem.Common.TasksPackageToKill.TasksPackageToKill;
import Visual_DVM_2021.Passes.Server.TestingSystemPass; import Visual_DVM_2021.Passes.Server.TestingSystemPass;
import java.util.Vector; import java.util.Vector;

4
src/Visual_DVM_2021/Passes/All/AbortSelectedPackages.java
View File

@@ -2,8 +2,8 @@ package Visual_DVM_2021.Passes.All;
import Common.Current; import Common.Current;
import Repository.Server.ServerCode; import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021; import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.TasksPackage.TasksPackage; import TestingSystem.DVM.TasksPackage.TasksPackage;
import TestingSystem.TasksPackageToKill.TasksPackageToKill; import TestingSystem.Common.TasksPackageToKill.TasksPackageToKill;
import Visual_DVM_2021.Passes.Server.TestingSystemPass; import Visual_DVM_2021.Passes.Server.TestingSystemPass;
import java.util.Vector; import java.util.Vector;

6
src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java
View File

@@ -7,8 +7,8 @@ import ProjectData.Files.DBProjectFile;
import ProjectData.Project.db_project_info; import ProjectData.Project.db_project_info;
import Repository.Server.ServerCode; import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021; import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.Group.Group; import TestingSystem.Common.Group.Group;
import TestingSystem.Test.Test; import TestingSystem.Common.Test.Test;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassException; import Visual_DVM_2021.Passes.PassException;
import Visual_DVM_2021.Passes.Server.TestingSystemPass; import Visual_DVM_2021.Passes.Server.TestingSystemPass;
@@ -96,7 +96,7 @@ public class ConvertCorrectnessTests extends TestingSystemPass<File> {
//архивация. //архивация.
File archive = Utils.getTempFileName("test_archive"); File archive = Utils.getTempFileName("test_archive");
if (passes.get(PassCode_2021.ZipFolderPass).Do(vizTestProject.Home.getAbsolutePath(), archive.getAbsolutePath())) { if (passes.get(PassCode_2021.ZipFolderPass).Do(vizTestProject.Home.getAbsolutePath(), archive.getAbsolutePath())) {
test.project_archive_bytes = Utils.packFile(archive); // test.project_archive_bytes = Utils.packFile(archive);
if (test.dim >= 0) if (test.dim >= 0)
tests.add(test); tests.add(test);
else UI.Info("для теста " + testFileName + " не удалось определить размерность"); else UI.Info("для теста " + testFileName + " не удалось определить размерность");

6
src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
View File

@@ -4,9 +4,9 @@ import Common.Global;
import Common.UI.UI; import Common.UI.UI;
import Common.Utils.Utils; import Common.Utils.Utils;
import ProjectData.Project.db_project_info; import ProjectData.Project.db_project_info;
import TestingSystem.Group.Group; import TestingSystem.Common.Group.Group;
import TestingSystem.Test.Test; import TestingSystem.Common.Test.Test;
import TestingSystem.Test.TestType; import TestingSystem.Common.Test.TestType;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021; import Visual_DVM_2021.Passes.Pass_2021;

4
src/Visual_DVM_2021/Passes/All/DeleteGroup.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Global; import Common.Global;
import TestingSystem.Group.Group; import TestingSystem.Common.Group.Group;
import TestingSystem.TestingServer; import TestingSystem.Common.TestingServer;
import Visual_DVM_2021.Passes.Server.DeleteServerObject; import Visual_DVM_2021.Passes.Server.DeleteServerObject;
public class DeleteGroup extends DeleteServerObject<TestingServer, Group> { public class DeleteGroup extends DeleteServerObject<TestingServer, Group> {
public DeleteGroup() { public DeleteGroup() {

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

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Current; import Common.Current;
import SapforTestingSystem.SapforConfiguration.SapforConfiguration; import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import Visual_DVM_2021.Passes.DeleteSelectedServerObjects; import Visual_DVM_2021.Passes.DeleteSelectedServerObjects;
import java.util.Vector; import java.util.Vector;

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

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Current; import Common.Current;
import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand; import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
import Visual_DVM_2021.Passes.DeleteSelectedServerObjects; import Visual_DVM_2021.Passes.DeleteSelectedServerObjects;
import java.util.Vector; import java.util.Vector;

4
src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java
View File

@@ -2,8 +2,8 @@ package Visual_DVM_2021.Passes.All;
import Common.Current; import Common.Current;
import Common.UI.UI; import Common.UI.UI;
import Common.Utils.Utils; import Common.Utils.Utils;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage; import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
import TestingSystem.TasksPackage.TasksPackageState; import TestingSystem.DVM.TasksPackage.TasksPackageState;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Server.TestingSystemPass; import Visual_DVM_2021.Passes.Server.TestingSystemPass;
public class DeleteSapforTasksPackage extends TestingSystemPass<SapforTasksPackage> { public class DeleteSapforTasksPackage extends TestingSystemPass<SapforTasksPackage> {

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

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import TestingSystem.Configuration.Configuration; import TestingSystem.DVM.Configuration.Configuration;
import Visual_DVM_2021.Passes.DeleteSelectedServerObjects; import Visual_DVM_2021.Passes.DeleteSelectedServerObjects;
public class DeleteSelectedConfigurations extends DeleteSelectedServerObjects { public class DeleteSelectedConfigurations extends DeleteSelectedServerObjects {
public DeleteSelectedConfigurations() { public DeleteSelectedConfigurations() {

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

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import TestingSystem.Test.Test; import TestingSystem.Common.Test.Test;
import Visual_DVM_2021.Passes.DeleteSelectedServerObjects; import Visual_DVM_2021.Passes.DeleteSelectedServerObjects;
public class DeleteSelectedTests extends DeleteSelectedServerObjects { public class DeleteSelectedTests extends DeleteSelectedServerObjects {
public DeleteSelectedTests() { public DeleteSelectedTests() {

4
src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Global; import Common.Global;
import SapforTestingSystem.ServerSapfor.ServerSapfor; import TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import TestingSystem.TestingServer; import TestingSystem.Common.TestingServer;
import Visual_DVM_2021.Passes.Server.DeleteServerObject; import Visual_DVM_2021.Passes.Server.DeleteServerObject;
public class DeleteServerSapfor extends DeleteServerObject<TestingServer, ServerSapfor> { public class DeleteServerSapfor extends DeleteServerObject<TestingServer, ServerSapfor> {
public DeleteServerSapfor() { public DeleteServerSapfor() {

4
src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java
View File

@@ -3,8 +3,8 @@ import Common.Current;
import Common.Utils.Utils; import Common.Utils.Utils;
import Repository.Server.ServerCode; import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021; import Repository.Server.ServerExchangeUnit_2021;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage; import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
import TestingSystem.TasksPackage.TasksPackageState; import TestingSystem.DVM.TasksPackage.TasksPackageState;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Server.TestingSystemPass; import Visual_DVM_2021.Passes.Server.TestingSystemPass;

4
src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Current; import Common.Current;
import TestingSystem.Tasks.TestRunTask; import TestingSystem.DVM.Tasks.TestRunTask;
import TestingSystem.Test.Test; import TestingSystem.Common.Test.Test;
public class DownloadTaskTest extends DownloadTest { public class DownloadTaskTest extends DownloadTest {
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {

17
src/Visual_DVM_2021/Passes/All/DownloadTest.java
View File

@@ -5,8 +5,7 @@ import Common.UI.UI;
import Common.Utils.Utils; import Common.Utils.Utils;
import Repository.Server.ServerCode; import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021; import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.Test.Test; import TestingSystem.Common.Test.Test;
import TestingSystem.Test.TestInterface;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Server.TestingSystemPass; import Visual_DVM_2021.Passes.Server.TestingSystemPass;
public class DownloadTest extends TestingSystemPass<Test> { public class DownloadTest extends TestingSystemPass<Test> {
@@ -30,29 +29,29 @@ public class DownloadTest extends TestingSystemPass<Test> {
protected void performPreparation() throws Exception { protected void performPreparation() throws Exception {
passes.get(PassCode_2021.CloseCurrentProject).Do(); passes.get(PassCode_2021.CloseCurrentProject).Do();
Current.set(Current.Root, null); //чтобы гарантированно не существовало корня. Current.set(Current.Root, null); //чтобы гарантированно не существовало корня.
Utils.forceDeleteWithCheck(TestInterface.getArchive(target)); Utils.forceDeleteWithCheck(target.getArchive());
Utils.forceDeleteWithCheck(TestInterface.getHomePath(target)); Utils.forceDeleteWithCheck(target.getHomePath());
} }
@Override @Override
protected void ServerAction() throws Exception { protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.DownloadTest, String.valueOf(target.id))); Command(new ServerExchangeUnit_2021(ServerCode.DownloadTest, String.valueOf(target.id)));
response.Unpack(TestInterface.getArchive(target)); response.Unpack(target.getArchive());
} }
@Override @Override
protected boolean validate() { protected boolean validate() {
return TestInterface.getArchive(target).exists(); return target.getArchive().exists();
} }
@Override @Override
protected void performDone() throws Exception { protected void performDone() throws Exception {
super.performDone(); super.performDone();
if (passes.get(PassCode_2021.UnzipFolderPass).Do( if (passes.get(PassCode_2021.UnzipFolderPass).Do(
TestInterface.getArchive(target).getAbsolutePath(), target.getArchive().getAbsolutePath(),
Global.visualiser.getWorkspace().getAbsolutePath(), false Global.visualiser.getWorkspace().getAbsolutePath(), false
)) ))
if (UI.Question("Тестовый проект успешно загружен под именем\n" + if (UI.Question("Тестовый проект успешно загружен под именем\n" +
Utils.Brackets(TestInterface.getHomePath(target).getName()) + Utils.Brackets(target.getHomePath().getName()) +
"\nОткрыть его")) "\nОткрыть его"))
passes.get(PassCode_2021.OpenCurrentProject).Do(TestInterface.getHomePath(target)); passes.get(PassCode_2021.OpenCurrentProject).Do(target.getHomePath());
} }
} }

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

@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
import Common.Current; import Common.Current;
import Common.Database.Database; import Common.Database.Database;
import Common.Global; import Common.Global;
import TestingSystem.Configuration.Configuration; import TestingSystem.DVM.Configuration.Configuration;
import Visual_DVM_2021.Passes.EditObjectPass; import Visual_DVM_2021.Passes.EditObjectPass;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
public class EditConfiguration extends EditObjectPass<Configuration> { public class EditConfiguration extends EditObjectPass<Configuration> {

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

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Repository.Server.ServerCode; import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021; import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.Configuration.Configuration; import TestingSystem.DVM.Configuration.Configuration;
import Visual_DVM_2021.Passes.Server.TestingSystemPass; import Visual_DVM_2021.Passes.Server.TestingSystemPass;
public class EditConfigurationOnServer extends TestingSystemPass<Configuration> { public class EditConfigurationOnServer extends TestingSystemPass<Configuration> {
@Override @Override

Some files were not shown because too many files have changed in this diff Show More