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

промежуточный. Учтена ситуация ошибочной сборки SAPFOR из визуализатора.

Browse Source
This commit is contained in:
02090095
2023-10-27 21:23:53 +03:00
parent 0fbd239112
commit 90fb80f087
4 changed files with 51 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
View File

@@ -2,7 +2,10 @@ package SapforTestingSystem.SapforTasksPackage;
import Common.Constants;
import Common.Global;
import Common.Utils.Utils;
import ProjectData.Files.DBProjectFile;
import ProjectData.Files.FileType;
import SapforTestingSystem.Json.SapforTasksResults_json;
import SapforTestingSystem.Json.SapforVersion_json;
import SapforTestingSystem.SapforTask.SapforTask;
import javax.swing.tree.DefaultMutableTreeNode;
@@ -14,6 +17,27 @@ public class SapforTasksPackageInterface {
public static File getPackageArchive(SapforTasksPackage package_in) {
return new File(Global.SapforPackagesDirectory, package_in.id + ".zip");
}
public static Vector<DBProjectFile> getProjectFiles(String dir_in) {
Vector<DBProjectFile> res = new Vector<>();
//получить список файлов которые могут быть файлами проекта в заданной папке
//гарантированно нет вложенных.
File dir = new File(dir_in);
File[] files = dir.listFiles();
//-
if (files != null) {
for (File file : files) {
if (file.isFile()) {
DBProjectFile projectFile = new DBProjectFile();
projectFile.file = file;
projectFile.AutoDetectProperties();
if (!projectFile.fileType.equals(FileType.forbidden)) {
res.add(projectFile);
}
}
}
}
return res;
}
public static DefaultMutableTreeNode getTree(SapforTasksPackage package_in) {
SapforTasksResults_json results_json = getLocalResults(package_in);
//-- флаги группы
@@ -30,6 +54,17 @@ public class SapforTasksPackageInterface {
Vector<SapforTask> tasks = tasksByGroups.get(group);
for (SapforTask task : tasks) {
DefaultMutableTreeNode taskNode = new DefaultMutableTreeNode(task.test_description);
for (SapforVersion_json version: task.versions){
DefaultMutableTreeNode versionNode = new DefaultMutableTreeNode(version.description);
taskNode.add(versionNode);
}
for (SapforVersion_json version: task.variants){
DefaultMutableTreeNode versionNode = new DefaultMutableTreeNode(version.description);
taskNode.add(versionNode);
}
//для каждой версии в узлы положить:
//получить список исходных файлов.
//получить список файлов для коррекции стиля кода.
groupNode.add(taskNode);
}
flagsNode.add(groupNode);

24
src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java
View File

@@ -50,6 +50,9 @@ public class InstallServerSapfor extends ConnectionPass<Object> {
RemoteFile testingSystemHome = new RemoteFile(sftpChannel.pwd(), "testing_system", true);
RemoteFile repo = new RemoteFile(testingSystemHome.full_name, "Repo", true);
RemoteFile repoSapforHome = new RemoteFile(repo.full_name + "/sapfor/experts/Sapfor_2017/_bin", true);
RemoteFile old_bin = new RemoteFile(repoSapforHome.full_name, "Sapfor_F");
if (Exists(repoSapforHome.full_name, "Sapfor_F"))
sftpChannel.rm(old_bin.full_name);
ShowMessage2("Вывод в консоли визуализатора");
//-->>
ShowMessage1("Синхронизация ветви DVM...");
@@ -95,25 +98,18 @@ public class InstallServerSapfor extends ConnectionPass<Object> {
return result;
}
@Override
protected void performFinish() throws Exception {
super.performFinish();
protected void performDone() throws Exception {
super.performDone();
passes.get(PassCode_2021.SynchronizeTests).Do();
}
@Override
protected void showFail() throws Exception {
Log.Writeln_("Файл [SAPFOR_F] не найден!");
}
@Override
protected void showDone() throws Exception {
super.showDone();
Global.testingServer.db.serverSapfors.ui_.Show(serverSapfor.getPK());
}
}
/*
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import SapforTestingSystem.ServerSapfor.ServerSapfor;
import Visual_DVM_2021.Passes.TestingSystemPass;
public class InstallServerSapfor extends TestingSystemPass<ServerSapfor> {
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.InstallSapforForTesting));
}
}
*/

7
src/Visual_DVM_2021/UI/Main/SapforPackageForm.java
View File

@@ -6,9 +6,10 @@ import GlobalData.FormsParams.DBForm;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageInterface;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageTree;
import javax.swing.*;
public class SapforPackageForm extends Dialog<SapforTasksPackage, SapforPackageFields> {
SapforTasksPackage sapforTasksPackage = null;
private DBForm info = null;
public SapforPackageForm() {
super(SapforPackageFields.class);
@@ -24,7 +25,9 @@ public class SapforPackageForm extends Dialog<SapforTasksPackage, SapforPackageF
public void Init(Object... params) {
sapforTasksPackage = (SapforTasksPackage) params[0];
fields.lObjectName.setText(sapforTasksPackage.id);
fields.getTreePanel().add(new SapforTasksPackageTree(SapforTasksPackageInterface.getTree(sapforTasksPackage)));
fields.getTreePanel().add(
new JScrollPane(
new SapforTasksPackageTree(SapforTasksPackageInterface.getTree(sapforTasksPackage))));
/*
if (Global.db.sapforProfiles.size() > 0) {
for (Object key : Global.db.sapforProfiles.Data.keySet()) {