Skip to content

Commit 554af4b

Browse files
committed
Access test data using the classloader instead of defining a file handle
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1742426 13f79535-47bb-0310-9956-ffa450edef68
1 parent f99b7e7 commit 554af4b

1 file changed

Lines changed: 10 additions & 7 deletions

File tree

src/test/java/org/apache/commons/csv/bugs/JiraCsv167Test.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
package org.apache.commons.csv.bugs;
1818

1919
import java.io.BufferedReader;
20-
import java.io.File;
21-
import java.io.FileReader;
2220
import java.io.IOException;
23-
import java.nio.charset.Charset;
21+
import java.io.InputStream;
22+
import java.io.InputStreamReader;
23+
import java.io.Reader;
2424

2525
import org.apache.commons.csv.CSVFormat;
2626
import org.apache.commons.csv.CSVParser;
@@ -33,8 +33,7 @@ public class JiraCsv167Test {
3333

3434
@Test
3535
public void parse() throws IOException {
36-
final File csvData = new File("src/test/resources/csv-167/sample1.csv");
37-
final BufferedReader br = new BufferedReader(new FileReader(csvData));
36+
final BufferedReader br = new BufferedReader(getTestInput());
3837
String s = null;
3938
int totcomment = 0;
4039
int totrecs = 0;
@@ -67,11 +66,10 @@ public void parse() throws IOException {
6766
format = format.withRecordSeparator('\n');
6867
format = format.withSkipHeaderRecord(false);
6968
//
70-
final CSVParser parser = CSVParser.parse(csvData, Charset.defaultCharset(), format);
69+
final CSVParser parser = format.parse(getTestInput());
7170
int comments = 0;
7271
int records = 0;
7372
for (final CSVRecord csvRecord : parser) {
74-
// System.out.println(csvRecord.isComment() + "[" + csvRecord.toString() + "]");
7573
records++;
7674
if (csvRecord.hasComment()) {
7775
comments++;
@@ -81,4 +79,9 @@ public void parse() throws IOException {
8179
Assert.assertEquals(totcomment, comments);
8280
Assert.assertEquals(totrecs, records); // records includes the header
8381
}
82+
83+
private Reader getTestInput() {
84+
final InputStream is = ClassLoader.getSystemClassLoader().getResourceAsStream("csv-167/sample1.csv");
85+
return new InputStreamReader(is);
86+
}
8487
}

0 commit comments

Comments
 (0)