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

IN PROGRESS - issue BATCH-453: Killed batches cannot be restarted

Browse Source 
http://jira.springframework.org/browse/BATCH-453

JobExecution now stores last updated time as well.
This commit is contained in:
lucasward
2008-08-22 21:26:50 +00:00
parent ecc19e96ff
commit 3815c3e4cb
7 changed files with 59 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractJobExecutionDaoTests.java
View File

@@ -50,11 +50,14 @@ public abstract class AbstractJobExecutionDaoTests extends AbstractTransactional
@Test
public void testSaveAndFind() {
execution.setStartTime(new Date(System.currentTimeMillis()));
execution.setLastUpdated(new Date(System.currentTimeMillis()));
dao.saveJobExecution(execution);
List<JobExecution> executions = dao.findJobExecutions(jobInstance);
assertEquals(1, executions.size());
assertEquals(execution, executions.get(0));
assertExecutionsAreEqual(execution, executions.get(0));
}
/**
@@ -91,12 +94,14 @@ public abstract class AbstractJobExecutionDaoTests extends AbstractTransactional
execution.setStatus(BatchStatus.STARTED);
dao.saveJobExecution(execution);
execution.setLastUpdated(new Date(0));
execution.setStatus(BatchStatus.COMPLETED);
dao.updateJobExecution(execution);
JobExecution updated = dao.findJobExecutions(jobInstance).get(0);
assertEquals(execution, updated);
assertEquals(BatchStatus.COMPLETED, updated.getStatus());
assertExecutionsAreEqual(execution, updated);
}
/**
@@ -136,9 +141,11 @@ public abstract class AbstractJobExecutionDaoTests extends AbstractTransactional
public void testFindRunningExecutions() {
JobExecution exec = new JobExecution(jobInstance);
exec.setCreateTime(new Date(0));
exec.setEndTime(new Date(0));
exec.setEndTime(new Date(1L));
exec.setLastUpdated(new Date(5L));
dao.saveJobExecution(exec);
exec = new JobExecution(jobInstance);
exec.setLastUpdated(new Date(5L));
exec.createStepExecution(new StepSupport("foo"));
dao.saveJobExecution(exec);
StepExecutionDao stepExecutionDao = getStepExecutionDao();
@@ -152,6 +159,7 @@ public abstract class AbstractJobExecutionDaoTests extends AbstractTransactional
assertEquals(1, values.size());
JobExecution value = values.iterator().next();
assertEquals(exec, value);
assertEquals(5L, value.getLastUpdated().getTime());
assertEquals(1, value.getStepExecutions().size());
}
@@ -198,4 +206,19 @@ public abstract class AbstractJobExecutionDaoTests extends AbstractTransactional
assertNull(value);
}
/*
* Check to make sure the executions are equal. Normally, comparing the id's is
* sufficient. However, for testing purposes, especially of a dao, we need to make
* sure all the fields are being stored/retrieved correctly.
*/
private void assertExecutionsAreEqual(JobExecution lhs, JobExecution rhs){
assertEquals(lhs.getId(), rhs.getId());
assertEquals(lhs.getStartTime(), rhs.getStartTime());
assertEquals(lhs.getStatus(), rhs.getStatus());
assertEquals(lhs.getEndTime(), rhs.getEndTime());
assertEquals(lhs.getCreateTime(), rhs.getCreateTime());
assertEquals(lhs.getLastUpdated(), rhs.getLastUpdated());
}
}

1
spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryIntegrationTests.java
View File

@@ -57,6 +57,7 @@ public class SimpleJobRepositoryIntegrationTests {
JobExecution firstExecution = jobRepository.createJobExecution(job, jobParams);
firstExecution.setStartTime(new Date());
assertNotNull(firstExecution.getLastUpdated());
assertEquals(job.getName(), firstExecution.getJobInstance().getJobName());

3
spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryTests.java
View File

@@ -132,12 +132,13 @@ public class SimpleJobRepositoryTests {
public void testUpdateValidJobExecution() throws Exception {
JobExecution jobExecution = new JobExecution(new JobInstance(new Long(1), jobParameters, job.getName()), new Long(1));
// new execution - call update on job dao
jobExecutionDao.updateJobExecution(jobExecution);
replay(jobExecutionDao);
jobRepository.update(jobExecution);
verify(jobExecutionDao);
assertNotNull(jobExecution.getLastUpdated());
}
@Test