Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Michael Minella
2017-10-20 11:57:56 -05:00
parent a35784dbd6
commit 63dfe4b912
2 changed files with 42 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-batch-core/src/test/java/org/springframework/batch/core/JobParametersBuilderTests.java
View File

@@ -57,11 +57,11 @@ public class JobParametersBuilderTests {
@Before
public void initialize() {
this.parametersBuilder = new JobParametersBuilder();
this.job = new SimpleJob("simpleJob");
this.jobExplorer = mock(JobExplorer.class);
this.jobInstanceList = new ArrayList<>(1);
this.jobExecutionList = new ArrayList<>(1);
this.parametersBuilder = new JobParametersBuilder(this.jobExplorer);
}
@Test
@@ -169,14 +169,14 @@ public class JobParametersBuilderTests {
public void testGetNextJobParametersFirstRun(){
job.setJobParametersIncrementer(new RunIdIncrementer());
initializeForNextJobParameters();
this.parametersBuilder.getNextJobParameters(this.job, this.jobExplorer);
this.parametersBuilder.getNextJobParameters(this.job);
defaultNextJobParametersVerify(this.parametersBuilder.toJobParameters(), 4);
}
@Test
public void testGetNextJobParametersNoIncrementer(){
initializeForNextJobParameters();
this.parametersBuilder.getNextJobParameters(this.job, this.jobExplorer);
this.parametersBuilder.getNextJobParameters(this.job);
baseJobParametersVerify(this.parametersBuilder.toJobParameters(), 3);
}
@@ -188,7 +188,7 @@ public class JobParametersBuilderTests {
when(this.jobExplorer.getJobInstances("simpleJob",0,1)).thenReturn(this.jobInstanceList);
when(this.jobExplorer.getJobExecutions(any())).thenReturn(this.jobExecutionList);
initializeForNextJobParameters();
this.parametersBuilder.getNextJobParameters(this.job, this.jobExplorer);
this.parametersBuilder.getNextJobParameters(this.job);
defaultNextJobParametersVerify(this.parametersBuilder.toJobParameters(), 4);
}
@@ -202,7 +202,7 @@ public class JobParametersBuilderTests {
when(this.jobExplorer.getJobExecutions(any())).thenReturn(this.jobExecutionList);
initializeForNextJobParameters();
this.parametersBuilder.addLong("NON_IDENTIFYING_LONG", new Long(1), false);
this.parametersBuilder.getNextJobParameters(this.job, this.jobExplorer);
this.parametersBuilder.getNextJobParameters(this.job);
baseJobParametersVerify(this.parametersBuilder.toJobParameters(), 3);
}
@@ -214,10 +214,16 @@ public class JobParametersBuilderTests {
when(this.jobExplorer.getJobInstances("simpleJob",0,1)).thenReturn(this.jobInstanceList);
when(this.jobExplorer.getJobExecutions(any())).thenReturn(this.jobExecutionList);
initializeForNextJobParameters();
this.parametersBuilder.getNextJobParameters(this.job, this.jobExplorer);
this.parametersBuilder.getNextJobParameters(this.job);
baseJobParametersVerify(this.parametersBuilder.toJobParameters(), 4);
}
@Test(expected = IllegalStateException.class)
public void testMissingJobExplorer() {
this.parametersBuilder = new JobParametersBuilder();
this.parametersBuilder.getNextJobParameters(this.job);
}
private void initializeForNextJobParameters() {
this.parametersBuilder.addDate("SCHEDULE_DATE", date);
this.parametersBuilder.addLong("LONG", new Long(1));