RESOLVED - issue BATCH-274: Support Callable<ExitStatus>

Added CallablTaskletAdapter (also removed dependency on backport concurrent)

spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/CallableTaskletAdapterTests.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2006-2007 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.batch.core.step.tasklet;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.util.concurrent.Callable;
+
+import org.junit.Test;
+import org.springframework.batch.repeat.ExitStatus;
+public class CallableTaskletAdapterTests {
+	
+	private CallableTaskletAdapter adapter = new CallableTaskletAdapter();
+
+	/**
+	 * Test method for {@link org.springframework.batch.core.step.tasklet.CallableTaskletAdapter#execute()}.
+	 * @throws Exception 
+	 */
+	@Test
+	public void testExecute() throws Exception {
+		adapter.setCallable(new Callable<ExitStatus>() {
+			public ExitStatus call() throws Exception {
+				return ExitStatus.FINISHED;
+			}
+		});
+		assertEquals(ExitStatus.FINISHED, adapter.execute());
+	}
+
+	@Test
+	public void testAfterPropertiesSet() throws Exception {
+		try {
+			adapter.afterPropertiesSet();
+			fail("Expected IllegalArgumentException");
+		}
+		catch (IllegalArgumentException e) {
+			// expected
+		}
+	}
+	
+}

spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/TaskletAdapterTests.java

@@ -15,16 +15,17 @@
  */
 package org.springframework.batch.core.step.tasklet;
 
-import org.springframework.batch.core.step.tasklet.TaskletAdapter;
-import org.springframework.batch.repeat.ExitStatus;
+import static org.junit.Assert.assertEquals;
 
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.batch.repeat.ExitStatus;
 
 /**
  * @author Dave Syer
  *
  */
-public class TaskletAdapterTests extends TestCase {
+public class TaskletAdapterTests {
 	
 	private TaskletAdapter tasklet = new TaskletAdapter();
 	private Object result = null;
@@ -40,7 +41,8 @@ public class TaskletAdapterTests extends TestCase {
 	/* (non-Javadoc) 
 	 * @see junit.framework.TestCase#setUp()
 	 */
-	protected void setUp() throws Exception {
+	@Before
+	public void setUp() throws Exception {
 		tasklet.setTargetObject(this);
 		tasklet.setTargetMethod("execute");
 	}
@@ -49,6 +51,7 @@ public class TaskletAdapterTests extends TestCase {
 	 * Test method for {@link org.springframework.batch.core.step.tasklet.TaskletAdapter#execute()}.
 	 * @throws Exception 
 	 */
+	@Test
 	public void testExecuteWithExitStatus() throws Exception {
 		assertEquals(ExitStatus.NOOP, tasklet.execute());
 	}
@@ -56,6 +59,7 @@ public class TaskletAdapterTests extends TestCase {
 	/**
 	 * Test method for {@link org.springframework.batch.core.step.tasklet.TaskletAdapter#mapResult(java.lang.Object)}.
 	 */
+	@Test
 	public void testMapResultWithNull() throws Exception {
 		tasklet.setTargetMethod("process");
 		assertEquals(ExitStatus.FINISHED, tasklet.execute());
@@ -63,7 +67,8 @@ public class TaskletAdapterTests extends TestCase {
 
 	/**
 	 * Test method for {@link org.springframework.batch.core.step.tasklet.TaskletAdapter#mapResult(java.lang.Object)}.
-	 */
+	 */	
+	@Test
 	public void testMapResultWithNonNull() throws Exception {
 		tasklet.setTargetMethod("process");
 		this.result = "foo";