From 626d858d81dc0e7b6c67cc9a69cffaa18c81ce71 Mon Sep 17 00:00:00 2001 From: Mahmoud Ben Hassine Date: Tue, 12 Sep 2023 11:49:50 +0200 Subject: [PATCH] Update Batch tests Related to: https://github.com/spring-projects/spring-batch/issues/4245 Closes gh-37348 --- .../batch/BatchAutoConfigurationTests.java | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java index 7253b6e667..9d508642d2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java @@ -39,7 +39,6 @@ import org.springframework.batch.core.configuration.JobFactory; import org.springframework.batch.core.configuration.JobRegistry; import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing; import org.springframework.batch.core.configuration.support.DefaultBatchConfiguration; -import org.springframework.batch.core.configuration.support.JobRegistryBeanPostProcessor; import org.springframework.batch.core.explore.JobExplorer; import org.springframework.batch.core.job.AbstractJob; import org.springframework.batch.core.launch.JobLauncher; @@ -96,6 +95,7 @@ import static org.mockito.Mockito.mock; * @author Stephane Nicoll * @author Vedran Pavic * @author Kazuki Shimizu + * @author Mahmoud Ben Hassine */ @ExtendWith(OutputCaptureExtension.class) class BatchAutoConfigurationTests { @@ -515,13 +515,6 @@ class BatchAutoConfigurationTests { @Autowired private JobRepository jobRepository; - @Bean - static JobRegistryBeanPostProcessor registryProcessor(JobRegistry jobRegistry) { - JobRegistryBeanPostProcessor processor = new JobRegistryBeanPostProcessor(); - processor.setJobRegistry(jobRegistry); - return processor; - } - @Bean Job discreteJob() { AbstractJob job = new AbstractJob("discreteRegisteredJob") { @@ -685,7 +678,17 @@ class BatchAutoConfigurationTests { @Bean Job job2() { - return mock(Job.class); + return new Job() { + @Override + public String getName() { + return "discreteLocalJob2"; + } + + @Override + public void execute(JobExecution execution) { + execution.setStatus(BatchStatus.COMPLETED); + } + }; } }