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

промежуточный. убрал изменение порядка задач. вместо этого будет фильтр по состояниям

Browse Source
This commit is contained in:
02090095
2024-02-25 15:42:46 +03:00
parent a85446b72d
commit 0a2f2f05e1
5 changed files with 44 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/TestingSystem/SAPFOR/SapforTask/SapforTask.java
View File

@@ -54,7 +54,7 @@ public class SapforTask extends DBObject {
@Expose
public TaskState state = TaskState.Inactive;
@Description("IGNORE")
public MatchState matchState = MatchState.Unknown; //для сравнения. в обычном режиме всегда Unknown!
public MatchState comparisonState = MatchState.Unknown; //для сравнения. в обычном режиме всегда Unknown!
//--------------------------------------------------
public String getUniqueKey() {
return group_description + "_" + test_description + "_" + sapfor_configuration_id;
@@ -152,12 +152,12 @@ public class SapforTask extends DBObject {
//todo Для каждого случая подобрать иконку (?)
if (!state.equals(task2.state)) {
System.out.println("Не совпадение состояний задачи " + getUniqueKey());
matchState = MatchState.NotMatch;
task2.matchState = MatchState.NotMatch;
comparisonState = MatchState.NotMatch;
task2.comparisonState = MatchState.NotMatch;
} else if ((versions.size() != task2.versions.size())|| (variants.size() != task2.variants.size())) {
System.out.println("Не совпадение количества версий в задаче " + getUniqueKey());
matchState = MatchState.NotMatch;
task2.matchState = MatchState.NotMatch;
comparisonState = MatchState.NotMatch;
task2.comparisonState = MatchState.NotMatch;
} else {
LinkedHashMap<String, SapforVersion_json> versions1 = getSortedVersions();
LinkedHashMap<String, SapforVersion_json> versions2 = task2.getSortedVersions();
@@ -165,8 +165,8 @@ public class SapforTask extends DBObject {
for (String name1 : versions1.keySet()) {
if (!versions2.containsKey(name1)) {
System.out.println("Не совпадение имен версий в задаче " + getUniqueKey());
matchState = MatchState.NotMatch;
task2.matchState = MatchState.NotMatch;
comparisonState = MatchState.NotMatch;
task2.comparisonState = MatchState.NotMatch;
return;
}
}
@@ -179,13 +179,13 @@ public class SapforTask extends DBObject {
//---
if (!version1.isMatch(version2)) {
System.out.println("Не совпадение версий в задаче " + getUniqueKey());
matchState = MatchState.NotMatch;
task2.matchState = MatchState.NotMatch;
comparisonState = MatchState.NotMatch;
task2.comparisonState = MatchState.NotMatch;
return;
}
}
matchState = MatchState.Match;
task2.matchState = MatchState.Match;
comparisonState = MatchState.Match;
task2.comparisonState = MatchState.Match;
}
}
public Date getStartDate() {