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

no message

Browse Source
This commit is contained in:
02090095
2024-02-25 17:37:49 +03:00
parent 0a2f2f05e1
commit 00af17e823
4 changed files with 58 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -152,12 +152,16 @@ public class SapforTask extends DBObject {
//todo Для каждого случая подобрать иконку (?)
if (!state.equals(task2.state)) {
System.out.println("Не совпадение состояний задачи " + getUniqueKey());
//--
comparisonState = MatchState.NotMatch;
task2.comparisonState = MatchState.NotMatch;
//--
} else if ((versions.size() != task2.versions.size())|| (variants.size() != task2.variants.size())) {
System.out.println("Не совпадение количества версий в задаче " + getUniqueKey());
//--
comparisonState = MatchState.NotMatch;
task2.comparisonState = MatchState.NotMatch;
//--
} else {
LinkedHashMap<String, SapforVersion_json> versions1 = getSortedVersions();
LinkedHashMap<String, SapforVersion_json> versions2 = task2.getSortedVersions();
@@ -165,8 +169,10 @@ public class SapforTask extends DBObject {
for (String name1 : versions1.keySet()) {
if (!versions2.containsKey(name1)) {
System.out.println("Не совпадение имен версий в задаче " + getUniqueKey());
//--
comparisonState = MatchState.NotMatch;
task2.comparisonState = MatchState.NotMatch;
//--
return;
}
}
@@ -178,9 +184,11 @@ public class SapforTask extends DBObject {
SapforVersion_json version2 = versions2.get(name1);
//---
if (!version1.isMatch(version2)) {
System.out.println("Не совпадение версий в задаче " + getUniqueKey());
System.out.println("Не совпадение кода версий в задаче " + getUniqueKey());
//-
comparisonState = MatchState.NotMatch;
task2.comparisonState = MatchState.NotMatch;
//-
return;
}
}