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-15 19:45:53 +03:00
parent 6523540d6f
commit 3f00d0f300
7 changed files with 9 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Common/Constants.java
View File

@@ -58,8 +58,8 @@ public class Constants {
public static final String attachments = "attachments";
public static final String statistic = "statistic";
public static final String unknown_metric = " — ";
public static final String old_tests_db_name = "tests2023";
public static final String tests_db_name = "tests2024";
public static final String old_tests_db_name = "tests2024";
public static final String tests_db_name = "tests2025";
public static final String dateNaN = "NaN";
//пробный коммит. изменение комментария.++
//кронтаб и перезагрузка

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

@@ -9,7 +9,7 @@ import Visual_DVM_2021.Passes.PassCode_2021;
import javax.swing.*;
public class GroupsMenuBar extends DataMenuBar {
public GroupsMenuBar() {
super("группы", PassCode_2021.SynchronizeTests, PassCode_2021.DownloadGroup, PassCode_2021.ConvertCorrectnessTests, PassCode_2021.PublishGroup,PassCode_2021.EditGroup, PassCode_2021.DeleteSelectedGroups);
super("группы", PassCode_2021.SynchronizeTests, PassCode_2021.ConvertCorrectnessTests, PassCode_2021.PublishGroup,PassCode_2021.EditGroup, PassCode_2021.DeleteSelectedGroups);
add(new JSeparator());
add(new MenuBarButton() {
{

96
src/GlobalData/GlobalDatabase.java
View File

@@ -124,102 +124,6 @@ public class GlobalDatabase extends SQLiteDatabase {
Global.Log.PrintException(ex);
}
}
/*
public DataSet<String, SapforTaskResult> getSapforPackagesMasterDataSet(SapforConfigurationTasksSet package_in) throws Exception {
DataSet<String, SapforTaskResult> res = new DataSet<String, SapforTaskResult>(String.class, SapforTaskResult.class) {
@Override
protected DataSetControlForm createUI() {
return new DataSetControlForm(this) {
@Override
protected void AdditionalInitColumns() {
columns.get(1).setRenderer(RendererStatusEnum);
}
@Override
public void MouseAction2() throws Exception {
Pass_2021.passes.get(PassCode_2021.OpenSapforTest).Do(Current.SapforEtalonTaskResult);
}
@Override
public void ShowCurrentObject() throws Exception {
System.out.println(Current.get(Current.SapforEtalonTaskResult));
}
};
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Статус"
};
}
@Override
public Object getFieldAt(SapforTaskResult object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.task.state;
default:
return null;
}
}
@Override
public Current CurrentName() {
return Current.SapforEtalonTaskResult;
}
};
/*
for (SapforTask task : sapforTasks.Data.values())
if (task.sapfor_configuration_id == package_in.id)
res.put(task.test_description, new SapforTaskResult(package_in, task));
return res;
}
public DataSet<String, SapforTaskResult> getSapforPackagesSlaveDataSet(SapforConfigurationTasksSet package_in) throws Exception {
DataSet<String, SapforTaskResult> res = new DataSet<String, SapforTaskResult>(String.class, SapforTaskResult.class) {
@Override
protected DataSetControlForm createUI() {
return new DataSetControlForm(this) {
@Override
protected void AdditionalInitColumns() {
columns.get(1).setRenderer(RendererStatusEnum);
columns.get(2).setRenderer(RendererStatusEnum);
}
@Override
public void MouseAction2() throws Exception {
Pass_2021.passes.get(PassCode_2021.OpenSapforTest).Do(Current.SapforTaskResult);
}
@Override
public void ShowCurrentObject() throws Exception {
System.out.println(Current.get(Current.SapforTaskResult));
}
};
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Статус",
"Совпадение"
};
}
@Override
public Object getFieldAt(SapforTaskResult object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.task.state;
case 2:
return object.match_state;
default:
return null;
}
}
@Override
public Current CurrentName() {
return Current.SapforTaskResult;
}
};
for (SapforTask task : sapforTasks.Data.values())
if (task.sapfor_configuration_id == package_in.id)
res.put(task.test_description, new SapforTaskResult(package_in, task));
return res;
}
*/
//--
public LinkedHashMap<SettingName, String> getSapforSettingsForProfile() {
LinkedHashMap<SettingName, String> res = new LinkedHashMap<>();

5
src/Repository/RepositoryServer.java
View File

@@ -204,7 +204,7 @@ public abstract class RepositoryServer<D extends Database> {
code = request.getCode();
//базовый функционал.
switch (code) {
//<editor-fold desc="БАЗОВЫЕ">
//<editor-fold desc="файлы и почта">
case ReadFile:
Print("Отправить клиенту текст файла по пути " + Utils.Brackets(request.arg));
response = new ServerExchangeUnit_2021(ServerCode.OK, "", Utils.ReadAllText(new File(request.arg)));
@@ -227,6 +227,7 @@ public abstract class RepositoryServer<D extends Database> {
response = new ServerExchangeUnit_2021(ServerCode.OK);
break;
//</editor-fold>
//<editor-fold desc="Главная база данных">
case PublishObject:
dbObject = (DBObject) request.object;
Print("Опубликовать объект " + dbObject.getPK());
@@ -288,7 +289,7 @@ public abstract class RepositoryServer<D extends Database> {
PublishAction(dbObject);
response = new ServerExchangeUnit_2021(ServerCode.OK);
break;
//------------------------
//</editor-fold>
case EXIT:
Print("ЗАВЕРШИТЬ РАБОТУ СЕРВЕРА");
System.exit(0);

67
src/Visual_DVM_2021/Passes/All/DownloadGroup.java
View File

@@ -1,67 +0,0 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.Utils.Utils;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.Group.Group;
import TestingSystem.Group.GroupInterface;
import TestingSystem.Test.Test;
import TestingSystem.Test.TestInterface;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.TestingSystemPass;
import java.io.File;
import java.util.Vector;
public class DownloadGroup extends TestingSystemPass<Group> {
File workspace = null;
Vector<Test> tests = null;
@Override
public String getIconPath() {
return "/icons/DownloadBugReport.png";
}
@Override
public String getButtonText() {
return "";
}
@Override
protected boolean canStart(Object... args) throws Exception {
workspace = null;
tests = null;
if (args.length > 0) {
target = (Group) args[0];
workspace = GroupInterface.getLocalWorkspaceD(target);
return true;
} else if (Current.Check(Log, Current.Group)) {
target = Current.getGroup();
workspace = GroupInterface.getLocalWorkspaceD(target);
return true;
}
return false;
}
@Override
protected void performPreparation() throws Exception {
//на случай если был открыт какой то из тестов.
passes.get(PassCode_2021.CloseCurrentProject).Do();
Utils.CheckAndCleanDirectory(workspace);
tests = new Vector<>();
server.db.tests.Data.values().stream().filter(test -> test.group_id.equals(target.id)).forEach(test -> tests.add(test));
}
@Override
protected void ServerAction() throws Exception {
for (Test test : tests) {
Command(new ServerExchangeUnit_2021(ServerCode.DownloadTest, test.id));
response.Unpack(TestInterface.getArchive(test));
}
}
@Override
protected void performDone() throws Exception {
super.performDone();
for (Test test : tests) {
if (TestInterface.getArchive(test).exists())
passes.get(PassCode_2021.UnzipFolderPass).Do(
TestInterface.getArchive(test).getAbsolutePath(),
workspace.getAbsolutePath(), false
);
}
}
}

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

@@ -210,7 +210,6 @@ public enum PassCode_2021 {
EditGroup,
PublishGroup,
EditGroupOnServer,
DownloadGroup,
//-
DownloadAllBugReportsArchives,
ShowInstruction,
@@ -413,8 +412,6 @@ public enum PassCode_2021 {
return "Разрешение конфликтов common блоков";
case CreateParallelVariantsCoverageForScenario:
return "Построение минимального покрытия параллельных вариантов";
case DownloadGroup:
return "Загрузка группы в рабочее пространство";
case OpenProject:
return "Открытие проекта (пакетный режим)";
case CloseProject: