|
19 | 19 |
|
20 | 20 | package org.apache.commons.csv; |
21 | 21 |
|
| 22 | +import static org.junit.jupiter.api.Assertions.assertArrayEquals; |
| 23 | +import static org.junit.jupiter.api.Assertions.assertEquals; |
| 24 | +import static org.junit.jupiter.api.Assertions.assertThrows; |
| 25 | + |
22 | 26 | import java.io.IOException; |
23 | 27 | import java.util.Arrays; |
24 | 28 | import java.util.List; |
25 | 29 | import java.util.stream.Collectors; |
26 | 30 | import java.util.stream.Stream; |
27 | 31 |
|
28 | | -import org.junit.jupiter.api.Assertions; |
29 | 32 | import org.junit.jupiter.params.ParameterizedTest; |
30 | 33 | import org.junit.jupiter.params.provider.Arguments; |
31 | 34 | import org.junit.jupiter.params.provider.MethodSource; |
@@ -285,11 +288,11 @@ void testCSVFormat(final DuplicateHeaderMode duplicateHeaderMode, |
285 | 288 | .setHeader(headers); |
286 | 289 | if (valid) { |
287 | 290 | final CSVFormat format = builder.get(); |
288 | | - Assertions.assertEquals(duplicateHeaderMode, format.getDuplicateHeaderMode(), "DuplicateHeaderMode"); |
289 | | - Assertions.assertEquals(allowMissingColumnNames, format.getAllowMissingColumnNames(), "AllowMissingColumnNames"); |
290 | | - Assertions.assertArrayEquals(headers, format.getHeader(), "Header"); |
| 291 | + assertEquals(duplicateHeaderMode, format.getDuplicateHeaderMode(), "DuplicateHeaderMode"); |
| 292 | + assertEquals(allowMissingColumnNames, format.getAllowMissingColumnNames(), "AllowMissingColumnNames"); |
| 293 | + assertArrayEquals(headers, format.getHeader(), "Header"); |
291 | 294 | } else { |
292 | | - Assertions.assertThrows(IllegalArgumentException.class, builder::get); |
| 295 | + assertThrows(IllegalArgumentException.class, builder::get); |
293 | 296 | } |
294 | 297 | } |
295 | 298 |
|
@@ -327,10 +330,10 @@ void testCSVParser(final DuplicateHeaderMode duplicateHeaderMode, |
327 | 330 | try (CSVParser parser = CSVParser.parse(input, format)) { |
328 | 331 | // Parser ignores null headers |
329 | 332 | final List<String> expected = Arrays.stream(headers).filter(s -> s != null).collect(Collectors.toList()); |
330 | | - Assertions.assertEquals(expected, parser.getHeaderNames(), "HeaderNames"); |
| 333 | + assertEquals(expected, parser.getHeaderNames(), "HeaderNames"); |
331 | 334 | } |
332 | 335 | } else { |
333 | | - Assertions.assertThrows(IllegalArgumentException.class, () -> CSVParser.parse(input, format)); |
| 336 | + assertThrows(IllegalArgumentException.class, () -> CSVParser.parse(input, format)); |
334 | 337 | } |
335 | 338 | } |
336 | 339 | } |
0 commit comments