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

реализовал создание группы из папки с выделенными в ней файлами.

Browse Source
This commit is contained in:
02090095
2023-12-02 16:36:35 +03:00
parent 12cc235973
commit 8e7137d5ea
10 changed files with 76 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.idea/workspace.xml generated
View File

@@ -7,11 +7,16 @@
</component>
<component name="ChangeListManager">
<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$/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateParallelVariantsCoverageForScenario.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTestsFromFiles.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/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/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/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/PublishTests_OLD.java" beforeDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

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

@@ -12,6 +12,7 @@ public class GroupsMenuBar extends DataMenuBar {
super("группы", PassCode_2021.SynchronizeTests, PassCode_2021.ConvertCorrectnessTests,
PassCode_2021.PublishGroup,
PassCode_2021.CreateGroupFromDirectory,
PassCode_2021.CreateGroupFromFiles,
PassCode_2021.EditGroup,
PassCode_2021.DeleteGroup
);

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

@@ -6,7 +6,7 @@ public class TestsMenuBar extends DataMenuBar {
super("тесты",
PassCode_2021.CreateTestFromProject,
PassCode_2021.CreateTestFromDirectory,
PassCode_2021.PublishTestsFromFiles, ///----------------------------
PassCode_2021.CreateTestsFromFiles, ///----------------------------
PassCode_2021.EditTest,
PassCode_2021.DownloadTest,
PassCode_2021.DeleteTest);

50
src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java Normal file
View File

@@ -0,0 +1,50 @@
package Visual_DVM_2021.Passes.All;
import Common.Constants;
import Common.Current;
import Common.Utils.Files.VFileChooser;
import Common.Utils.Utils;
import GlobalData.Settings.SettingName;
import TestingSystem.Common.Group.Group;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import java.io.File;
import java.util.Vector;
public class CreateGroupFromFiles extends PublishTests{
Group group;
VFileChooser fileChooser = new VFileChooser("Выберите файлы для создания тестов");
@Override
protected PassCode_2021 getCreateTestCode() {
return PassCode_2021.CreateTestFromFile;
}
@Override
protected String getNoFilesMessage() {
return "ни одного файла";
}
@Override
protected boolean canStart(Object... args) throws Exception {
Utils.RestoreSelectedDirectory(fileChooser);
Vector<File> files = fileChooser.ShowMultiDialog();
if (files.isEmpty()){
Log.Writeln_("Не выбрано ни одного файла.");
return false;
}
File dir = fileChooser.getCurrentDirectory();
Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, dir);
//---------------
if (dir.getName().equals(Constants.data)) {
Log.Writeln_(Utils.Brackets(dir) + "\nявляется служебной папкой визуализатора!");
return false;
}
if (!Utils.validateProjectFile(dir, Log)) {
Log.Writeln_("Имя папки " + Utils.Brackets(dir.getName()) + " содержит запрещённые символы " + Constants.all_forbidden_characters_string + ", или кириллицу.");
return false;
}
if (passes.get(PassCode_2021.PublishGroup).Do(dir.getName().toUpperCase())) {
group = Current.getGroup();
} else return false;
//--
return super.canStart(files, group);
}
}

1
src/Visual_DVM_2021/Passes/All/CreateTestFromProject.java
View File

@@ -4,6 +4,7 @@ import ProjectData.Files.FileState;
import ProjectData.Files.ProjectFile;
import ProjectData.Project.db_project_info;
import TestingSystem.Common.Group.Group;
//из текущего проекта.
public class CreateTestFromProject extends CreateTestFromDirectory {
db_project_info project;
@Override

4
src/Visual_DVM_2021/Passes/All/PublishTestsFromFiles.java → src/Visual_DVM_2021/Passes/All/CreateTestsFromFiles.java
View File

@@ -8,8 +8,8 @@ import Visual_DVM_2021.Passes.Pass_2021;
import java.io.File;
import java.util.Vector;
public class PublishTestsFromFiles extends PublishTests {
VFileChooser fileChooser = new VFileChooser("Выберите файл для создания теста");
public class CreateTestsFromFiles extends PublishTests {
VFileChooser fileChooser = new VFileChooser("Выберите файлы для создания тестов");
@Override
protected PassCode_2021 getCreateTestCode() {
return PassCode_2021.CreateTestFromFile;

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

@@ -1,14 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.Global;
import Common.UI.UI;
import Common.Utils.Utils;
import ProjectData.Project.db_project_info;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PublishTests_OLD;
import java.util.Vector;
public class CreateTestsGroupFromSelectedVersions extends PublishTests_OLD {
import Visual_DVM_2021.Passes.Pass_2021;
public class CreateTestsGroupFromSelectedVersions extends Pass_2021 {
/*
Vector<db_project_info> versions = new Vector<>();
@Override
public String getIconPath() {
@@ -65,4 +58,5 @@ public class CreateTestsGroupFromSelectedVersions extends PublishTests_OLD {
return UI.Question("В группу " + Utils.Brackets(group.description) +
"\nбудет добавлено " + target.size() + " тестов.\nПродолжить");
}
*/
}

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

@@ -19,6 +19,10 @@ public abstract class PublishTests extends TestingSystemPass<Vector<Test>> {
return "";
}
@Override
public String getIconPath() {
return "/icons/AddFile.png";
}
@Override
protected boolean needsAnimation() {
return true;
}

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

@@ -301,14 +301,17 @@ public enum PassCode_2021 {
CreateTestFromProject,
SPF_RemoveComments,
CreateTestFromFile,
PublishTestsFromFiles,
CreateTestsFromFiles,
CreateGroupFromFiles,
//->
TestPass;
public String getDescription() {
switch (this) {
case Undefined:
return "?";
case PublishTestsFromFiles:
case CreateGroupFromFiles:
return "Создать группу из файлов в папке";
case CreateTestsFromFiles:
return "Добавить тесты из файлов к текущей группе";
case CreateTestFromFile:
return "Создать тест из файла";

73
src/Visual_DVM_2021/Passes/PublishTests_OLD.java
View File

@@ -1,73 +0,0 @@
package Visual_DVM_2021.Passes;
import Common.UI.UI;
import Common.Utils.Utils;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.Test;
import Visual_DVM_2021.Passes.All.CreateTestFromDirectory;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
import java.io.File;
import java.util.Vector;
public abstract class PublishTests_OLD extends TestingSystemPass<Vector<Test>> {
@Override
public String getButtonText() {
return "";
}
@Override
protected boolean needsAnimation() {
return true;
}
//---
protected Group group;
protected Vector<File> files;
protected abstract boolean getGroup();
protected boolean findFiles(){ return false;}
@Override
protected boolean canStart(Object... args) throws Exception {
target = new Vector<>();
files = new Vector<>();
group = null;
//--------------------------
if (!getGroup()) return false;
if (group == null) {
Log.Writeln_("Группа не выбрана.");
return false;
}
if (!findFiles()) return false;
if (files.isEmpty()) {
Log.Writeln_("Не найдено ни одной папки для формирования теста.");
return false;
}
//---
CreateTestFromDirectory createTestFromDirectory = (CreateTestFromDirectory) passes.get(PassCode_2021.CreateTestFromDirectory);
//---
for (File file : files) {
if (createTestFromDirectory.Do(file, group))
target.add(createTestFromDirectory.target);
}
//---
if (target.isEmpty()) {
Log.Writeln_("Не удалось создать ни одного теста.");
return false;
}
//---
return UI.Question("В группу " + Utils.Brackets(group.description) +
"\nбудет добавлено " + target.size() + " тестов.\nПродолжить");
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.PublishObjects, null, target));
}
@Override
protected void performFinish() throws Exception {
super.performFinish();
passes.get(PassCode_2021.SynchronizeTests).Do();
}
@Override
protected void FocusResult() {
UI.getMainWindow().FocusTests();
}
}