SpringCloud/spring-cloud-task
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolves test failures due to bean creation order

Browse Source 
Resolves issues where beans will now be created in the correct order.
This commit is contained in:
Glenn Renfro
2022-05-17 15:16:46 -04:00
parent 23fb884e45
commit 5f42540168
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcBatchItemWriterAutoConfigurationTests.java
View File

@@ -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);

2
spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcCursorItemReaderAutoConfigurationTests.java
View File

@@ -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);

6
spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/handler/TaskJobLauncherApplicationRunnerTests.java
View File

@@ -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) {