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

IN PROGRESS - BATCH-518: clean up the *Or* repository methods

Browse Source 
saveOrUpdate(JobExecution) -> updateJobExecution
This commit is contained in:
robokaso
2008-07-28 08:46:30 +00:00
parent 1987dce4c0
commit da3eb280c0
8 changed files with 26 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,9 +55,9 @@ public class SimpleJobRepositoryIntegrationTests extends AbstractTransactionalDa
assertEquals(job.getName(), firstExecution.getJobInstance().getJobName());
jobRepository.saveOrUpdate(firstExecution);
jobRepository.updateJobExecution(firstExecution);
firstExecution.setEndTime(new Date());
jobRepository.saveOrUpdate(firstExecution);
jobRepository.updateJobExecution(firstExecution);
JobExecution secondExecution = jobRepository.createJobExecution(job, jobParams);
assertEquals(firstExecution.getJobInstance(), secondExecution.getJobInstance());
@@ -74,7 +74,7 @@ public class SimpleJobRepositoryIntegrationTests extends AbstractTransactionalDa
JobExecution firstExecution = jobRepository.createJobExecution(job, jobParameters);
firstExecution.setStartTime(new Date(0));
firstExecution.setEndTime(new Date(1));
jobRepository.saveOrUpdate(firstExecution);
jobRepository.updateJobExecution(firstExecution);
JobExecution secondExecution = jobRepository.createJobExecution(job, jobParameters);
assertEquals(firstExecution.getJobInstance(), secondExecution.getJobInstance());
@@ -89,7 +89,7 @@ public class SimpleJobRepositoryIntegrationTests extends AbstractTransactionalDa
job.setRestartable(false);
JobExecution firstExecution = jobRepository.createJobExecution(job, jobParameters);
jobRepository.saveOrUpdate(firstExecution);
jobRepository.updateJobExecution(firstExecution);
try {
jobRepository.createJobExecution(job, jobParameters);
@@ -111,7 +111,7 @@ public class SimpleJobRepositoryIntegrationTests extends AbstractTransactionalDa
// first execution
JobExecution firstJobExec = jobRepository.createJobExecution(job, jobParameters);
StepExecution firstStepExec = new StepExecution(step.getName(), firstJobExec);
jobRepository.saveOrUpdate(firstJobExec);
jobRepository.updateJobExecution(firstJobExec);
jobRepository.saveOrUpdate(firstStepExec);
assertEquals(1, jobRepository.getStepExecutionCount(firstJobExec.getJobInstance(), step));
@@ -125,12 +125,12 @@ public class SimpleJobRepositoryIntegrationTests extends AbstractTransactionalDa
jobRepository.saveOrUpdate(firstStepExec);
firstJobExec.setStatus(BatchStatus.FAILED);
firstJobExec.setEndTime(new Date(7));
jobRepository.saveOrUpdate(firstJobExec);
jobRepository.updateJobExecution(firstJobExec);
// second execution
JobExecution secondJobExec = jobRepository.createJobExecution(job, jobParameters);
StepExecution secondStepExec = new StepExecution(step.getName(), secondJobExec);
jobRepository.saveOrUpdate(secondJobExec);
jobRepository.updateJobExecution(secondJobExec);
jobRepository.saveOrUpdate(secondStepExec);
assertEquals(2, jobRepository.getStepExecutionCount(secondJobExec.getJobInstance(), step));

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

@@ -116,7 +116,7 @@ public class SimpleJobRepositoryTests extends TestCase {
// failure scenario - must have job ID
JobExecution jobExecution = new JobExecution(null);
try {
jobRepository.saveOrUpdate(jobExecution);
jobRepository.updateJobExecution(jobExecution);
fail();
}
catch (Exception ex) {
@@ -124,21 +124,16 @@ public class SimpleJobRepositoryTests extends TestCase {
}
}
public void testSaveOrUpdateValidJobExecution() throws Exception {
public void testUpdateValidJobExecution() throws Exception {
JobExecution jobExecution = new JobExecution(new JobInstance(new Long(1), jobParameters, job.getName()));
JobExecution jobExecution = new JobExecution(new JobInstance(new Long(1), jobParameters, job.getName()), new Long(1));
// new execution - call save on job dao
jobExecutionDao.saveJobExecution(jobExecution);
jobExecutionDaoControl.replay();
jobRepository.saveOrUpdate(jobExecution);
jobExecutionDaoControl.reset();
// update existing execution
jobExecution.setId(new Long(5));
// new execution - call update on job dao
jobExecutionDao.updateJobExecution(jobExecution);
jobExecutionDaoControl.replay();
jobRepository.saveOrUpdate(jobExecution);
jobRepository.updateJobExecution(jobExecution);
jobExecutionDaoControl.verify();
}
public void testSaveOrUpdateStepExecutionException() {

2
spring-batch-core/src/test/java/org/springframework/batch/core/step/JobRepositorySupport.java
View File

@@ -39,7 +39,7 @@ public class JobRepositorySupport implements JobRepository {
/* (non-Javadoc)
* @see org.springframework.batch.container.common.repository.JobRepository#saveOrUpdate(org.springframework.batch.container.common.domain.JobExecution)
*/
public void saveOrUpdate(JobExecution jobExecution) {
public void updateJobExecution(JobExecution jobExecution) {
}
/* (non-Javadoc)