no message

This commit is contained in:
2023-10-24 19:42:01 +03:00
parent 82df491e29
commit e45cf5659d
5 changed files with 66 additions and 12 deletions

View File

@@ -8,6 +8,7 @@ import SapforTestingSystem.Json.*;
import SapforTestingSystem.PerformSapforTask;
import SapforTestingSystem.SapforTask.SapforTask;
import SapforTestingSystem.ThreadsPlanner.ThreadsPlanner;
import Visual_DVM_2021.Passes.PassCode_2021;
import org.apache.commons.io.FileUtils;
import java.io.File;
@@ -35,6 +36,11 @@ public class PackageModeSupervisor extends ThreadsPlanner {
task.flags = sapforConfiguration_json.flags;
task.sapfor_configuration_id = sapforConfiguration_json.id;
results_json.tasks.add(task);
Vector<String> codes_s = new Vector<>();
for (PassCode_2021 code: sapforConfiguration_json.codes){
codes_s.add(code.toString());
}
task.codes = String.join(" ", codes_s);
//---
addThread(() -> {
while (!task.state.isComplete()) {

View File

@@ -29,16 +29,14 @@ public class SapforTask extends DBObject {
public String flags = "";
@Description("DEFAULT ''")
@Expose
public String codes = "";
@Description("DEFAULT ''")
@Expose
public String root = "";
@Description("DEFAULT 'Inactive'")
@Expose
public TaskState state = TaskState.Inactive;
//-----------
/*
@Description("DEFAULT ''")
@Expose
public String filesNames = ""; //для базы данных. имена файлов через enter //а надо ли?
*/
@Description("IGNORE")
@Expose
public List<String> files = new Vector<>(); //файлы проекта.Брать из коррекции стиля кода. есть первой версия
@@ -53,8 +51,8 @@ public class SapforTask extends DBObject {
//-----------
public SapforTask() {
}
public void Reset(){
root="";
public void Reset() {
root = "";
state = TaskState.Inactive;
files.clear();
versions.clear();
@@ -76,11 +74,17 @@ public class SapforTask extends DBObject {
test_description = t.test_description;
state = t.state;
}
public String getVersionsChain(){
public String getVersionsChain() {
Vector<String> versionsLines = new Vector<>();
for (int i=1; i< versions.size(); ++i ){
for (int i = 1; i < versions.size(); ++i) {
versionsLines.add(Utils.Brackets(versions.get(i).description));
}
return String.join("", versionsLines);
}
//должны совпасть им теста, флаги, и коды
public boolean isComparable(SapforTask task) throws Exception {
return test_description.equalsIgnoreCase(task.test_description) &&
flags.equalsIgnoreCase(task.flags) &&
codes.equalsIgnoreCase(task.codes);
}
}