From 5f4254016892d96c87dec66049fa37014680ec0e Mon Sep 17 00:00:00 2001 From: Glenn Renfro Date: Tue, 17 May 2022 15:16:46 -0400 Subject: [PATCH] Resolves test failures due to bean creation order Resolves issues where beans will now be created in the correct order. --- .../jdbc/JdbcBatchItemWriterAutoConfigurationTests.java | 2 +- .../jdbc/JdbcCursorItemReaderAutoConfigurationTests.java | 2 +- .../handler/TaskJobLauncherApplicationRunnerTests.java | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcBatchItemWriterAutoConfigurationTests.java b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcBatchItemWriterAutoConfigurationTests.java index de6c35da..33084709 100644 --- a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcBatchItemWriterAutoConfigurationTests.java +++ b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcBatchItemWriterAutoConfigurationTests.java @@ -225,7 +225,7 @@ public class JdbcBatchItemWriterAutoConfigurationTests { } @Bean - public DataSource dataSource() { + public DataSource dataSource(Server server) { DriverManagerDataSource dataSource = new DriverManagerDataSource(); dataSource.setDriverClassName(DATASOURCE_DRIVER_CLASS_NAME); dataSource.setUrl(DATASOURCE_URL); diff --git a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcCursorItemReaderAutoConfigurationTests.java b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcCursorItemReaderAutoConfigurationTests.java index 7dd55a85..f50710bf 100644 --- a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcCursorItemReaderAutoConfigurationTests.java +++ b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcCursorItemReaderAutoConfigurationTests.java @@ -321,7 +321,7 @@ public class JdbcCursorItemReaderAutoConfigurationTests { } @Bean - public DataSource dataSource() { + public DataSource dataSource(Server server) { DriverManagerDataSource dataSource = new DriverManagerDataSource(); dataSource.setDriverClassName(DATASOURCE_DRIVER_CLASS_NAME); dataSource.setUrl(DATASOURCE_URL); diff --git a/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/handler/TaskJobLauncherApplicationRunnerTests.java b/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/handler/TaskJobLauncherApplicationRunnerTests.java index 679cbdff..adef16d0 100644 --- a/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/handler/TaskJobLauncherApplicationRunnerTests.java +++ b/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/handler/TaskJobLauncherApplicationRunnerTests.java @@ -56,6 +56,7 @@ import org.springframework.cloud.task.repository.TaskExecution; import org.springframework.cloud.task.repository.TaskExplorer; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -268,8 +269,9 @@ public class TaskJobLauncherApplicationRunnerTests { } - public static class JobWithFailureTaskExecutorConfiguration - extends JobWithFailureConfiguration { + @Import(JobWithFailureConfiguration.class) + @Configuration + public static class JobWithFailureTaskExecutorConfiguration { @Bean public BatchConfigurer batchConfigurer(DataSource dataSource) {