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-16 21:03:25 +03:00
parent 4545cf2d26
commit 27f275e1d8
6 changed files with 51 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
.idea/workspace.xml generated
View File

@@ -7,86 +7,11 @@
</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/Server/PublishServerObject.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/ServerObjectPass.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/TestingSystemPass.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/Database/Database.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Database.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/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/ProjectDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/ProjectDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/BugReportsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/BugReportsDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/RepositoryServer.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/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Group/Group.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Group/Group.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Group/GroupInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Group/GroupInterface.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Tasks/TestCompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Tasks/TestCompilationTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Tasks/TestRunTaskInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Tasks/TestRunTaskInterface.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Tasks/TestTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Tasks/TestTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/TasksDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TasksDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/TasksPackage/TasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TasksPackage/TasksPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Test/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Test/Test.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Test/TestDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Test/TestDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Test/TestInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Test/TestInterface.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingPlanner.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/TestingSystem/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestsDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/TestsSupervisor_2022/TestsSupervisor_2022.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestsSupervisor_2022/TestsSupervisor_2022.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/AddSubscriber.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddSubscriber.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CheckRegistrationOnServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CheckRegistrationOnServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CheckRemoteWorkspace.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CheckRemoteWorkspace.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/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/DVMConvertProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteBugReportFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteBugReportFromServer.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/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/DeleteSubscriberOnServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSubscriberOnServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadAllBugReportsArchives.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadAllBugReportsArchives.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadBugReport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadComponent.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/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/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/EditGroupOnServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditGroupOnServer.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/EditSubscriberOnServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSubscriberOnServer.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/Email.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Email.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GetComponentsActualVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GetComponentsActualVersions.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GetComponentsBackupsFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GetComponentsBackupsFromServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GetTestsQueueSize.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GetTestsQueueSize.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/PublishComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishComponent.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/PublishRemoteWorkspace.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishRemoteWorkspace.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/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/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/RefreshDVMTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RefreshDVMTests.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/All/ResurrectComponentFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SendBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SendBugReport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.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/SynchronizeBugReports.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeBugReports.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/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/UpdateBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateBugReportField.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ComponentsRepositoryPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/ComponentsRepositoryPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/DeleteSelectedServerObjects.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/DeleteSelectedServerObjects.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/RepositoryPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/TestingSystemPass.java" beforeDir="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" />
</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" />

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

@@ -1550,4 +1550,11 @@ public class db_project_info extends DBObject {
getSubdirectoriesR(Home); getSubdirectoriesR(Home);
return !subdirectories.isEmpty(); return !subdirectories.isEmpty();
} }
public boolean checkSubdirectories(TextLog Log){
if (hasSubdirectories()) {
Log.Writeln_("Проект содержит вложенные папки!");
return false;
}
return true;
}
} }

4
src/TestingSystem/Group/GroupsDBTable.java
View File

@@ -15,12 +15,12 @@ import javax.swing.*;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Vector; import java.util.Vector;
//- //-
public class GroupsDBTable extends DBTable<String, Group> { public class GroupsDBTable extends iDBTable<Group> {
public Vector<TableFilter<Group>> typeFilters; public Vector<TableFilter<Group>> typeFilters;
public Vector<TableFilter<Group>> languageFilters; public Vector<TableFilter<Group>> languageFilters;
//------------------------------------------------>>> //------------------------------------------------>>>
public GroupsDBTable() { public GroupsDBTable() {
super(String.class, Group.class); super(Group.class);
if (Current.hasUI()) { if (Current.hasUI()) {
//-- //--
typeFilters = new Vector<>(); typeFilters = new Vector<>();

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

@@ -94,38 +94,30 @@ public class CreateTestsGroupFromSelectedVersions extends Pass_2021<Vector<db_pr
vizTestProject.Close(); vizTestProject.Close();
ShowMessage1("Публикация теста " + vizTestProject.getTitle()); ShowMessage1("Публикация теста " + vizTestProject.getTitle());
PublishTest pass = new PublishTest() { PublishTest pass = new PublishTest() {
@Override
protected boolean setProject() {
project = vizTestProject;
switch (project.languageName) {
case fortran:
project.testMaxDim = Current.getSapfor().getTextMaxDim(null, project);
break;
default:
project.testMaxDim = 0;
break;
}
return true;
}
@Override @Override
protected boolean needsAnimation() { protected boolean needsAnimation() {
return false; return false;
} }
@Override @Override
protected boolean fillObjectFields() throws Exception { public boolean fillObjectFields() throws Exception {
return true; project = vizTestProject;
if (project.checkSubdirectories(Log)) {
switch (project.languageName) {
case fortran:
project.testMaxDim = Current.getSapfor().getTextMaxDim(null, project);
break;
default:
project.testMaxDim = 0;
break;
}
return true;
}
return false;
} }
@Override @Override
public String getDescription() { public String getDescription() {
return "Добавление версии " + vizTestProject.name; return "Добавление версии " + vizTestProject.name;
} }
@Override
protected void performFinish() throws Exception {
disconnect();
}
@Override
protected void showDone() throws Exception {
}
}; };
if (pass.Do()) if (pass.Do())
test = pass.target; test = pass.target;

84
src/Visual_DVM_2021/Passes/All/PublishTest.java
View File

@@ -1,70 +1,53 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Constants; import Common.Constants;
import Common.Current; import Common.Current;
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.Test.Test; import TestingSystem.Test.Test;
import TestingSystem.TestingServer;
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.PublishServerObject;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import java.io.File; import java.io.File;
import java.nio.file.Paths; import java.nio.file.Paths;
public class PublishTest extends TestingSystemPass<Test> { public class PublishTest extends PublishServerObject<TestingServer, Test> {
@Override public PublishTest() {
public String getIconPath() { super(Global.testingServer, Test.class);
return "/icons/RedAdd.png";
}
@Override
public String getButtonText() {
return "";
} }
protected db_project_info project = null; protected db_project_info project = null;
protected boolean setProject() { protected boolean setProject() {
if (Current.Check(Log, Current.Group, Current.Project) && if (Current.Check(Log, Current.Group, Current.Project)
checkSubdirectories()
&& UI.Question("Добавить текущий проект в глобальную базу тестов")) { && UI.Question("Добавить текущий проект в глобальную базу тестов")) {
project = Current.getProject(); project = Current.getProject();
switch (project.languageName) { if (project.checkSubdirectories(Log)) {
case fortran: switch (project.languageName) {
return passes.get(PassCode_2021.SPF_GetMaxMinBlockDistribution).Do(); case fortran:
case c: return passes.get(PassCode_2021.SPF_GetMaxMinBlockDistribution).Do();
project.testMaxDim = Utils.getCProjectMaxDim(project); case c:
return true; project.testMaxDim = Utils.getCProjectMaxDim(project);
default: return true;
return false; default:
return false;
}
} }
} }
return false; return false;
} }
protected boolean checkSubdirectories() {
if (Current.getProject().hasSubdirectories()) {
Log.Writeln_("Запрещено добавлять тестовые проекты, содержащие подпапки!");
return false;
}
return true;
}
@Override @Override
protected boolean canStart(Object... args) throws Exception { public boolean fillObjectFields() throws Exception {
project = null; if (setProject()) {
if (Current.getAccount().CheckRegistered(Log) && setProject()) {
target = new Test();
target.description = project.getLocalName() + " " + project.description; target.description = project.getLocalName() + " " + project.description;
target.dim = project.testMaxDim; target.dim = project.testMaxDim;
target.sender_name = Current.getAccount().name;
target.sender_address = Current.getAccount().email;
target.group_id = Current.getGroup().id; target.group_id = Current.getGroup().id;
if (fillObjectFields()) { if (super.fillObjectFields()) {
File src = Paths.get(System.getProperty("user.dir"), "Temp", String.valueOf(target.id)).toFile(); File src = Utils.getTempFileName("test");
Utils.forceDeleteWithCheck(src); Utils.CheckAndCleanDirectory(src);
FileUtils.forceMkdir(src);
if (project.db.files.Data.isEmpty()) {
UI.Info("Клонируемый проект не синхронизирован!!! Внутренняя ошибка.");
}
project.Clone(src, false); project.Clone(src, false);
FileUtils.copyFile(project.db.getFile(), Paths.get(src.getAbsolutePath(), FileUtils.copyFile(project.db.getFile(),
Constants.data, project.db.getFile().getName()).toFile()); Paths.get(src.getAbsolutePath(),Constants.data, project.db.getFile().getName()).toFile());
//архивация. //архивация.
File archive = Utils.getTempFileName("test_archive"); File archive = Utils.getTempFileName("test_archive");
if (passes.get(PassCode_2021.ZipFolderPass).Do(src.getAbsolutePath(), archive.getAbsolutePath())) { if (passes.get(PassCode_2021.ZipFolderPass).Do(src.getAbsolutePath(), archive.getAbsolutePath())) {
@@ -75,22 +58,5 @@ public class PublishTest extends TestingSystemPass<Test> {
} }
return false; return false;
} }
//тест с именем //--
protected boolean fillObjectFields() throws Exception {
return server.db.tests.ShowAddObjectDialog(target);
}
@Override
protected void ServerAction() throws Exception {
PublishObject(target);
}
@Override
protected void performFinish() throws Exception {
super.performFinish();
passes.get(PassCode_2021.SynchronizeTests).Do();
}
@Override
protected void showDone() throws Exception {
super.showDone();
server.db.tests.ui_.Show(target.getPK());
}
} }

1
src/Visual_DVM_2021/Passes/PassCode_2021.java
View File

@@ -304,6 +304,7 @@ public enum PassCode_2021 {
ShowSapforTaskPackage, //временный проход на демонстрацию дерева файлов и версий пакета. ShowSapforTaskPackage, //временный проход на демонстрацию дерева файлов и версий пакета.
OpenSapforEtalonVersion, OpenSapforEtalonVersion,
OpenSapforVersion, OpenSapforVersion,
//-> //->
TestPass; TestPass;
public String getDescription() { public String getDescription() {