Send test coverage in core up to the high 90s.

spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/NoSuchJobExecutionException.java

@@ -1,32 +0,0 @@
-/*
- * 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.execution.launch;
-
-/**
- * @author Dave Syer
- *
- */
-public class NoSuchJobExecutionException extends Exception {
-
-	/**
-	 * @param message
-	 */
-	public NoSuchJobExecutionException(String message) {
-		super(message);
-	}
-	
-	
-}

spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobLauncher.java

@@ -84,8 +84,8 @@ public class SimpleJobLauncher implements JobLauncher, InitializingBean {
 				try {
 					logger.info("Job: [" + job + "] launched with the following parameters: [" + jobParameters + "]");
 					ExitStatus exitStatus = job.run(jobExecution);
-					// shouldn't need to set the exit status like this, I'm
-					// leaving it to make the latest change easier
+					// The exit status should be set by the Job. TODO: remove
+					// this line...
 					jobExecution.setExitStatus(exitStatus);
 					logger.info("Job: [" + job + "] completed successfully with the following parameters: ["
 							+ jobParameters + "]");
@@ -126,7 +126,8 @@ public class SimpleJobLauncher implements JobLauncher, InitializingBean {
 	}
 
 	/**
-	 * Ensure the required dependencies of a {@link JobRepository} have been set.
+	 * Ensure the required dependencies of a {@link JobRepository} have been
+	 * set.
 	 */
 	public void afterPropertiesSet() throws Exception {
 		Assert.state(jobRepository != null, "A JobRepository has not been set.");

spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobLauncherTests.java

@@ -16,6 +16,9 @@
 
 package org.springframework.batch.execution.launch;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
@@ -24,50 +27,112 @@ import org.springframework.batch.core.domain.JobExecution;
 import org.springframework.batch.core.domain.JobParameters;
 import org.springframework.batch.core.domain.JobSupport;
 import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.batch.io.exception.BatchCriticalException;
 import org.springframework.batch.repeat.ExitStatus;
+import org.springframework.core.task.TaskExecutor;
 
 /**
  * @author Lucas Ward
- *
+ * 
  */
 public class SimpleJobLauncherTests extends TestCase {
 
 	private SimpleJobLauncher jobLauncher;
-	
+
 	private MockControl repositoryControl = MockControl.createControl(JobRepository.class);
-	
+
 	private Job job = new JobSupport("foo") {
-		public ExitStatus run(JobExecution execution) throws BatchCriticalException {
+		public ExitStatus run(JobExecution execution) {
 			return ExitStatus.FINISHED;
 		}
 	};
+
 	private JobParameters jobParameters = new JobParameters();
 
 	private JobRepository jobRepository;
-	
+
 	protected void setUp() throws Exception {
 		super.setUp();
-		
-		jobLauncher = new SimpleJobLauncher();	
+
+		jobLauncher = new SimpleJobLauncher();
 		jobRepository = (JobRepository) repositoryControl.getMock();
 		jobLauncher.setJobRepository(jobRepository);
-		
+
 	}
 
+	public void testRun() throws Exception {
 
-	public void testRun() throws Exception{
-		
 		JobExecution jobExecution = new JobExecution(null);
-		
+
 		jobRepository.createJobExecution(job, jobParameters);
 		repositoryControl.setReturnValue(jobExecution);
-		
+
 		repositoryControl.replay();
-		
+
 		jobLauncher.run(job, jobParameters);
 		assertEquals(ExitStatus.FINISHED, jobExecution.getExitStatus());
-		
+
 		repositoryControl.verify();
 	}
+
+	public void testTaskExecutor() throws Exception {
+		final List list = new ArrayList();
+		jobLauncher.setTaskExecutor(new TaskExecutor() {
+			public void execute(Runnable task) {
+				list.add("execute");
+				task.run();
+			}
+		});
+		testRun();
+		assertEquals(1, list.size());
+	}
+
+	public void testRunWithException() throws Exception {
+		job = new JobSupport() {
+			public ExitStatus run(JobExecution execution) {
+				execution.setExitStatus(ExitStatus.FAILED);
+				throw new RuntimeException("foo");
+			}
+		};
+		try {
+			testRun();
+			fail("Expected RuntimeException");
+		}
+		catch (RuntimeException e) {
+			assertEquals("foo", e.getMessage());
+		}
+	}
+
+	public void testRunWithError() throws Exception {
+		job = new JobSupport() {
+			public ExitStatus run(JobExecution execution) {
+				execution.setExitStatus(ExitStatus.FAILED);
+				throw new Error("foo");
+			}
+		};
+		try {
+			testRun();
+			fail("Expected Error");
+		}
+		catch (RuntimeException e) {
+			assertEquals("foo", e.getCause().getMessage());
+		}
+	}
+
+	public void testInitialiseWithoutRepository() throws Exception {
+		try {
+			new SimpleJobLauncher().afterPropertiesSet();
+			fail("Expected IllegalArgumentException");
+		}
+		catch (IllegalStateException e) {
+			// expected
+			assertTrue("Message did not contain repository: " + e.getMessage(), e.getMessage().toLowerCase().contains(
+					"repository"));
+		}
+	}
+
+	public void testInitialiseWithRepository() throws Exception {
+		jobLauncher = new SimpleJobLauncher();
+		jobLauncher.setJobRepository(jobRepository);
+		jobLauncher.afterPropertiesSet(); // no error
+	}
 }