From 55e49ce3b7dd93d3f50713e151823a73e6916f76 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 15 Dec 2023 18:10:27 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  7 ++-
 properties                                    |  2 +-
 .../Common/TestingPackage/TestingPackage.java | 48 ++++++++++++++-----
 .../DVM/DVMPackage/DVMPackage.java            | 40 ++++------------
 .../SAPFOR/SAPFORPackage/SapforPackage.java   | 20 ++++++++
 .../SAPFOR/SapforTestingPlanner.java          |  3 ++
 6 files changed, 76 insertions(+), 44 deletions(-)
 create mode 100644 src/TestingSystem/SAPFOR/SAPFORPackage/SapforPackage.java
 create mode 100644 src/TestingSystem/SAPFOR/SapforTestingPlanner.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 00f9b2eb..5ba713ff 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,9 +7,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SAPFORPackage/SapforPackage.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTestingPlanner.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/TestingSystem/DVM/DVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 2653b49e..0ce55c18 100644
--- a/properties
+++ b/properties
@@ -26,7 +26,7 @@
   "PerformanceAnalyzerPath": "",
   "ComponentsBackUpsCount": 10,
   "TestingKernels": 28,
-  "AutoCheckTesting": true,
+  "AutoCheckTesting": false,
   "CheckTestingIntervalSeconds": 10,
   "EmailOnTestingProgress": false
 }
\ No newline at end of file
diff --git a/src/TestingSystem/Common/TestingPackage/TestingPackage.java b/src/TestingSystem/Common/TestingPackage/TestingPackage.java
index d6152613..97592e95 100644
--- a/src/TestingSystem/Common/TestingPackage/TestingPackage.java
+++ b/src/TestingSystem/Common/TestingPackage/TestingPackage.java
@@ -1,8 +1,15 @@
 package TestingSystem.Common.TestingPackage;
 import Common.Database.DBObject;
 import Common.Database.riDBObject;
+import Common.Global;
+import Common.Utils.Utils;
+import TestingSystem.DVM.DVMPackage.DVMPackage_json;
 import TestingSystem.DVM.TasksPackage.TasksPackageState;
-public class TestingPackage extends riDBObject {
+import com.sun.org.glassfish.gmbal.Description;
+
+import java.io.File;
+public abstract class TestingPackage<J> extends riDBObject {
+    public String PID = "";
     public int tasksCount = 0; //Общее число задач
     //--
     public int kernels = 1;
@@ -19,23 +26,42 @@ public class TestingPackage extends riDBObject {
     @Override
     public void SynchronizeFields(DBObject src) {
         super.SynchronizeFields(src);
-        TestingPackage tasksPackage = (TestingPackage) src;
+        TestingPackage tp = (TestingPackage) src;
         //--
-        tasksCount = tasksPackage.tasksCount;
-        needsEmail = tasksPackage.needsEmail;
-        version = tasksPackage.version;
-        drv = tasksPackage.drv;
-        kernels = tasksPackage.kernels;
-        progress = tasksPackage.progress;
-        StartDate = tasksPackage.StartDate;
-        ChangeDate = tasksPackage.ChangeDate;
-        state = tasksPackage.state;
+        tasksCount = tp.tasksCount;
+        needsEmail = tp.needsEmail;
+        version = tp.version;
+        drv = tp.drv;
+        PID = tp.PID;
+        kernels = tp.kernels;
+        progress = tp.progress;
+        StartDate = tp.StartDate;
+        ChangeDate = tp.ChangeDate;
+        state = tp.state;
     }
     public TestingPackage(TestingPackage p) {
         SynchronizeFields(p);
     }
     public TestingPackage() {
     }
+    public File getLocalWorkspace() {
+        return new File(Global.PackagesDirectory, String.valueOf(id));
+    }
+    //------------------------
+    @Description("IGNORED")
+    public J package_json=null;
+    public abstract Class getJsonClass();
+
+    public File getJsonFile() {
+        return new File(getLocalWorkspace(), "package_json");
+    }
+    public void saveJson() throws Exception {
+        Utils.jsonToFile(package_json, getJsonFile());
+    }
+    public void readJson() throws Exception {
+        package_json = (J) Utils.jsonFromFile(getJsonFile(), getJsonClass());
+    }
     public void destructor() {
+        package_json = null;
     }
 }
diff --git a/src/TestingSystem/DVM/DVMPackage/DVMPackage.java b/src/TestingSystem/DVM/DVMPackage/DVMPackage.java
index cefd2063..e57aabc4 100644
--- a/src/TestingSystem/DVM/DVMPackage/DVMPackage.java
+++ b/src/TestingSystem/DVM/DVMPackage/DVMPackage.java
@@ -1,16 +1,10 @@
 package TestingSystem.DVM.DVMPackage;
 import Common.Database.DBObject;
-import Common.Global;
-import Common.Utils.Utils;
 import GlobalData.Machine.Machine;
 import GlobalData.Machine.MachineType;
 import GlobalData.User.User;
 import TestingSystem.Common.TestingPackage.TestingPackage;
-import com.sun.org.glassfish.gmbal.Description;
-
-import java.io.File;
-public class DVMPackage extends TestingPackage {
-    public String PID = ""; //сишная часть.
+public class DVMPackage extends TestingPackage<DVMPackage_json> {
     //---
     public String machine_name = "";
     public String machine_address = "";
@@ -20,23 +14,21 @@ public class DVMPackage extends TestingPackage {
     public String user_password;
     public String user_workspace;
     //---
-    @Description("IGNORE")
-    public DVMPackage_json package_json = null;
-    public DVMPackage(){}
+    public DVMPackage() {
+    }
+    @Override
+    public Class getJsonClass() {
+        return DVMPackage_json.class;
+    }
     public DVMPackage(DVMPackage p) {
         super(p);
         this.SynchronizeFields(p);
     }
     //---
     @Override
-    public void destructor() {
-        package_json = null;
-    }
-    @Override
     public void SynchronizeFields(DBObject src) {
         super.SynchronizeFields(src);
         DVMPackage tasksPackage = (DVMPackage) src;
-        PID = tasksPackage.PID;
         machine_name = tasksPackage.machine_name;
         machine_address = tasksPackage.machine_address;
         machine_port = tasksPackage.machine_port;
@@ -44,22 +36,10 @@ public class DVMPackage extends TestingPackage {
         user_workspace = tasksPackage.user_workspace;
         user_password = tasksPackage.user_password;
     }
-    public File getLocalWorkspace() {
-        return new File(Global.PackagesDirectory, String.valueOf(id));
+    public Machine getMachine() {
+        return new Machine(machine_name, machine_address, machine_port, MachineType.Server);
     }
-    public File getJsonFile() {
-        return new File(getLocalWorkspace(), "package_json");
-    }
-    public void saveJson() throws Exception {
-        Utils.jsonToFile(package_json, getJsonFile());
-    }
-    public void readJson() throws Exception {
-        package_json = (DVMPackage_json) Utils.jsonFromFile(getJsonFile(), DVMPackage_json.class);
-    }
-    public Machine getMachine(){
-        return new Machine(machine_name,machine_address,machine_port,MachineType.Server);
-    }
-    public User getUser(){
+    public User getUser() {
         return new User(user_name, user_password, user_workspace);
     }
 }
diff --git a/src/TestingSystem/SAPFOR/SAPFORPackage/SapforPackage.java b/src/TestingSystem/SAPFOR/SAPFORPackage/SapforPackage.java
new file mode 100644
index 00000000..53b0c569
--- /dev/null
+++ b/src/TestingSystem/SAPFOR/SAPFORPackage/SapforPackage.java
@@ -0,0 +1,20 @@
+package TestingSystem.SAPFOR.SAPFORPackage;
+import Common.Constants;
+import TestingSystem.Common.TestingPackage.TestingPackage;
+import TestingSystem.DVM.TasksPackage.TasksPackageState;
+import TestingSystem.SAPFOR.Json.SapforTasksResults_json;
+import com.sun.org.glassfish.gmbal.Description;
+public class SapforPackage extends TestingPackage {
+    @Description("DEFAULT ''")
+    public String testsNames = "";//имена тестов через ; для отображения
+    //---
+    public int sapforId = Constants.Nan; // так как сапфор на машине.
+    @Description("DEFAULT ''")
+    public String testsIds = "";
+    @Description("DEFAULT ''")
+    public String configurationsIds = "";
+    @Override
+    public Class getJsonClass() {
+        return SapforTasksResults_json.class;
+    }
+}
diff --git a/src/TestingSystem/SAPFOR/SapforTestingPlanner.java b/src/TestingSystem/SAPFOR/SapforTestingPlanner.java
new file mode 100644
index 00000000..826ebd39
--- /dev/null
+++ b/src/TestingSystem/SAPFOR/SapforTestingPlanner.java
@@ -0,0 +1,3 @@
+package TestingSystem.SAPFOR;
+public class SapforTestingPlanner {
+}