11
11
import java .util .stream .Collectors ;
12
12
13
13
import static com .jetbrains .qodana .sarif .baseline .BaselineCalculation .Options .DEFAULT ;
14
+ import static org .junit .jupiter .api .Assertions .assertAll ;
14
15
import static org .junit .jupiter .api .Assertions .assertEquals ;
15
16
16
17
public class BaselineTest {
@@ -177,7 +178,7 @@ public void testAbsentResultWithChangedIdAndSameVersion() throws IOException {
177
178
SarifReport report = readReport ("src/test/resources/testData/AbsentBaselineTest/report.json" );
178
179
SarifReport baseline = readReport ("src/test/resources/testData/AbsentBaselineTest/baseline.json" );
179
180
180
- doTest (report , baseline , 17 , 1 , 1 , new BaselineCalculation .Options (true ));
181
+ doTest (report , baseline , 1 , 17 , 18 , new BaselineCalculation .Options (true ));
181
182
182
183
Set <String > knownDescriptorIds = RuleUtil .allRules (report )
183
184
.map (ReportingDescriptor ::getId )
@@ -198,7 +199,7 @@ public void testAbsentResultWithChangedIdAndOldVersion() throws IOException {
198
199
SarifReport report = readReport ("src/test/resources/testData/AbsentBaselineTest/report.json" );
199
200
SarifReport baseline = readReport ("src/test/resources/testData/AbsentBaselineTest/baseline_old.json" );
200
201
201
- doTest (report , baseline , 17 , 1 , 1 , new BaselineCalculation .Options (true ));
202
+ doTest (report , baseline , 0 , 18 , 19 , new BaselineCalculation .Options (true ));
202
203
203
204
Set <String > knownDescriptorIds = RuleUtil .allRules (report )
204
205
.map (ReportingDescriptor ::getId )
@@ -214,7 +215,6 @@ public void testAbsentResultWithChangedIdAndOldVersion() throws IOException {
214
215
assertEquals (new ArrayList <String >(), withoutDescriptor );
215
216
}
216
217
217
-
218
218
private void doTest (SarifReport report ,
219
219
SarifReport baseline ,
220
220
int expectedUnchanged ,
@@ -223,9 +223,12 @@ private void doTest(SarifReport report,
223
223
BaselineCalculation .Options options
224
224
) {
225
225
BaselineCalculation calculation = BaselineCalculation .compare (report , baseline , options );
226
- assertEquals (expectedUnchanged , calculation .getUnchangedResults (), "Unchanged:" );
227
- assertEquals (expectedAbsent , calculation .getAbsentResults (), "Absent:" );
228
- assertEquals (expectedNew , calculation .getNewResults (), "New:" );
226
+ assertAll (
227
+ () -> assertEquals (expectedUnchanged , calculation .getUnchangedResults (), "Unchanged:" ),
228
+ () -> assertEquals (expectedAbsent , calculation .getAbsentResults (), "Absent:" ),
229
+ () -> assertEquals (expectedNew , calculation .getNewResults (), "New:" )
230
+ );
231
+
229
232
List <Result > results = report .getRuns ().get (0 ).getResults ();
230
233
231
234
if (!options .isFillBaselineState ()) {
@@ -242,9 +245,11 @@ private void doTest(SarifReport report,
242
245
List <Result > resultsUnchanged = grouped .get (Result .BaselineState .UNCHANGED );
243
246
List <Result > resultsAbsent = grouped .get (Result .BaselineState .ABSENT );
244
247
List <Result > resultsNew = grouped .get (Result .BaselineState .NEW );
245
- assertEquals (expectedUnchanged , resultsUnchanged == null ? 0 : resultsUnchanged .size (), "Unchanged:" );
246
- assertEquals (expectedAbsent , resultsAbsent == null ? 0 : resultsAbsent .size (), "Absent:" );
247
- assertEquals (expectedNew , resultsNew == null ? 0 : resultsNew .size (), "New:" );
248
+ assertAll (
249
+ () -> assertEquals (expectedUnchanged , resultsUnchanged == null ? 0 : resultsUnchanged .size (), "Unchanged:" ),
250
+ () -> assertEquals (expectedAbsent , resultsAbsent == null ? 0 : resultsAbsent .size (), "Absent:" ),
251
+ () -> assertEquals (expectedNew , resultsNew == null ? 0 : resultsNew .size (), "New:" )
252
+ );
248
253
}
249
254
250
255
private void doTest (SarifReport report ,
0 commit comments