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

v++

Browse Source 
Исправлен таймаут на скачивание пакетов.Разрешено добавлять в группу завершенный с ошибками пакет( только успешные задачи)
This commit is contained in:
02090095
2025-02-13 23:07:18 +03:00
parent 36438e5b20
commit f2b2acb49f
7 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/workspace.xml generated
View File

@@ -8,7 +8,9 @@
<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 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/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadDVMPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadDVMPackages.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadSapforPackage.java" afterDir="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" />

2
properties
View File

@@ -1,6 +1,6 @@
{ {
"Workspace": "E:\\Tests", "Workspace": "E:\\Tests",
"ProjectsSearchDirectory": "E:\\Tests\\Downloads\\test_routine_5_1739460626\\test_routine_5\\v1\\v1\\v1", "ProjectsSearchDirectory": "E:\\Tests\\Downloads\\bugreport_1739383720\\1835",
"VisualiserPath": "C:\\Users\\misha\\Downloads", "VisualiserPath": "C:\\Users\\misha\\Downloads",
"Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F", "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
"Visualizer_2Path": "C:\\Users\\misha\\Documents", "Visualizer_2Path": "C:\\Users\\misha\\Documents",

4
src/_VisualDVM/Passes/All/CompareSapforPackages.java
View File

@@ -18,6 +18,10 @@ public class CompareSapforPackages extends Pass<Vector<SapforPackage>> {
return ""; return "";
} }
@Override @Override
protected boolean needsAnimation() {
return true;
}
@Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
master = null; master = null;
slave = null; slave = null;

2
src/_VisualDVM/Passes/All/DownloadDVMPackages.java
View File

@@ -30,7 +30,7 @@ public class DownloadDVMPackages extends TestingServerPass<Vector<Integer>> {
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
target = (Vector<Integer>) args[0]; target = (Vector<Integer>) args[0];
packed_packages = null; packed_packages = null;
return SendRequest(ServerCode.DownloadDVMPackages, "", target); return SendRequest(ServerCode.DownloadDVMPackages, "", target,0 );
} }
@Override @Override
protected void body() throws Exception { protected void body() throws Exception {

2
src/_VisualDVM/Passes/All/DownloadSapforPackage.java
View File

@@ -23,7 +23,7 @@ public class DownloadSapforPackage extends TestingServerPass<SapforPackage> {
} }
int id = target.id; int id = target.id;
loaded = new File(target.getLocalWorkspace(), CommonConstants.LOADED); loaded = new File(target.getLocalWorkspace(), CommonConstants.LOADED);
return !loaded.exists()&&SendRequest(ServerCode.DownloadSapforPackage, "", id); return !loaded.exists()&&SendRequest(ServerCode.DownloadSapforPackage, "", id, 0);
} }
@Override @Override
protected void body() throws Exception { protected void body() throws Exception {

13
src/_VisualDVM/Passes/All/JoinSapforTestingVersionsToGroup.java
View File

@@ -21,7 +21,7 @@ public class JoinSapforTestingVersionsToGroup extends TestingServerPass {
if (Global.testingServer.db.CheckCurrent(Log, Group.class, SapforPackage.class)){ if (Global.testingServer.db.CheckCurrent(Log, Group.class, SapforPackage.class)){
group = Global.testingServer.db.groups.getUI().getCurrent(); group = Global.testingServer.db.groups.getUI().getCurrent();
sapforPackage = Global.testingServer.db.sapforPackages.getUI().getCurrent(); sapforPackage = Global.testingServer.db.sapforPackages.getUI().getCurrent();
if (!sapforPackage.state.equals(TasksPackageState.Done)){ if (!sapforPackage.state.equals(TasksPackageState.Done)&&!sapforPackage.state.equals(TasksPackageState.DoneWithErrors)){
Log.Writeln_("Пакет не завершен!"); Log.Writeln_("Пакет не завершен!");
return false; return false;
} }
@@ -30,17 +30,6 @@ public class JoinSapforTestingVersionsToGroup extends TestingServerPass {
return false; return false;
} }
@Override @Override
protected void body() throws Exception {
/*
Vector<String> res = (Vector<String>) request.server_response.object;
System.out.println("--");
for (String path: res){
System.out.println(Utils_.Brackets(path));
}
System.out.println("--");
*/
}
@Override
protected void performFinish() throws Exception { protected void performFinish() throws Exception {
Global.mainModule.getPass(PassCode.SynchronizeTests).Do(); Global.mainModule.getPass(PassCode.SynchronizeTests).Do();
} }

31
src/_VisualDVM/TestingSystem/Common/TestingServer.java
View File

@@ -9,6 +9,7 @@ import Common.Utils.Vector_;
import _VisualDVM.Constants; import _VisualDVM.Constants;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Account.Account; import _VisualDVM.GlobalData.Account.Account;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.Passes.All.DownloadRepository; import _VisualDVM.Passes.All.DownloadRepository;
import _VisualDVM.Passes.All.ZipFolderPass; import _VisualDVM.Passes.All.ZipFolderPass;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
@@ -633,20 +634,22 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
LinkedHashMap<String, File> versions = new LinkedHashMap<>(); LinkedHashMap<String, File> versions = new LinkedHashMap<>();
Vector<String> paths = new Vector<>(); Vector<String> paths = new Vector<>();
for (SapforTask task : json.tasks) { for (SapforTask task : json.tasks) {
File task_root = Paths.get( if (task.state.equals(TaskState.Done)) {
sapforPackage.getLocalWorkspace().getAbsolutePath(), File task_root = Paths.get(
String.valueOf(task.set_id), sapforPackage.getLocalWorkspace().getAbsolutePath(),
String.valueOf(task.sapfor_configuration_id) String.valueOf(task.set_id),
).toFile(); String.valueOf(task.sapfor_configuration_id)
for (String path : getSapforTaskResults(task)) { ).toFile();
File versionProject = Paths.get(task_root.getAbsolutePath(), path).toFile(); for (String path : getSapforTaskResults(task)) {
Vector<String> name_parts = new Vector_<>( File versionProject = Paths.get(task_root.getAbsolutePath(), path).toFile();
String.valueOf(task.id), Vector<String> name_parts = new Vector_<>(
task.test_description, String.valueOf(task.id),
versionProject.getName() task.test_description,
); versionProject.getName()
versions.put(String.join("_", name_parts), versionProject); );
paths.add(versionProject.getAbsolutePath()); versions.put(String.join("_", name_parts), versionProject);
paths.add(versionProject.getAbsolutePath());
}
} }
} }
ZipFolderPass zip = new ZipFolderPass(); ZipFolderPass zip = new ZipFolderPass();