Skip to content

Commit 914f2c4

Browse files
garydgregorygarydgregory
committed
Move resources to component specific folder.
1 parent 852e11e commit 914f2c4

36 files changed

Lines changed: 4899 additions & 52 deletions

‎pom.xml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -240,25 +240,25 @@
240240
<configuration>
241241
<excludes>
242242
<!-- These files are used as test data and test result specifications. -->
243-
<exclude>src/test/resources/csv-167/sample1.csv</exclude>
244-
<exclude>src/test/resources/CSV-198/optd_por_public.csv</exclude>
245-
<exclude>src/test/resources/CSV-213/999751170.patch.csv</exclude>
246-
<exclude>src/test/resources/CSVFileParser/bom.csv</exclude>
247-
<exclude>src/test/resources/CSVFileParser/test.csv</exclude>
248-
<exclude>src/test/resources/CSVFileParser/test_default.txt</exclude>
249-
<exclude>src/test/resources/CSVFileParser/test_default_comment.txt</exclude>
250-
<exclude>src/test/resources/CSVFileParser/test_rfc4180.txt</exclude>
251-
<exclude>src/test/resources/CSVFileParser/test_rfc4180_trim.txt</exclude>
252-
<exclude>src/test/resources/CSVFileParser/testCSV85.csv</exclude>
253-
<exclude>src/test/resources/CSVFileParser/testCSV85_default.txt</exclude>
254-
<exclude>src/test/resources/CSVFileParser/testCSV85_ignoreEmpty.txt</exclude>
243+
<exclude>src/test/resources/org/apache/commons/csv/csv-167/sample1.csv</exclude>
244+
<exclude>src/test/resources/org/apache/commons/csv/CSV-198/optd_por_public.csv</exclude>
245+
<exclude>src/test/resources/org/apache/commons/csv/CSV-213/999751170.patch.csv</exclude>
246+
<exclude>src/test/resources/org/apache/commons/csv/CSVFileParser/bom.csv</exclude>
247+
<exclude>src/test/resources/org/apache/commons/csv/CSVFileParser/test.csv</exclude>
248+
<exclude>src/test/resources/org/apache/commons/csv/CSVFileParser/test_default.txt</exclude>
249+
<exclude>src/test/resources/org/apache/commons/csv/CSVFileParser/test_default_comment.txt</exclude>
250+
<exclude>src/test/resources/org/apache/commons/csv/CSVFileParser/test_rfc4180.txt</exclude>
251+
<exclude>src/test/resources/org/apache/commons/csv/CSVFileParser/test_rfc4180_trim.txt</exclude>
252+
<exclude>src/test/resources/org/apache/commons/csv/CSVFileParser/testCSV85.csv</exclude>
253+
<exclude>src/test/resources/org/apache/commons/csv/CSVFileParser/testCSV85_default.txt</exclude>
254+
<exclude>src/test/resources/org/apache/commons/csv/CSVFileParser/testCSV85_ignoreEmpty.txt</exclude>
255255
<!-- The ferc.gov files are included discussion in https://issues.apache.org/jira/browse/LEGAL-175. -->
256-
<exclude>src/test/resources/ferc.gov/contract.txt</exclude>
257-
<exclude>src/test/resources/ferc.gov/transaction.txt</exclude>
256+
<exclude>src/test/resources/org/apache/commons/csv/ferc.gov/contract.txt</exclude>
257+
<exclude>src/test/resources/org/apache/commons/csv/ferc.gov/transaction.txt</exclude>
258258
<exclude>src/test/resources/**/*.bin</exclude>
259-
<exclude>src/test/resources/CSV-259/sample.txt</exclude>
260-
<exclude>src/test/resources/CSVFileParser/testCSV246.csv</exclude>
261-
<exclude>src/test/resources/CSVFileParser/testCSV246_checkWithNoComment.txt</exclude>
259+
<exclude>src/test/resources/org/apache/commons/csv/CSV-259/sample.txt</exclude>
260+
<exclude>src/test/resources/org/apache/commons/csv/CSVFileParser/testCSV246.csv</exclude>
261+
<exclude>src/test/resources/org/apache/commons/csv/CSVFileParser/testCSV246_checkWithNoComment.txt</exclude>
262262
</excludes>
263263
</configuration>
264264
</plugin>

‎src/test/java/org/apache/commons/csv/CSVFileParserTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
*/
4141
public class CSVFileParserTest {
4242

43-
private static final File BASE = new File("src/test/resources/CSVFileParser");
43+
private static final File BASE = new File("src/test/resources/org/apache/commons/csv/CSVFileParser");
4444

4545
private String readTestData(final BufferedReader reader) throws IOException {
4646
String line;
@@ -134,7 +134,7 @@ public void testCSVUrl(final File testFile) throws Exception {
134134
assertEquals(line, format.toString(), testFile.getName() + " Expected format ");
135135

136136
// Now parse the file and compare against the expected results
137-
final URL resource = ClassLoader.getSystemResource("CSVFileParser/" + split[0]);
137+
final URL resource = ClassLoader.getSystemResource("org/apache/commons/csv/CSVFileParser/" + split[0]);
138138
try (final CSVParser parser = CSVParser.parse(resource, Charset.forName("UTF-8"), format)) {
139139
for (final CSVRecord record : parser) {
140140
String parsed = Arrays.toString(record.values());

‎src/test/java/org/apache/commons/csv/CSVParserTest.java‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ public void testBackslashEscapingOld() throws IOException {
178178
@Test
179179
@Disabled("CSV-107")
180180
public void testBOM() throws IOException {
181-
final URL url = ClassLoader.getSystemClassLoader().getResource("CSVFileParser/bom.csv");
181+
final URL url = ClassLoader.getSystemClassLoader().getResource("org/apache/commons/csv/CSVFileParser/bom.csv");
182182
try (final CSVParser parser = CSVParser.parse(url, Charset.forName(UTF_8_NAME), CSVFormat.EXCEL.withHeader())) {
183183
for (final CSVRecord record : parser) {
184184
final String string = record.get("Date");
@@ -190,7 +190,7 @@ public void testBOM() throws IOException {
190190

191191
@Test
192192
public void testBOMInputStream_ParserWithInputStream() throws IOException {
193-
try (final BOMInputStream inputStream = createBOMInputStream("CSVFileParser/bom.csv");
193+
try (final BOMInputStream inputStream = createBOMInputStream("org/apache/commons/csv/CSVFileParser/bom.csv");
194194
final CSVParser parser = CSVParser.parse(inputStream, UTF_8, CSVFormat.EXCEL.withHeader())) {
195195
for (final CSVRecord record : parser) {
196196
final String string = record.get("Date");
@@ -202,7 +202,9 @@ public void testBOMInputStream_ParserWithInputStream() throws IOException {
202202

203203
@Test
204204
public void testBOMInputStream_ParserWithReader() throws IOException {
205-
try (final Reader reader = new InputStreamReader(createBOMInputStream("CSVFileParser/bom.csv"), UTF_8_NAME);
205+
try (
206+
final Reader reader = new InputStreamReader(
207+
createBOMInputStream("org/apache/commons/csv/CSVFileParser/bom.csv"), UTF_8_NAME);
206208
final CSVParser parser = new CSVParser(reader, CSVFormat.EXCEL.withHeader())) {
207209
for (final CSVRecord record : parser) {
208210
final String string = record.get("Date");
@@ -214,7 +216,9 @@ public void testBOMInputStream_ParserWithReader() throws IOException {
214216

215217
@Test
216218
public void testBOMInputStream_parseWithReader() throws IOException {
217-
try (final Reader reader = new InputStreamReader(createBOMInputStream("CSVFileParser/bom.csv"), UTF_8_NAME);
219+
try (
220+
final Reader reader = new InputStreamReader(
221+
createBOMInputStream("org/apache/commons/csv/CSVFileParser/bom.csv"), UTF_8_NAME);
218222
final CSVParser parser = CSVParser.parse(reader, CSVFormat.EXCEL.withHeader())) {
219223
for (final CSVRecord record : parser) {
220224
final String string = record.get("Date");
@@ -941,7 +945,7 @@ public void testNoHeaderMap() throws Exception {
941945
@Test
942946
public void testParse() throws Exception {
943947
final ClassLoader loader = ClassLoader.getSystemClassLoader();
944-
final URL url = loader.getResource("CSVFileParser/test.csv");
948+
final URL url = loader.getResource("org/apache/commons/csv/CSVFileParser/test.csv");
945949
final CSVFormat format = CSVFormat.DEFAULT.withHeader("A", "B", "C", "D");
946950
final Charset charset = StandardCharsets.UTF_8;
947951

‎src/test/java/org/apache/commons/csv/CSVPrinterTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ public void testCSV135() throws IOException {
315315
@Test
316316
public void testCSV259() throws IOException {
317317
final StringWriter sw = new StringWriter();
318-
final Reader reader = new FileReader("src/test/resources/CSV-259/sample.txt");
318+
final Reader reader = new FileReader("src/test/resources/org/apache/commons/csv/CSV-259/sample.txt");
319319
try (final CSVPrinter printer = new CSVPrinter(sw, CSVFormat.DEFAULT.withEscape('!').withQuote(null))) {
320320
printer.print(reader);
321321
assertEquals("x!,y!,z", sw.toString());

‎src/test/java/org/apache/commons/csv/issues/JiraCsv167Test.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public void parse() throws IOException {
8383
}
8484

8585
private Reader getTestInput() {
86-
final InputStream is = ClassLoader.getSystemClassLoader().getResourceAsStream("csv-167/sample1.csv");
86+
final InputStream is = ClassLoader.getSystemClassLoader().getResourceAsStream("org/apache/commons/csv/csv-167/sample1.csv");
8787
return new InputStreamReader(is);
8888
}
8989
}

‎src/test/java/org/apache/commons/csv/issues/JiraCsv198Test.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class JiraCsv198Test {
3434

3535
@Test
3636
public void test() throws UnsupportedEncodingException, IOException {
37-
final InputStream pointsOfReference = getClass().getResourceAsStream("/CSV-198/optd_por_public.csv");
37+
final InputStream pointsOfReference = getClass().getResourceAsStream("/org/apache/commons/csv/CSV-198/optd_por_public.csv");
3838
assertNotNull(pointsOfReference);
3939
try (@SuppressWarnings("resource")
4040
CSVParser parser = CSV_FORMAT.parse(new InputStreamReader(pointsOfReference, "UTF-8"))) {

‎src/test/java/org/apache/commons/csv/issues/JiraCsv248Test.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,6 @@ public void testJiraCsv248() throws IOException, ClassNotFoundException {
7575
}
7676

7777
private static InputStream getTestInput() {
78-
return ClassLoader.getSystemClassLoader().getResourceAsStream("CSV-248/csvRecord.bin");
78+
return ClassLoader.getSystemClassLoader().getResourceAsStream("org/apache/commons/csv/CSV-248/csvRecord.bin");
7979
}
8080
}

src/test/resources/CSV-198/optd_por_public.csv renamed to src/test/resources/org/apache/commons/csv/CSV-198/optd_por_public.csv

File renamed without changes.

src/test/resources/CSV-213/999751170.patch.csv renamed to src/test/resources/org/apache/commons/csv/CSV-213/999751170.patch.csv

File renamed without changes.

src/test/resources/CSV-248/csvRecord.bin renamed to src/test/resources/org/apache/commons/csv/CSV-248/csvRecord.bin

File renamed without changes.

0 commit comments

Comments
 (0)