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

запись результатов тестирования в бд

Browse Source
This commit is contained in:
02090095
2023-10-25 16:33:02 +03:00
parent accf547d22
commit 2eb77faf31
14 changed files with 204 additions and 5658 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/SapforTestingSystem/SapforTask/SapforTask.java
View File

@@ -4,6 +4,7 @@ import Common.Database.DBObject;
import Common.Utils.Utils;
import GlobalData.Tasks.TaskState;
import SapforTestingSystem.Json.SapforVersion_json;
import Visual_DVM_2021.Passes.PassCode_2021;
import com.google.gson.annotations.Expose;
import com.sun.org.glassfish.gmbal.Description;
import org.apache.commons.io.FileUtils;
@@ -20,6 +21,8 @@ public class SapforTask extends DBObject {
@Description("DEFAULT '-1'")
@Expose
public String sapfor_configuration_id = "";
@Description("DEFAULT ''")
public String sapfortaskspackage_id = "";
//------------------------------------->>
@Description("DEFAULT ''")
@Expose
@@ -33,16 +36,18 @@ public class SapforTask extends DBObject {
@Description("DEFAULT ''")
@Expose
public String codes = "";
@Description("DEFAULT ''")
@Expose
public String root = "";
@Description("DEFAULT 'Inactive'")
@Expose
public TaskState state = TaskState.Inactive;
//в json не выносить. это только для БД.
@Description("DEFAULT ''")
public String files = "";
@Description("DEFAULT ''")
public String versionsDescription = "";
//------
//-----------
@Description("IGNORE")
@Expose
public List<String> files = new Vector<>(); //файлы проекта.Брать из коррекции стиля кода. есть первой версия
public List<String> filesList = new Vector<>(); //файлы проекта.Брать из коррекции стиля кода. есть первой версия
//-------------------------------------->>
@Description("IGNORE")
@Expose
@@ -55,9 +60,8 @@ public class SapforTask extends DBObject {
public SapforTask() {
}
public void Reset() {
root = "";
state = TaskState.Inactive;
files.clear();
filesList.clear();
versions.clear();
variants.clear();
}
@@ -74,14 +78,25 @@ public class SapforTask extends DBObject {
SapforTask t = (SapforTask) object;
id = t.id;
sapfor_configuration_id = t.sapfor_configuration_id;
sapfortaskspackage_id = t.sapfortaskspackage_id;
//-
test_description = t.test_description;
group_description = t.group_description;
versionsDescription = t.versionsDescription;
//--
files = t.files;
codes = t.codes;
state = t.state;
//--
}
public String getVersionsChain() {
Vector<String> versionsLines = new Vector<>();
for (int i = 1; i < versions.size(); ++i) {
versionsLines.add(Utils.Brackets(versions.get(i).description));
}
if (!variants.isEmpty()) {
versionsLines.add(Utils.Brackets(PassCode_2021.CreateParallelVariants.getDescription()));
}
return String.join("→", versionsLines);
}
public static boolean compareVersionsFiles(SapforVersion_json version1, SapforVersion_json version2, List<String> files) throws Exception {
@@ -105,10 +120,10 @@ public class SapforTask extends DBObject {
}
public boolean Compare(SapforTask task, Vector<String> comparisonLog) throws Exception {
//1. сравнить списки файлов. без учета порядка.
if (files.size() != task.files.size())
if (filesList.size() != task.filesList.size())
return false;
for (String file1 : files) {
if (!task.files.contains(file1)) {
for (String file1 : filesList) {
if (!task.filesList.contains(file1)) {
return false;
}
}
@@ -124,7 +139,7 @@ public class SapforTask extends DBObject {
SapforVersion_json version1 = versions.get(i);
SapforVersion_json version2 = task.versions.get(i);
//--
if (!compareVersionsFiles(version1, version2, files)) return false;
if (!compareVersionsFiles(version1, version2, filesList)) return false;
}
return false;
}