update docos for 2.1 release

spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/XStreamExecutionContextStringSerializerTests.java

@@ -43,7 +43,7 @@ public class XStreamExecutionContextStringSerializerTests {
 	public void testComplexObject() {
 		Map<String, Object> m1 = new HashMap<String, Object>();
 		ComplexObject o1 = new ComplexObject();
-		o1.setName("Test");
+		o1.setName("02345");
 		Map<String, Object> m = new HashMap<String, Object>();
 		m.put("object1", Long.valueOf(12345L));
 		m.put("object2", "OBJECT TWO");
@@ -131,5 +131,11 @@ public class XStreamExecutionContextStringSerializerTests {
 			result = 31 * result + (map != null ? map.hashCode() : 0);
 			return result;
 		}
+
+		@Override
+		public String toString() {
+			return "ComplexObject [name=" + name + ", number=" + number + "]";
+		}
+		
 	}
 }

spring-batch-core/src/test/java/org/springframework/batch/core/step/item/TaskletStepExceptionTests.java

@@ -42,6 +42,7 @@ import org.springframework.transaction.support.DefaultTransactionStatus;
  * Tests for the behavior of TaskletStep in a failure scenario.
  * 
  * @author Lucas Ward
+ * @author Dave Syer
  * 
  */
 public class TaskletStepExceptionTests {
@@ -199,6 +200,7 @@ public class TaskletStepExceptionTests {
 			protected void doCommit(DefaultTransactionStatus status) throws TransactionException {
 				throw new RuntimeException("bar");
 			}
+
 			@Override
 			protected void doRollback(DefaultTransactionStatus status) throws TransactionException {
 				throw new RuntimeException("foo");
@@ -219,6 +221,44 @@ public class TaskletStepExceptionTests {
 		assertEquals("foo", e.getMessage());
 	}
 
+	@Test
+	public void testRepositoryError() throws Exception {
+
+		taskletStep.setTasklet(new Tasklet() {
+
+			public RepeatStatus execute(StepContribution contribution, ChunkContext attributes) throws Exception {
+				return RepeatStatus.FINISHED;
+			}
+
+		});
+
+		jobRepository.setFailOnUpdate(true);
+		taskletStep.execute(stepExecution);
+		assertEquals(UNKNOWN, stepExecution.getStatus());
+		Throwable e = stepExecution.getFailureExceptions().get(0);
+		assertEquals("Expected exception in step execution context persistence", e.getMessage());
+
+	}
+
+	@Test
+	public void testRepositoryErrorOnFailure() throws Exception {
+
+		taskletStep.setTasklet(new Tasklet() {
+
+			public RepeatStatus execute(StepContribution contribution, ChunkContext attributes) throws Exception {
+				throw new RuntimeException("Tasklet exception");
+			}
+
+		});
+
+		jobRepository.setFailOnUpdate(true);
+		taskletStep.execute(stepExecution);
+		assertEquals(UNKNOWN, stepExecution.getStatus());
+		Throwable e = stepExecution.getFailureExceptions().get(0);
+		assertEquals("Expected exception in step execution context persistence", e.getMessage());
+
+	}
+
 	@Test
 	public void testUpdateError() throws Exception {
 
@@ -261,6 +301,12 @@ public class TaskletStepExceptionTests {
 
 		private int updateCount = 0;
 
+		private boolean failOnUpdate = false;
+
+		public void setFailOnUpdate(boolean failOnUpdate) {
+			this.failOnUpdate = failOnUpdate;
+		}
+
 		public void add(StepExecution stepExecution) {
 		}
 
@@ -289,6 +335,9 @@ public class TaskletStepExceptionTests {
 		}
 
 		public void updateExecutionContext(StepExecution stepExecution) {
+			if (failOnUpdate) {
+				throw new RuntimeException("Expected exception in step execution context persistence");
+			}
 		}
 
 		public int getUpdateCount() {