Skip to content

Commit 2efa47f

Browse files
committed
Use static imports only for JUnit
Rename internal test method
1 parent 87349e5 commit 2efa47f

2 files changed

Lines changed: 60 additions & 57 deletions

File tree

src/test/java/org/apache/commons/csv/CSVDuplicateHeaderTest.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,16 @@
1919

2020
package org.apache.commons.csv;
2121

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+
2226
import java.io.IOException;
2327
import java.util.Arrays;
2428
import java.util.List;
2529
import java.util.stream.Collectors;
2630
import java.util.stream.Stream;
2731

28-
import org.junit.jupiter.api.Assertions;
2932
import org.junit.jupiter.params.ParameterizedTest;
3033
import org.junit.jupiter.params.provider.Arguments;
3134
import org.junit.jupiter.params.provider.MethodSource;
@@ -285,11 +288,11 @@ void testCSVFormat(final DuplicateHeaderMode duplicateHeaderMode,
285288
.setHeader(headers);
286289
if (valid) {
287290
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");
291294
} else {
292-
Assertions.assertThrows(IllegalArgumentException.class, builder::get);
295+
assertThrows(IllegalArgumentException.class, builder::get);
293296
}
294297
}
295298

@@ -327,10 +330,10 @@ void testCSVParser(final DuplicateHeaderMode duplicateHeaderMode,
327330
try (CSVParser parser = CSVParser.parse(input, format)) {
328331
// Parser ignores null headers
329332
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");
331334
}
332335
} else {
333-
Assertions.assertThrows(IllegalArgumentException.class, () -> CSVParser.parse(input, format));
336+
assertThrows(IllegalArgumentException.class, () -> CSVParser.parse(input, format));
334337
}
335338
}
336339
}

0 commit comments

Comments
 (0)