v++

Исправлен таймаут на скачивание пакетов.Разрешено добавлять в группу завершенный с ошибками пакет( только успешные задачи)

src/_VisualDVM/Passes/All/CompareSapforPackages.java

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

src/_VisualDVM/Passes/All/DownloadDVMPackages.java

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

src/_VisualDVM/Passes/All/DownloadSapforPackage.java

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

src/_VisualDVM/Passes/All/JoinSapforTestingVersionsToGroup.java

@@ -21,7 +21,7 @@ public class JoinSapforTestingVersionsToGroup extends TestingServerPass {
         if (Global.testingServer.db.CheckCurrent(Log, Group.class, SapforPackage.class)){
             group = Global.testingServer.db.groups.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_("Пакет не завершен!");
                 return false;
             }
@@ -30,17 +30,6 @@ public class JoinSapforTestingVersionsToGroup extends TestingServerPass {
         return false;
     }
     @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 {
         Global.mainModule.getPass(PassCode.SynchronizeTests).Do();
     }

src/_VisualDVM/TestingSystem/Common/TestingServer.java

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