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

Update dependency versions

Browse Source 
In addition to updating the versions of numerous dependencies, this
commit also remove the dependency upon CGLib as it is no longer used.

Two test classes have been updated. One to cope with a new method in
Commons IO FileUtils which made a method call ambiguous, and one to
cope with API changes in the latest version of Quartz.
This commit is contained in:
Andy Wilkinson
2014-05-02 21:16:48 +01:00
committed by Michael Minella
parent e8962cec39
commit ecd8114a46
3 changed files with 77 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-batch-samples/src/test/java/org/springframework/batch/sample/quartz/JobLauncherDetailsTests.java
View File

@@ -29,7 +29,9 @@ import org.quartz.Job;
import org.quartz.JobDetail;
import org.quartz.JobExecutionContext;
import org.quartz.Scheduler;
import org.quartz.SimpleTrigger;
import org.quartz.impl.JobDetailImpl;
import org.quartz.impl.JobExecutionContextImpl;
import org.quartz.impl.triggers.SimpleTriggerImpl;
import org.quartz.spi.TriggerFiredBundle;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobParameters;
@@ -71,7 +73,7 @@ public class JobLauncherDetailsTests {
}
private JobExecutionContext createContext(JobDetail jobDetail) {
firedBundle = new TriggerFiredBundle(jobDetail, new SimpleTrigger(), null, false, new Date(), new Date(), new Date(), new Date());
firedBundle = new TriggerFiredBundle(jobDetail, new SimpleTriggerImpl(), null, false, new Date(), new Date(), new Date(), new Date());
return new StubJobExecutionContext();
}
@@ -81,7 +83,7 @@ public class JobLauncherDetailsTests {
*/
@Test
public void testExecuteWithNoJobParameters() {
JobDetail jobDetail = new JobDetail();
JobDetail jobDetail = new JobDetailImpl();
JobExecutionContext context = createContext(jobDetail);
details.executeInternal(context);
assertEquals(2, list.size());
@@ -95,7 +97,7 @@ public class JobLauncherDetailsTests {
*/
@Test
public void testExecuteWithJobName() {
JobDetail jobDetail = new JobDetail();
JobDetail jobDetail = new JobDetailImpl();
jobDetail.getJobDataMap().put(JobLauncherDetails.JOB_NAME, "FOO");
JobExecutionContext context = createContext(jobDetail);
details.executeInternal(context);
@@ -109,7 +111,7 @@ public class JobLauncherDetailsTests {
*/
@Test
public void testExecuteWithSomeJobParameters() {
JobDetail jobDetail = new JobDetail();
JobDetail jobDetail = new JobDetailImpl();
jobDetail.getJobDataMap().put("foo", "bar");
JobExecutionContext context = createContext(jobDetail);
details.executeInternal(context);
@@ -124,7 +126,7 @@ public class JobLauncherDetailsTests {
*/
@Test
public void testExecuteWithJobNameAndParameters() {
JobDetail jobDetail = new JobDetail();
JobDetail jobDetail = new JobDetailImpl();
jobDetail.getJobDataMap().put(JobLauncherDetails.JOB_NAME, "FOO");
jobDetail.getJobDataMap().put("foo", "bar");
JobExecutionContext context = createContext(jobDetail);
@@ -141,7 +143,7 @@ public class JobLauncherDetailsTests {
*/
@Test
public void testExecuteWithJobNameAndComplexParameters() {
JobDetail jobDetail = new JobDetail();
JobDetail jobDetail = new JobDetailImpl();
jobDetail.getJobDataMap().put(JobLauncherDetails.JOB_NAME, "FOO");
jobDetail.getJobDataMap().put("foo", this);
JobExecutionContext context = createContext(jobDetail);
@@ -154,7 +156,7 @@ public class JobLauncherDetailsTests {
}
@SuppressWarnings("serial")
private final class StubJobExecutionContext extends JobExecutionContext {
private final class StubJobExecutionContext extends JobExecutionContextImpl {
private StubJobExecutionContext() {
super(mock(Scheduler.class), firedBundle, mock(Job.class));
}