завершение рефакторинга создания тестов из проектов.
This commit is contained in:
6
.idea/workspace.xml
generated
6
.idea/workspace.xml
generated
@@ -7,16 +7,12 @@
|
|||||||
</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/CreateGroupFromFiles.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/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/VersionsMenuBar/VersionsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/VersionsMenuBar/VersionsMenuBar.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/CreateTestFromProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromProject.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromProject.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/PublishTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTests.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTests.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsFromFiles.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/PublishTests_OLD.java" beforeDir="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" />
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
package Common.UI.Menus_2023.VersionsMenuBar;
|
package Common.UI.Menus_2023.VersionsMenuBar;
|
||||||
import Common.UI.Menus_2023.VisualiserMenuBar;
|
import Common.UI.Menus_2023.VisualiserMenuBar;
|
||||||
|
import Visual_DVM_2021.Passes.PassCode_2021;
|
||||||
public class VersionsMenuBar extends VisualiserMenuBar {
|
public class VersionsMenuBar extends VisualiserMenuBar {
|
||||||
public VersionsMenuBar(){
|
public VersionsMenuBar(){
|
||||||
// addPasses(PassCode_2021.CreateTestsGroupFromSelectedVersions);
|
addPasses(PassCode_2021.CreateTestsGroupFromSelectedVersions);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,13 +16,19 @@ public class CreateTestFromProject extends CreateTestFromDirectory {
|
|||||||
if (args.length == 0) {
|
if (args.length == 0) {
|
||||||
if (Current.Check(Log, Current.Group, Current.Project)) {
|
if (Current.Check(Log, Current.Group, Current.Project)) {
|
||||||
project = Current.getProject();
|
project = Current.getProject();
|
||||||
from_directory_chooser = true;
|
if (super.canStart(Current.getProject().Home, Current.getGroup())){
|
||||||
return super.canStart(Current.getProject().Home, Current.getGroup());
|
from_directory_chooser = true; //чтобы опубликовал.
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
project = (db_project_info) args[0];
|
project = (db_project_info) args[0];
|
||||||
group = (Group) args[1];
|
group = (Group) args[1];
|
||||||
from_directory_chooser = false;
|
//если проект не текущий, освежить его бд.
|
||||||
|
if (!Current.HasProject() || !Current.getProject().Home.equals(project.Home)) {
|
||||||
|
project.Open();
|
||||||
|
project.Close();
|
||||||
|
}
|
||||||
return super.canStart(project.Home, group);
|
return super.canStart(project.Home, group);
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -1,53 +1,43 @@
|
|||||||
package Visual_DVM_2021.Passes.All;
|
package Visual_DVM_2021.Passes.All;
|
||||||
|
import Common.Current;
|
||||||
|
import Common.UI.UI;
|
||||||
|
import Common.Utils.Utils;
|
||||||
|
import ProjectData.Project.db_project_info;
|
||||||
|
import TestingSystem.Common.Test.Test;
|
||||||
|
import Visual_DVM_2021.Passes.PassCode_2021;
|
||||||
import Visual_DVM_2021.Passes.Pass_2021;
|
import Visual_DVM_2021.Passes.Pass_2021;
|
||||||
public class CreateTestsGroupFromSelectedVersions extends Pass_2021 {
|
|
||||||
/*
|
import java.util.Vector;
|
||||||
Vector<db_project_info> versions = new Vector<>();
|
public class CreateTestsGroupFromSelectedVersions extends PublishTests {
|
||||||
@Override
|
@Override
|
||||||
public String getIconPath() {
|
public String getIconPath() {
|
||||||
return "/icons/Publish.png";
|
return "/icons/Publish.png";
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected boolean getGroup() {
|
protected PassCode_2021 getCreateTestCode() {
|
||||||
if (Current.Check(Log, Current.Group)) {
|
return PassCode_2021.CreateTestFromProject;
|
||||||
group = Current.getGroup();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected boolean canStart(Object... args) throws Exception {
|
protected boolean canStart(Object... args) throws Exception {
|
||||||
if (!Current.getAccount().CheckRegistered(Log))
|
|
||||||
return false;
|
|
||||||
//---
|
|
||||||
target = new Vector<>();
|
target = new Vector<>();
|
||||||
//--------------------------
|
//---
|
||||||
group = null;
|
if (Current.Check(Log, Current.Group)) {
|
||||||
if (!getGroup()) return false;
|
group = Current.getGroup();
|
||||||
if (group == null) {
|
} else
|
||||||
Log.Writeln_("Группа не выбрана.");
|
|
||||||
return false;
|
return false;
|
||||||
}
|
//---------------------
|
||||||
if (!Global.versions_multiselection) {
|
Vector<db_project_info> versions = new Vector<>();
|
||||||
Log.Writeln_("Нажмите правую клавишу мыши, и перейдите в режим выбора версий.");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
versions = new Vector<>();
|
|
||||||
Current.getRoot().getSelectedVersions(versions);
|
Current.getRoot().getSelectedVersions(versions);
|
||||||
if (versions.size() == 0) {
|
if (versions.isEmpty()) {
|
||||||
Log.Writeln_("Не отмечено ни одной версии.");
|
Log.Writeln_("Не отмечено ни одной версии.");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
//---
|
//---
|
||||||
passes.get(PassCode_2021.CloseCurrentProject).Do();
|
Pass_2021 createTestPass = passes.get(getCreateTestCode());
|
||||||
//---
|
|
||||||
CreateTestFromProject createTestFromProject = (CreateTestFromProject) passes.get(PassCode_2021.CreateTestFromProject);
|
|
||||||
//---
|
//---
|
||||||
for (db_project_info version : versions) {
|
for (db_project_info version : versions) {
|
||||||
version.Open();
|
if (createTestPass.Do(version, group))
|
||||||
version.Close();
|
target.add((Test) createTestPass.target);
|
||||||
if (createTestFromProject.Do(version, group))
|
|
||||||
target.add(createTestFromProject.target);
|
|
||||||
}
|
}
|
||||||
//---
|
//---
|
||||||
if (target.isEmpty()) {
|
if (target.isEmpty()) {
|
||||||
@@ -58,5 +48,4 @@ public class CreateTestsGroupFromSelectedVersions extends Pass_2021 {
|
|||||||
return UI.Question("В группу " + Utils.Brackets(group.description) +
|
return UI.Question("В группу " + Utils.Brackets(group.description) +
|
||||||
"\nбудет добавлено " + target.size() + " тестов.\nПродолжить");
|
"\nбудет добавлено " + target.size() + " тестов.\nПродолжить");
|
||||||
}
|
}
|
||||||
*/
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ public abstract class PublishTests extends TestingSystemPass<Vector<Test>> {
|
|||||||
}
|
}
|
||||||
//--
|
//--
|
||||||
protected abstract PassCode_2021 getCreateTestCode();
|
protected abstract PassCode_2021 getCreateTestCode();
|
||||||
protected abstract String getNoFilesMessage();
|
protected String getNoFilesMessage(){return "";};
|
||||||
//--
|
//--
|
||||||
@Override
|
@Override
|
||||||
protected boolean canStart(Object... args) throws Exception {
|
protected boolean canStart(Object... args) throws Exception {
|
||||||
|
|||||||
@@ -318,7 +318,7 @@ public enum PassCode_2021 {
|
|||||||
case SPF_RemoveComments:
|
case SPF_RemoveComments:
|
||||||
return "Удаление комментариев";
|
return "Удаление комментариев";
|
||||||
case CreateTestFromProject:
|
case CreateTestFromProject:
|
||||||
return "Создать тест из текущего проекта";
|
return "Создать тест из проекта";
|
||||||
case CreateTestFromDirectory:
|
case CreateTestFromDirectory:
|
||||||
return "Создать тест из папки";
|
return "Создать тест из папки";
|
||||||
case SPF_RemoveOmpDirectives:
|
case SPF_RemoveOmpDirectives:
|
||||||
|
|||||||
Reference in New Issue
Block a user