Skip to content

Commit c78cfc4

Browse files
committed
More prep for #31
1 parent be64a77 commit c78cfc4

File tree

1 file changed

+24
-19
lines changed

1 file changed

+24
-19
lines changed

csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/ParserWithHeaderTest.java

+24-19
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,30 @@ protected static class Entry {
2626

2727
public void testSimpleHeader() throws Exception
2828
{
29-
CsvParser parser = (CsvParser) MAPPER.createParser(
30-
"name, age, other\nfoo,2,xyz\n");
31-
// need to enable first-line-as-schema handling:
32-
parser.setSchema(CsvSchema.emptySchema().withHeader());
33-
assertToken(JsonToken.START_OBJECT, parser.nextToken());
34-
CsvSchema schema = parser.getSchema();
35-
assertEquals(3, schema.size());
36-
37-
// verify that names from first line are trimmed:
38-
assertEquals("name", schema.columnName(0));
39-
assertEquals("age", schema.columnName(1));
40-
assertEquals("other", schema.columnName(2));
41-
parser.close();
29+
try (CsvParser parser = (CsvParser) MAPPER.createParser(
30+
"name, age, other\nfoo,2,xyz\n")) {
31+
// need to enable first-line-as-schema handling:
32+
parser.setSchema(CsvSchema.emptySchema().withHeader());
33+
assertToken(JsonToken.START_OBJECT, parser.nextToken());
34+
CsvSchema schema = parser.getSchema();
35+
assertEquals(3, schema.size());
36+
37+
// verify that names from first line are trimmed:
38+
assertEquals("name", schema.columnName(0));
39+
assertEquals("age", schema.columnName(1));
40+
assertEquals("other", schema.columnName(2));
41+
42+
assertEquals("name", parser.nextFieldName());
43+
assertEquals("foo", parser.nextTextValue());
44+
assertEquals("age", parser.nextFieldName());
45+
assertEquals("2", parser.nextTextValue());
46+
assertEquals("other", parser.nextFieldName());
47+
assertEquals("xyz", parser.nextTextValue());
48+
assertToken(JsonToken.END_OBJECT, parser.nextToken());
49+
}
50+
51+
// But! Can change header name trimming:
52+
// [dataformats-text#31]: Allow disabling header name trimming
4253
}
4354

4455
public void testSimpleQuotes() throws Exception
@@ -127,12 +138,6 @@ public void testLongColumnName() throws Exception
127138
p.close();
128139
}
129140

130-
// [dataformats-text#31]: Allow disabling header name trimming
131-
public void testHeaderNamePadding() throws Exception
132-
{
133-
// TODO
134-
}
135-
136141
/*
137142
/**********************************************************************
138143
/* Test methods, fail

0 commit comments

Comments
 (0)