Skip to content

Commit ae7b512

Browse files
committed
RAP-121 Remove the SQL Resource Assertions before compare 2 RVF reports
1 parent b525ec6 commit ae7b512

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/main/java/org/ihtsdo/rvf/core/service/AutomatedTestService.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public void compareReports(ValidationComparisonReport report, ValidationStatusRe
139139
leftAllTestRunItems.addAll(leftResultReport.getAssertionsSkipped());
140140
leftAllTestRunItems.addAll(leftResultReport.getAssertionsWarning());
141141
Map<String, TestRunItem> leftTestRunItemToUUIDMap = leftAllTestRunItems.stream()
142-
.filter(i -> !TestType.MRCM.equals(i.getTestType()))
142+
.filter(i -> !TestType.MRCM.equals(i.getTestType()) && !"resource".equals(i.getTestCategory()))
143143
.collect(Collectors.toMap(i -> i.getAssertionUuid().toString(), Function.identity()));
144144

145145
List<TestRunItem> rightAllTestRunItems = new ArrayList <>();
@@ -148,7 +148,7 @@ public void compareReports(ValidationComparisonReport report, ValidationStatusRe
148148
rightAllTestRunItems.addAll(rightResultReport.getAssertionsSkipped());
149149
rightAllTestRunItems.addAll(rightResultReport.getAssertionsWarning());
150150
Map<String, TestRunItem> rightTestRunItemToUUIDMap = rightAllTestRunItems.stream()
151-
.filter(i -> !TestType.MRCM.equals(i.getTestType()))
151+
.filter(i -> !TestType.MRCM.equals(i.getTestType()) && !"resource".equals(i.getTestCategory()))
152152
.collect(Collectors.toMap(i -> i.getAssertionUuid().toString(), Function.identity()));
153153

154154
Collection removedIDs = CollectionUtils.subtract(leftTestRunItemToUUIDMap.keySet(), rightTestRunItemToUUIDMap.keySet());

0 commit comments

Comments
 (0)