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-10-25 02:20:57 +03:00
parent 37c7bbda44
commit 99b24b3eba
9 changed files with 82 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/workspace.xml generated
View File

@@ -7,9 +7,15 @@
</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/DownloadSapforTasksPackage.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/SapforTestingSystem/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Global.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingServer.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/UI/Main/TestingForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.form" 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>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

1
src/Common/Global.java
View File

@@ -125,6 +125,7 @@ public class Global {
Utils.CheckDirectory(StsDirectory = Paths.get(Home, Sts).toFile());
Utils.CheckDirectory(TestsDirectory = Paths.get(Home, Tests).toFile());
Utils.CheckDirectory(PerformanceAnalyzerDirectory = Paths.get(Home, PerformanceAnalyzer).toFile());
Utils.CheckDirectory(SapforPackagesDirectory = Paths.get(Home, "SapforPackages").toFile());
}
public static void CheckServerDirectories() {
Utils.CheckDirectory(ComponentsDirectory = Paths.get(Home, components).toFile());

3
src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java
View File

@@ -5,7 +5,8 @@ public class SapforTasksPackagesBar extends DataMenuBar {
public SapforTasksPackagesBar() {
super("пакеты задач",
PassCode_2021.AbortSapforTaskPackage,
PassCode_2021.DeleteSapforTasksPackage
PassCode_2021.DeleteSapforTasksPackage,
PassCode_2021.DownloadSapforTasksPackage
);
}
}

2
src/Repository/Server/ServerCode.java
View File

@@ -71,5 +71,5 @@ public enum ServerCode {
InstallSapforForTesting,
StartSapforTests,
GetFirstActiveSapforTasksPackage,
OLD
DownloadSapforTasksPackage, OLD
}

36
src/TestingSystem/TestingServer.java
View File

@@ -314,10 +314,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
return (SapforTasksResults_json) Utils.jsonFromFile(
results_file, SapforTasksResults_json.class);
}
//надо в другое место.
//надо в другое место.
public Vector<String> CompareSapforPackages(SapforTasksPackage package1, SapforTasksPackage package2) throws Exception {
Vector<String> comparisonLog = new Vector<>();
// чтобы сравнивать. должен быть идентичный список тестов. (без учета последовательности)
@@ -348,9 +345,8 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
return comparisonLog;
}
}
for (SapforTask task1: results1_json.tasks){
for (SapforTask task2: sortedTasks2){
for (SapforTask task1 : results1_json.tasks) {
for (SapforTask task2 : sortedTasks2) {
task1.Compare(task2, comparisonLog);
}
}
@@ -361,15 +357,27 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
DBObject dbObject = null;
Test test = null;
switch (code) {
case CompareSapforPackages:
case DownloadSapforTasksPackage:
Print("Загрузить пакет тестов SAPFOR " + request.object + " для пользователя " + request.arg);
SetCurrentAccountDB(request.arg);
Pair<String, String> keys = (Pair<String, String>) request.object;
response = new ServerExchangeUnit_2021(ServerCode.OK);
response.object =
CompareSapforPackages(
account_db.sapforTasksPackages.get(keys.getKey()),
account_db.sapforTasksPackages.get(keys.getValue())
);
//---
if (!account_db.sapforTasksPackages.containsKey(request.object))
throw new RepositoryRefuseException("Не существует пакета с ключом "+Utils.Brackets(request.object));
//--
SapforTasksPackage sapforTasksPackage = account_db.sapforTasksPackages.get(request.object);
//---
//1 - архивировать пакет.
File packageArchive = new File(Global.SapforPackagesDirectory, sapforTasksPackage.id+".zip");
Utils.forceDeleteWithCheck(packageArchive);
//---
ZipFolderPass zip = new ZipFolderPass();
if (zip.Do(sapforTasksPackage.workspace, packageArchive.getAbsolutePath())) {
response.object = Utils.packFile(packageArchive);
Print("Архив успешно запакован");
} else throw new RepositoryRefuseException("Не удалось запаковать архив пакета");
//---
break;
case SynchronizeTests:
//временный проход. синхронизирует тесты на заданной машине, с сервера.

40
src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java Normal file
View File

@@ -0,0 +1,40 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.Utils.Utils;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import TestingSystem.TasksPackage.TasksPackageState;
import Visual_DVM_2021.Passes.TestingSystemPass;
import java.io.File;
public class DownloadSapforTasksPackage extends TestingSystemPass<SapforTasksPackage> {
@Override
public String getIconPath() {
return "/icons/DownloadAll.png";
}
@Override
public String getButtonText() {
return "";
}
File dst = null;
@Override
protected boolean canStart(Object... args) throws Exception {
if (Current.Check(Log, Current.SapforTasksPackage)) {
target = Current.getSapforTasksPackage();
if (target.state.equals(TasksPackageState.Done)) return true;
else Log.Writeln_("Пакет не завершен.");
}
return false;
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.DownloadSapforTasksPackage, Current.getAccount().email, target.id));
response.Unpack(dst = Utils.getTempFileName(target.id));
}
@Override
protected boolean validate() {
return dst!=null&&dst.exists();
}
}

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

@@ -303,11 +303,15 @@ public enum PassCode_2021 {
EditSapforConfigurationCommandOnServer,
DeleteSapforConfigurationCommand,
//->
DownloadSapforTasksPackage,
//->
TestPass;
public String getDescription() {
switch (this) {
case Undefined:
return "?";
case DownloadSapforTasksPackage:
return "Загрузить пакет задач SAPFOR";
case AbortSapforTaskPackage:
return "Прервать пакет задач SAPFOR";
case ShowAllParallelVariants:

34
src/Visual_DVM_2021/UI/Main/TestingForm.form
View File

@@ -228,38 +228,14 @@
</properties>
<border type="none"/>
<children>
<splitpane id="d5aac" binding="SC62">
<grid id="a8a6" binding="sapforTasksPackagesPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
<preferred-size width="200" height="200"/>
</grid>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<dividerLocation value="200"/>
<dividerSize value="3"/>
</properties>
<properties/>
<border type="none"/>
<children>
<grid id="a5ba7" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="right"/>
</constraints>
<properties>
<minimumSize width="0" height="200"/>
</properties>
<border type="none"/>
<children/>
</grid>
<grid id="eec01" binding="sapforTasksPackagesPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="left"/>
</constraints>
<properties/>
<border type="none"/>
<children/>
</grid>
</children>
</splitpane>
<children/>
</grid>
</children>
</grid>
</children>

1
src/Visual_DVM_2021/UI/Main/TestingForm.java
View File

@@ -20,7 +20,6 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
public JSplitPane SC53;
public JSplitPane SC56;
public JSplitPane SC57;
public JSplitPane SC62;
public JSplitPane SC63;
public JSplitPane SC59;
//-