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

RESOLVED - issue BATCH-620: Flat File Writer that writes a Header

Browse Source 
Added headers to flat file and xml item writers
This commit is contained in:
dsyer
2008-05-27 20:23:25 +00:00
parent ee86b18a31
commit 488ce57cc0
4 changed files with 271 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java
View File

@@ -336,6 +336,70 @@ public class FlatFileItemWriterTests extends TestCase {
assertEquals(TEST_STRING, lineFromFile);
}
public void testWriteHeader() throws Exception {
writer.setHeaderLines(new String[] {"a", "b"});
writer.open(executionContext);
writer.write(TEST_STRING);
writer.flush();
writer.close(null);
String lineFromFile = readLine();
assertEquals("a", lineFromFile);
lineFromFile = readLine();
assertEquals("b", lineFromFile);
lineFromFile = readLine();
assertEquals(TEST_STRING, lineFromFile);
}
public void testWriteHeaderAfterRestartOnFirstChunk() throws Exception {
writer.setHeaderLines(new String[] {"a", "b"});
writer.open(executionContext);
writer.write(TEST_STRING);
writer.clear();
writer.close(executionContext);
writer.open(executionContext);
writer.write(TEST_STRING);
writer.flush();
writer.close(executionContext);
String lineFromFile = readLine();
assertEquals("a", lineFromFile);
lineFromFile = readLine();
assertEquals("b", lineFromFile);
lineFromFile = readLine();
assertEquals(TEST_STRING, lineFromFile);
lineFromFile = readLine();
assertEquals(null, lineFromFile);
}
public void testWriteHeaderAfterRestartOnSecondChunk() throws Exception {
writer.setHeaderLines(new String[] {"a", "b"});
writer.open(executionContext);
writer.write(TEST_STRING);
writer.flush();
writer.update(executionContext);
writer.write(TEST_STRING);
writer.clear();
writer.close(executionContext);
String lineFromFile = readLine();
assertEquals("a", lineFromFile);
lineFromFile = readLine();
assertEquals("b", lineFromFile);
lineFromFile = readLine();
assertEquals(TEST_STRING, lineFromFile);
writer.open(executionContext);
writer.write(TEST_STRING);
writer.flush();
writer.close(executionContext);
reader = null;
lineFromFile = readLine();
assertEquals("a", lineFromFile);
lineFromFile = readLine();
assertEquals("b", lineFromFile);
lineFromFile = readLine();
assertEquals(TEST_STRING, lineFromFile);
lineFromFile = readLine();
assertEquals(TEST_STRING, lineFromFile);
}
private void commit() throws Exception {
writer.flush();
}

86
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemWriterTests.java
View File

@@ -37,11 +37,12 @@ public class StaxEventItemWriterTests extends TestCase {
// test item for writing to output
private Object item = new Object() {
public String toString() {
return TEST_STRING;
return ClassUtils.getShortName(StaxEventItemWriter.class)+"-testString";
}
};
private static final String TEST_STRING = ClassUtils.getShortName(StaxEventItemWriter.class) + "-testString";
private static final String TEST_STRING = "<!--" + ClassUtils.getShortName(StaxEventItemWriter.class)
+ "-testString-->";
private static final int NOT_FOUND = -1;
@@ -96,9 +97,11 @@ public class StaxEventItemWriterTests extends TestCase {
public void testWriteAndFlush() throws Exception {
writer.open(executionContext);
writer.write(item);
assertEquals("", outputFileContent());
String content = outputFileContent();
assertEquals("", content);
writer.flush();
assertTrue(contains(outputFileContent(), TEST_STRING));
content = outputFileContent();
assertTrue("Wrong content: "+content, contains(content, TEST_STRING));
}
/**
@@ -131,6 +134,66 @@ public class StaxEventItemWriterTests extends TestCase {
assertEquals(NOT_FOUND, thirdRecord);
}
/**
* Item is written to the output file only after flush.
*/
public void testWriteWithHeader() throws Exception {
Object header1 = new Object();
Object header2 = new Object();
writer.setHeaderItems(new Object[] {header1, header2});
writer.open(executionContext);
writer.write(item);
String content = outputFileContent();
assertEquals("", content);
writer.flush();
content = outputFileContent();
assertTrue("Wrong content: "+content, contains(content, "<!--" + header1 + "-->"));
assertTrue("Wrong content: "+content, contains(content, "<!--" + header2 + "-->"));
assertTrue("Wrong content: "+content, contains(content, TEST_STRING));
}
/**
* Item is written to the output file only after flush.
*/
public void testWriteWithHeaderAfterRollback() throws Exception {
Object header = new Object();
writer.setHeaderItems(new Object[] {header});
writer.open(executionContext);
writer.write(item);
String content = outputFileContent();
assertEquals("", content);
writer.clear();
writer.flush();
writer.open(executionContext);
writer.write(item);
writer.flush();
content = outputFileContent();
assertEquals("Wrong content: "+content, 1, countContains(content, "<!--" + header + "-->"));
assertEquals("Wrong content: "+content, 1, countContains(content, TEST_STRING));
}
/**
* Item is written to the output file only after flush.
*/
public void testWriteWithHeaderAfterFlushAndRollback() throws Exception {
Object header = new Object();
writer.setHeaderItems(new Object[] {header});
writer.open(executionContext);
writer.write(item);
String content = outputFileContent();
assertEquals("", content);
writer.flush();
writer.update(executionContext);
writer.close(executionContext);
writer.open(executionContext);
writer.write(item);
writer.clear();
writer.flush();
content = outputFileContent();
assertEquals("Wrong content: "+content, 1, countContains(content, "<!--" + header + "-->"));
assertEquals("Wrong content: "+content, 1, countContains(content, TEST_STRING));
}
/**
* Count of 'records written so far' is returned as statistics.
*/
@@ -141,7 +204,7 @@ public class StaxEventItemWriterTests extends TestCase {
writer.write(item);
writer.update(executionContext);
long writeStatistics = executionContext.getLong(ClassUtils.getShortName(StaxEventItemWriter.class)
+ ".record.count");
+ ".record.count");
assertEquals(i, writeStatistics);
}
@@ -195,7 +258,8 @@ public class StaxEventItemWriterTests extends TestCase {
StaxResult staxResult = (StaxResult) result;
try {
staxResult.getXMLEventWriter().add(XMLEventFactory.newInstance().createComment(graph.toString()));
} catch (XMLStreamException e) {
}
catch (XMLStreamException e) {
throw new RuntimeException("Exception while writing to output file", e);
}
}
@@ -237,4 +301,14 @@ public class StaxEventItemWriterTests extends TestCase {
private boolean contains(String str, String searchStr) {
return str.indexOf(searchStr) != -1;
}
private int countContains(String str, String searchStr) {
int begin = -1;
int count = 0;
while (str.indexOf(searchStr, begin+1) > begin) {
count++;
begin = str.indexOf(searchStr, begin);
}
return count;
}
}