Skip to content

Commit 2c83a30

Browse files
authored
Fixed CSV-271 & Add testcase for new change (apache#157)
1 parent 6a2376a commit 2c83a30

3 files changed

Lines changed: 57 additions & 3 deletions

File tree

src/main/java/org/apache/commons/csv/CSVPrinter.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,7 @@ public void printRecord(final Iterable<?> values) throws IOException {
281281
* If an I/O error occurs
282282
*/
283283
public void printRecord(final Object... values) throws IOException {
284-
format.printRecord(out, values);
285-
newRecord = true;
284+
printRecord(Arrays.asList(values));
286285
}
287286

288287
/**

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import java.sql.ResultSet;
4444
import java.sql.SQLException;
4545
import java.util.Arrays;
46+
import java.util.Objects;
4647

4748
import org.junit.jupiter.api.Test;
4849

@@ -771,7 +772,7 @@ public void testFormatThrowsNullPointerException() {
771772
final CSVFormat csvFormat = CSVFormat.MYSQL;
772773

773774
final NullPointerException e = assertThrows(NullPointerException.class, () -> csvFormat.format((Object[]) null));
774-
assertEquals(CSVFormat.class.getName(), e.getStackTrace()[0].getClassName());
775+
assertEquals(Objects.class.getName(), e.getStackTrace()[0].getClassName());
775776
}
776777

777778
@Test
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
package org.apache.commons.csv.issues;
19+
20+
import static org.junit.jupiter.api.Assertions.assertEquals;
21+
22+
import java.io.IOException;
23+
import java.io.StringWriter;
24+
import java.util.Arrays;
25+
26+
import org.apache.commons.csv.CSVFormat;
27+
import org.apache.commons.csv.CSVPrinter;
28+
import org.junit.jupiter.api.Test;
29+
30+
public class JiraCsv271Test {
31+
32+
@Test
33+
public void testJiraCsv271_withArray() throws IOException {
34+
final CSVFormat csvFormat = CSVFormat.DEFAULT;
35+
final StringWriter stringWriter = new StringWriter();
36+
try (CSVPrinter printer = new CSVPrinter(stringWriter, csvFormat)) {
37+
printer.print("a");
38+
printer.printRecord("b","c");
39+
}
40+
assertEquals("a,b,c\r\n", stringWriter.toString());
41+
}
42+
43+
@Test
44+
public void testJiraCsv271_withList() throws IOException {
45+
final CSVFormat csvFormat = CSVFormat.DEFAULT;
46+
final StringWriter stringWriter = new StringWriter();
47+
try (CSVPrinter printer = new CSVPrinter(stringWriter, csvFormat)) {
48+
printer.print("a");
49+
printer.printRecord(Arrays.asList("b","c"));
50+
}
51+
assertEquals("a,b,c\r\n", stringWriter.toString());
52+
}
53+
54+
}

0 commit comments

Comments
 (0)