From bd702b3ebc35f9b24ec27d6dc12be11d72369b96 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 15 Dec 2023 16:27:01 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B8=D0=BD=D1=83=D0=B4=D0=B8?=
 =?UTF-8?q?=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9=20=D0=BE=D0=B1=D1=80?=
 =?UTF-8?q?=D1=8B=D0=B2=20=D1=81=D0=BE=D0=B5=D0=B4=D0=B8=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20=D0=BF=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B5=D1=81=D1=8B=D0=BB=D0=BE=D0=BA=20=D0=B8=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D0=BE=D0=BB=D1=8C=D0=BD=D1=8B=D1=85=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                          | 1 -
 src/TestingSystem/Common/TestingPlanner.java | 5 +++++
 src/TestingSystem/Common/TestingServer.java  | 4 ++++
 src/TestingSystem/DVM/DVMTestingPlanner.java | 2 --
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d6bc17f1..7eab9788 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,7 +7,6 @@
   </component>
   <component name="ChangeListManager">
     <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$/src/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" afterDir="false" />
diff --git a/src/TestingSystem/Common/TestingPlanner.java b/src/TestingSystem/Common/TestingPlanner.java
index e421936f..87ae8b6a 100644
--- a/src/TestingSystem/Common/TestingPlanner.java
+++ b/src/TestingSystem/Common/TestingPlanner.java
@@ -110,20 +110,24 @@ public abstract class TestingPlanner<P extends TestingPackage> {
             case TestsSynchronize:
                 TestsSynchronize();
                 UpdatePackageState(TasksPackageState.PackageWorkspaceCreation);
+                Disconnect();
                 break;
             case PackageWorkspaceCreation:
                 PackageWorkspaceCreation();
                 UpdatePackageState(TasksPackageState.PackageStart);
+                Disconnect();
                 break;
             case PackageStart:
                 PackageStart();
                 EmailPackage();
                 testingPackage.StartDate = new Date().getTime();
                 UpdatePackageState(getStateAfterStart());
+                Disconnect();
                 break;
             case RunningEnd:
                 DownloadResults();
                 UpdatePackageState(TasksPackageState.Analysis);
+                Disconnect();
                 break;
             default:
                 if (CheckNextState()) UpdatePackage();
@@ -134,6 +138,7 @@ public abstract class TestingPlanner<P extends TestingPackage> {
     public void Perform() {
         while (true) {
             try {
+                testingPackage = null;
                 testingPackage = (P) ServerCommand(getActivePackageCode());
                 if (testingPackage != null) {
                     Print(testingPackage.id + ":" + testingPackage.state.getDescription());
diff --git a/src/TestingSystem/Common/TestingServer.java b/src/TestingSystem/Common/TestingServer.java
index 818519fb..61812763 100644
--- a/src/TestingSystem/Common/TestingServer.java
+++ b/src/TestingSystem/Common/TestingServer.java
@@ -664,6 +664,10 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
             for (SapforConfigurationCommand command : commands) {
                 db.Delete(command);
             }
+        } else if (object instanceof DVMPackage) {
+            DVMPackage dvmPackage = (DVMPackage) object;
+            File workspace = new File(Global.PackagesDirectory, String.valueOf(dvmPackage.id));
+            Utils.forceDeleteWithCheck(workspace);
         }
     }
     //---------------------------------------------------------------------------------------------->>>
diff --git a/src/TestingSystem/DVM/DVMTestingPlanner.java b/src/TestingSystem/DVM/DVMTestingPlanner.java
index 7c4d25d2..5475d759 100644
--- a/src/TestingSystem/DVM/DVMTestingPlanner.java
+++ b/src/TestingSystem/DVM/DVMTestingPlanner.java
@@ -366,8 +366,6 @@ public class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
         //--
         packageRemoteWorkspace = new RemoteFile(user.workspace + "/tests", String.valueOf(testingPackage.id), true);
         packageLocalWorkspace = new File(Global.PackagesDirectory, String.valueOf(testingPackage.id));
-        //-
-        Print("packageremoteWorkspace=" + Utils.Brackets(packageRemoteWorkspace.full_name));
     }
     @Override
     protected boolean Connect() {