Add tests for JobOperator.recover

Signed-off-by: Yejeong, Ham <[email protected]>

Author: thelightway24

spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/CommandLineJobOperatorTests.java

@@ -35,6 +35,7 @@
  * Tests for {@link CommandLineJobOperator}.
  *
  * @author Mahmoud Ben Hassine
+ * @author Yejeong Ham
  */
 class CommandLineJobOperatorTests {
 
@@ -133,4 +134,18 @@ void abandon() throws Exception {
 		Mockito.verify(jobOperator).abandon(jobExecution);
 	}
 
+	@Test
+	void recover() {
+		// given
+		long jobExecutionId = 1;
+		JobExecution jobExecution = mock();
+
+		// when
+		Mockito.when(jobRepository.getJobExecution(jobExecutionId)).thenReturn(jobExecution);
+		this.commandLineJobOperator.recover(jobExecutionId);
+
+		// then
+		Mockito.verify(jobOperator).recover(jobExecution);
+	}
+
 }

spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/TaskExecutorJobOperatorTests.java

@@ -32,6 +32,7 @@
 import org.springframework.batch.core.job.JobExecution;
 import org.springframework.batch.core.job.JobExecutionException;
 import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.UnexpectedJobExecutionException;
 import org.springframework.batch.core.job.parameters.JobParameters;
 import org.springframework.batch.core.job.parameters.JobParametersIncrementer;
 import org.springframework.batch.core.step.Step;
@@ -69,7 +70,7 @@
  * @author Will Schipp
  * @author Mahmoud Ben Hassine
  * @author Jinwoo Bae
- *
+ * @author Yejeong Ham
  */
 @SuppressWarnings("removal")
 class TaskExecutorJobOperatorTests {
@@ -427,6 +428,54 @@ void testAbortNonStopping() {
 		assertThrows(JobExecutionAlreadyRunningException.class, () -> jobOperator.abandon(123L));
 	}
 
+	@Test
+	void testRecover() {
+		JobInstance jobInstance = new JobInstance(123L, job.getName());
+		JobExecution jobExecution = new JobExecution(jobInstance, 111L, jobParameters);
+		jobExecution.setStatus(BatchStatus.STARTED);
+		jobExecution.createStepExecution("step1").setStatus(BatchStatus.STARTED);
+		when(jobRepository.getJobExecution(111L)).thenReturn(jobExecution);
+		when(jobRepository.getLastJobExecution(jobInstance)).thenReturn(jobExecution);
+		JobExecution recover = jobOperator.recover(jobExecution);
+		assertEquals(BatchStatus.FAILED, recover.getStatus());
+		assertTrue(recover.getExecutionContext().containsKey("recovered"));
+	}
+
+	@Test
+	void testRecoverStepStopping() {
+		JobInstance jobInstance = new JobInstance(123L, job.getName());
+		JobExecution jobExecution = new JobExecution(jobInstance, 111L, jobParameters);
+		jobExecution.setStatus(BatchStatus.STARTED);
+		jobExecution.createStepExecution("step1").setStatus(BatchStatus.STOPPING);
+		when(jobRepository.getJobExecution(111L)).thenReturn(jobExecution);
+		when(jobRepository.getLastJobExecution(jobInstance)).thenReturn(jobExecution);
+		JobExecution recover = jobOperator.recover(jobExecution);
+		assertEquals(BatchStatus.FAILED, recover.getStatus());
+		assertTrue(recover.getExecutionContext().containsKey("recovered"));
+	}
+
+	@Test
+	void testRecoverJobAbandon() {
+		jobParameters = new JobParameters();
+		JobInstance jobInstance = new JobInstance(123L, job.getName());
+		JobExecution jobExecution = new JobExecution(jobInstance, 111L, jobParameters);
+		jobExecution.setStatus(BatchStatus.ABANDONED);
+		when(jobRepository.getJobExecution(111L)).thenReturn(jobExecution);
+		when(jobRepository.getLastJobExecution(jobInstance)).thenReturn(jobExecution);
+		assertThrows(UnexpectedJobExecutionException.class, () -> jobOperator.recover(jobExecution));
+	}
+
+	@Test
+	void testRecoverJobCompleted() {
+		jobParameters = new JobParameters();
+		JobInstance jobInstance = new JobInstance(123L, job.getName());
+		JobExecution jobExecution = new JobExecution(jobInstance, 111L, jobParameters);
+		jobExecution.setStatus(BatchStatus.COMPLETED);
+		when(jobRepository.getJobExecution(111L)).thenReturn(jobExecution);
+		when(jobRepository.getLastJobExecution(jobInstance)).thenReturn(jobExecution);
+		assertThrows(UnexpectedJobExecutionException.class, () -> jobOperator.recover(jobExecution));
+	}
+
 	static class MockJob extends AbstractJob {
 
 		private TaskletStep taskletStep;