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

Resolve issue where spring.batch.job.names was not expressed

Browse Source 
when using TaskJobLauncherCommandLineRunner

resolves #614
This commit is contained in:
Glenn Renfro
2019-08-22 09:20:10 -04:00
committed by Michael Minella
parent 87b8555b66
commit d39ed3c7cb
4 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/configuration/TaskJobLauncherAutoConfigurationTests.java
View File

@@ -16,12 +16,15 @@
package org.springframework.cloud.task.batch.configuration;
import java.lang.reflect.Field;
import org.junit.Test;
import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration;
import org.springframework.boot.autoconfigure.batch.JobLauncherCommandLineRunner;
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.cloud.task.batch.handler.TaskJobLauncherCommandLineRunner;
import org.springframework.cloud.task.batch.listener.TaskBatchExecutionListenerTests;
@@ -62,6 +65,38 @@ public class TaskJobLauncherAutoConfigurationTests {
});
}
@Test
public void testAutoBuiltDataSourceWithBatchJobNames() {
this.contextRunner
.withPropertyValues("spring.cloud.task.batch.fail-on-job-failure=true",
"spring.batch.job.names=job1,job2",
"spring.cloud.task.batch.jobNames=foobar")
.run(context -> {
validateJobNames(context, "job1,job2");
});
}
@Test
public void testAutoBuiltDataSourceWithTaskBatchJobNames() {
this.contextRunner
.withPropertyValues("spring.cloud.task.batch.fail-on-job-failure=true",
"spring.cloud.task.batch.jobNames=job1,job2")
.run(context -> {
validateJobNames(context, "job1,job2");
});
}
private void validateJobNames(AssertableApplicationContext context, String jobNames)
throws Exception {
JobLauncherCommandLineRunner jobLauncherCommandLineRunner = context
.getBean(JobLauncherCommandLineRunner.class);
Field field = jobLauncherCommandLineRunner.getClass().getSuperclass()
.getDeclaredField("jobNames");
field.setAccessible(true);
String names = (String) field.get(jobLauncherCommandLineRunner);
assertThat(names).isEqualTo(jobNames);
}
@Test
public void testAutoBuiltDataSourceWithTaskJobLauncherCLRDisabled() {
this.contextRunner.run(context -> {