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

Немного изменил концепцию. Теперь из дерева версий, можно добавлять тесты к текущей группе, вместо создания новой.

Browse Source
This commit is contained in:
02090095
2023-11-20 00:31:37 +03:00
parent b9132782eb
commit daf58423c7
3 changed files with 53 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.idea/workspace.xml generated
View File

@@ -7,25 +7,9 @@
</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/CreateTestFromDirectory.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/UI/Menus_2023/MainMenuBar/MainWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.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/DeleteSubscriber.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSubscriber.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSubscriberOnServer.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSubscriber.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSubscriber.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSubscriberOnServer.java" beforeDir="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/SPF_GetMaxMinBlockDistribution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetMaxMinBlockDistribution.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/DeleteServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.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/PublishServerAccountObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/PublishServerAccountObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.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/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

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

@@ -5,7 +5,6 @@ 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.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;
@@ -19,7 +18,7 @@ public class CreateTestsGroupFromSelectedVersions extends Pass_2021<Vector<db_pr
} }
@Override @Override
public String getIconPath() { public String getIconPath() {
return "/icons/DownloadAll.png"; return "/icons/Publish.png";
} }
@Override @Override
public String getButtonText() { public String getButtonText() {
@@ -35,7 +34,11 @@ public class CreateTestsGroupFromSelectedVersions extends Pass_2021<Vector<db_pr
Log.Writeln_("Нажмите правую клавишу мыши, и перейдите в режим выбора версий."); Log.Writeln_("Нажмите правую клавишу мыши, и перейдите в режим выбора версий.");
return false; return false;
} }
if (!Current.Check(Log, Current.Group)) {
return false;
}
target = new Vector<>(); target = new Vector<>();
group_id = Current.getGroup().id;
Current.getRoot().getSelectedVersions(target); Current.getRoot().getSelectedVersions(target);
if (target.size() == 0) { if (target.size() == 0) {
Log.Writeln_("Не отмечено ни одной версии."); Log.Writeln_("Не отмечено ни одной версии.");
@@ -54,7 +57,9 @@ public class CreateTestsGroupFromSelectedVersions extends Pass_2021<Vector<db_pr
} }
} }
} }
return UI.Question("Будет сформирована группа из " + target.size() + " тестов.\n" + cp_info + return UI.Question("В текущую группу " + Utils.Brackets(Current.getGroup().description) +
"\nбудет добавлено " + target.size() + " тестов.\n" + cp_info +
"\nТекущий проект будет закрыт." +
"\nПродолжить"); "\nПродолжить");
} }
@Override @Override
@@ -67,73 +72,52 @@ public class CreateTestsGroupFromSelectedVersions extends Pass_2021<Vector<db_pr
} }
@Override @Override
protected void body() throws Exception { protected void body() throws Exception {
PublishGroup publishGroup = new PublishGroup() { for (db_project_info vizTestProject : target) {
@Override //на случай если версия в текущем сеансе еще не открывалась.
public String getDescription() { vizTestProject.Open();
return "Добавление группы"; vizTestProject.Close();
} ShowMessage1("Публикация теста " + vizTestProject.getTitle());
@Override PublishTest pass = new PublishTest() {
public boolean fillObjectFields() throws Exception { @Override
//тут имя надо генерить, потому что может совпасть. protected boolean needsAnimation() {
target.description = Utils.getDateName(Current.getRoot().name); return false;
target.type = TestType.Default; }
return true; @Override
} public boolean setProject() {
@Override project = vizTestProject;
protected boolean needsAnimation() { return true;
return false; }
} @Override
}; public boolean fillObjectFields() throws Exception {
ShowMessage1("Публикация группы "); if (setProject() && project.checkSubdirectories(Log)) {
if (publishGroup.Do()) { target.description = project.getLocalName() + " " + project.description;
group_id = (int) publishGroup.pk; target.group_id = group_id;
for (db_project_info vizTestProject : target) { switch (project.languageName) {
//на случай если версия в текущем сеансе еще не открывалась. case fortran:
vizTestProject.Open(); target.dim = Current.getSapfor().getTextMaxDim(null, project);
vizTestProject.Close(); return true;
ShowMessage1("Публикация теста " + vizTestProject.getTitle()); case c:
PublishTest pass = new PublishTest() { target.dim = Utils.getCProjectMaxDim(project);
@Override return true;
protected boolean needsAnimation() { default:
return false; return false;
}
@Override
public boolean setProject() {
project = vizTestProject;
return true;
}
@Override
public boolean fillObjectFields() throws Exception {
if (setProject() && project.checkSubdirectories(Log)) {
target.description = project.getLocalName() + " " + project.description;
target.group_id = group_id;
switch (project.languageName) {
case fortran:
target.dim = Current.getSapfor().getTextMaxDim(null, project);
return true;
case c:
target.dim = Utils.getCProjectMaxDim(project);
return true;
default:
return false;
}
} }
return false;
} }
@Override return false;
public String getDescription() { }
return "Добавление версии " + vizTestProject.name; @Override
} public String getDescription() {
@Override return "Добавление версии " + vizTestProject.name;
protected void performDone() throws Exception { }
test_id = (int) pk; @Override
} protected void performDone() throws Exception {
@Override test_id = (int) pk;
protected void showDone() throws Exception { }
} @Override
}; protected void showDone() throws Exception {
if (!pass.Do()) return; }
} };
if (!pass.Do()) return;
} }
} }
@Override @Override

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

@@ -399,7 +399,7 @@ public enum PassCode_2021 {
case IncludeSelectedFiles: case IncludeSelectedFiles:
return "Включить в рассмотрение отмеченные файлы"; return "Включить в рассмотрение отмеченные файлы";
case CreateTestsGroupFromSelectedVersions: case CreateTestsGroupFromSelectedVersions:
return "Создать группу тестов из отмеченных версий"; return "Создать тесты из отмеченных версий, и опубликовать в текущей группе";
case DeleteSelectedVersions: case DeleteSelectedVersions:
return "Удаление отмеченных версий"; return "Удаление отмеченных версий";
case SaveFunctionsGraphCoordinates: case SaveFunctionsGraphCoordinates: