Skip to content

[pull] master from apache:master #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Jan 17, 2021
Merged

[pull] master from apache:master #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/test/java/org/apache/commons/csv/CSVParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public void testBackslashEscaping() throws IOException {

try (final CSVParser parser = CSVParser.parse(code, format)) {
final List<CSVRecord> records = parser.getRecords();
assertTrue(records.size() > 0);
assertFalse(records.isEmpty());

Utils.compare("Records do not match expected result", res, records);
}
Expand All @@ -148,7 +148,7 @@ public void testBackslashEscaping2() throws IOException {

try (final CSVParser parser = CSVParser.parse(code, format)) {
final List<CSVRecord> records = parser.getRecords();
assertTrue(records.size() > 0);
assertFalse(records.isEmpty());

Utils.compare("", res, records);
}
Expand All @@ -168,7 +168,7 @@ public void testBackslashEscapingOld() throws IOException {
try (final CSVParser parser = CSVParser.parse(code, CSVFormat.DEFAULT)) {
final List<CSVRecord> records = parser.getRecords();
assertEquals(res.length, records.size());
assertTrue(records.size() > 0);
assertFalse(records.isEmpty());
for (int i = 0; i < res.length; i++) {
assertArrayEquals(res[i], records.get(i).values());
}
Expand Down Expand Up @@ -282,7 +282,7 @@ public void testDefaultFormat() throws IOException {

try (final CSVParser parser = CSVParser.parse(code, format)) {
final List<CSVRecord> records = parser.getRecords();
assertTrue(records.size() > 0);
assertFalse(records.isEmpty());

Utils.compare("Failed to parse without comments", res, records);

Expand Down Expand Up @@ -330,7 +330,7 @@ public void testEmptyLineBehaviorCSV() throws Exception {
try (final CSVParser parser = CSVParser.parse(code, CSVFormat.DEFAULT)) {
final List<CSVRecord> records = parser.getRecords();
assertEquals(res.length, records.size());
assertTrue(records.size() > 0);
assertFalse(records.isEmpty());
for (int i = 0; i < res.length; i++) {
assertArrayEquals(res[i], records.get(i).values());
}
Expand All @@ -347,7 +347,7 @@ public void testEmptyLineBehaviorExcel() throws Exception {
try (final CSVParser parser = CSVParser.parse(code, CSVFormat.EXCEL)) {
final List<CSVRecord> records = parser.getRecords();
assertEquals(res.length, records.size());
assertTrue(records.size() > 0);
assertFalse(records.isEmpty());
for (int i = 0; i < res.length; i++) {
assertArrayEquals(res[i], records.get(i).values());
}
Expand All @@ -366,7 +366,7 @@ public void testEndOfFileBehaviorCSV() throws Exception {
try (final CSVParser parser = CSVParser.parse(code, CSVFormat.DEFAULT)) {
final List<CSVRecord> records = parser.getRecords();
assertEquals(res.length, records.size());
assertTrue(records.size() > 0);
assertFalse(records.isEmpty());
for (int i = 0; i < res.length; i++) {
assertArrayEquals(res[i], records.get(i).values());
}
Expand All @@ -386,7 +386,7 @@ public void testEndOfFileBehaviorExcel() throws Exception {
try (final CSVParser parser = CSVParser.parse(code, CSVFormat.EXCEL)) {
final List<CSVRecord> records = parser.getRecords();
assertEquals(res.length, records.size());
assertTrue(records.size() > 0);
assertFalse(records.isEmpty());
for (int i = 0; i < res.length; i++) {
assertArrayEquals(res[i], records.get(i).values());
}
Expand All @@ -403,7 +403,7 @@ public void testExcelFormat1() throws IOException {
try (final CSVParser parser = CSVParser.parse(code, CSVFormat.EXCEL)) {
final List<CSVRecord> records = parser.getRecords();
assertEquals(res.length, records.size());
assertTrue(records.size() > 0);
assertFalse(records.isEmpty());
for (int i = 0; i < res.length; i++) {
assertArrayEquals(res[i], records.get(i).values());
}
Expand All @@ -417,7 +417,7 @@ public void testExcelFormat2() throws Exception {
try (final CSVParser parser = CSVParser.parse(code, CSVFormat.EXCEL)) {
final List<CSVRecord> records = parser.getRecords();
assertEquals(res.length, records.size());
assertTrue(records.size() > 0);
assertFalse(records.isEmpty());
for (int i = 0; i < res.length; i++) {
assertArrayEquals(res[i], records.get(i).values());
}
Expand Down Expand Up @@ -620,7 +620,7 @@ public void testGetRecords() throws IOException {
try (final CSVParser parser = CSVParser.parse(CSV_INPUT, CSVFormat.DEFAULT.withIgnoreSurroundingSpaces())) {
final List<CSVRecord> records = parser.getRecords();
assertEquals(RESULT.length, records.size());
assertTrue(records.size() > 0);
assertFalse(records.isEmpty());
for (int i = 0; i < RESULT.length; i++) {
assertArrayEquals(RESULT[i], records.get(i).values());
}
Expand Down Expand Up @@ -1131,7 +1131,7 @@ public void testStartWithEmptyLinesThenHeaders() throws Exception {
try (final CSVParser parser = CSVParser.parse(code, CSVFormat.EXCEL)) {
final List<CSVRecord> records = parser.getRecords();
assertEquals(res.length, records.size());
assertTrue(records.size() > 0);
assertFalse(records.isEmpty());
for (int i = 0; i < res.length; i++) {
assertArrayEquals(res[i], records.get(i).values());
}
Expand Down