Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BATCH-1869: Updated DelimitedLineTokenizer to support String delimiters

Browse Source
This commit is contained in:
Michael Minella
2012-10-11 12:22:54 -05:00
parent 5085dc9e61
commit 1b71ada1ff
2 changed files with 85 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/DelimitedLineTokenizerTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2006-2007 the original author or authors.
* Copyright 2006-2012 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@ public class DelimitedLineTokenizerTests {
@Test
public void testInvalidConstructorArgument() {
try {
new DelimitedLineTokenizer(DelimitedLineTokenizer.DEFAULT_QUOTE_CHARACTER);
new DelimitedLineTokenizer(String.valueOf(DelimitedLineTokenizer.DEFAULT_QUOTE_CHARACTER));
fail("Quote character can't be used as delimiter for delimited line tokenizer!");
}
catch (Exception e) {
@@ -83,18 +83,18 @@ public class DelimitedLineTokenizerTests {
assertEquals(3, e.getActualCount());
}
}
@Test
public void testTooFewNamesNotStrict() {
tokenizer.setNames(new String[] {"A", "B"});
tokenizer.setStrict(false);
FieldSet tokens = tokenizer.tokenize("a,b,c");
assertTrue(TOKEN_MATCHES, tokens.readString(0).equals("a"));
assertTrue(TOKEN_MATCHES, tokens.readString(1).equals("b"));
}
}
@Test
public void testTooManyNames() {
tokenizer.setNames(new String[] {"A", "B", "C", "D"});
@@ -105,30 +105,57 @@ public class DelimitedLineTokenizerTests {
assertEquals(4, e.getExpectedCount());
assertEquals(3, e.getActualCount());
}
}
@Test
public void testTooManyNamesNotStrict() {
tokenizer.setNames(new String[] {"A", "B", "C", "D","E"});
tokenizer.setStrict( false );
FieldSet tokens = tokenizer.tokenize("a,b,c");
assertTrue(TOKEN_MATCHES, tokens.readString(0).equals("a"));
assertTrue(TOKEN_MATCHES, tokens.readString(1).equals("b"));
assertTrue(TOKEN_MATCHES, tokens.readString(2).equals("c"));
assertTrue(TOKEN_MATCHES, tokens.readString(3).equals(""));
assertTrue(TOKEN_MATCHES, tokens.readString(4).equals(""));
}
assertTrue(TOKEN_MATCHES, tokens.readString(4).equals(""));
}
@Test
public void testDelimitedLineTokenizerChar() {
AbstractLineTokenizer tokenizer = new DelimitedLineTokenizer(' ');
AbstractLineTokenizer tokenizer = new DelimitedLineTokenizer(" ");
FieldSet line = tokenizer.tokenize("a b c");
assertEquals(3, line.getFieldCount());
}
@Test
public void testDelimitedLineTokenizerString() {
AbstractLineTokenizer tokenizer = new DelimitedLineTokenizer(" b ");
FieldSet line = tokenizer.tokenize("a b c");
assertEquals(2, line.getFieldCount());
assertEquals("a", line.readString(0));
assertEquals("c", line.readString(1));
}
@Test
public void testDelimitedLineTokenizerNewlineToken() {
AbstractLineTokenizer tokenizer = new DelimitedLineTokenizer("\n");
FieldSet line = tokenizer.tokenize("a b\n c");
assertEquals(2, line.getFieldCount());
assertEquals("a b", line.readString(0));
assertEquals("c", line.readString(1));
}
@Test
public void testDelimitedLineTokenizerWrappedToken() {
AbstractLineTokenizer tokenizer = new DelimitedLineTokenizer("\nrap");
FieldSet line = tokenizer.tokenize("a b\nrap c");
assertEquals(2, line.getFieldCount());
assertEquals("a b", line.readString(0));
assertEquals("c", line.readString(1));
}
@Test
public void testTokenizeWithQuotes() {
FieldSet line = tokenizer.tokenize("a,b,\"c\"");
@@ -202,10 +229,10 @@ public class DelimitedLineTokenizerTests {
FieldSet line = tokenizer.tokenize("");
assertEquals(0, line.getFieldCount());
}
@Test
public void testEmptyLineWithNames(){
tokenizer.setNames(new String[]{"A", "B"});
try{
tokenizer.tokenize("");
@@ -245,7 +272,7 @@ public class DelimitedLineTokenizerTests {
assertEquals("c\nrap", line.readString(2));
}
@Test
public void testTokenizeWithQuotesEmptyValue() {
FieldSet line = tokenizer.tokenize("\"a\",\"b\",\"\",\"d\"");
@@ -296,4 +323,4 @@ public class DelimitedLineTokenizerTests {
assertEquals("c", line.readString("bar"));
}
}
}