RESOLVED - issue BATCH-1317: Add flag to FlatFileItemWriter to delete empty files

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

@@ -370,19 +370,26 @@ public class FlatFileItemWriterTests {
 	@Test
 	public void testWriteStringWithBogusEncoding() throws Exception {
 		writer.setEncoding("BOGUS");
+		// writer.setShouldDeleteIfEmpty(true);
 		try {
 			writer.open(executionContext);
-			fail("Expecyted ItemStreamException");
+			fail("Expected ItemStreamException");
 		}
 		catch (ItemStreamException e) {
 			assertTrue(e.getCause() instanceof UnsupportedCharsetException);
 		}
 		writer.close();
+		// Try and write after the exception on open:
+		writer.setEncoding("UTF-8");
+		writer.open(executionContext);
+		writer.write(Collections.singletonList(TEST_STRING));
 	}
 
 	@Test
 	public void testWriteStringWithEncodingAfterClose() throws Exception {
-		testWriteStringWithBogusEncoding();
+		writer.open(executionContext);
+		writer.write(Collections.singletonList(TEST_STRING));
+		writer.close();
 		writer.setEncoding("UTF-8");
 		writer.open(executionContext);
 		writer.write(Collections.singletonList(TEST_STRING));
@@ -428,6 +435,22 @@ public class FlatFileItemWriterTests {
 		assertEquals(TEST_STRING, lineFromFile);
 	}
 
+	@Test
+	public void testWriteHeaderAndDeleteOnExit() throws Exception {
+		writer.setHeaderCallback(new FlatFileHeaderCallback() {
+
+			public void writeHeader(Writer writer) throws IOException {
+				writer.write("a\nb");
+			}
+
+		});
+		writer.setShouldDeleteIfEmpty(true);
+		writer.open(executionContext);
+		assertTrue(outputFile.exists());
+		writer.close();
+		assertFalse(outputFile.exists());
+	}
+
 	@Test
 	public void testWriteHeaderAfterRestartOnFirstChunk() throws Exception {
 		writer.setHeaderCallback(new FlatFileHeaderCallback() {