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

OPEN - BATCH-999: JobExecution ExecutionContext should not be persisted by Step?

Browse Source 
fix JobRepositoryUtilsTests
refactor internals of JdbcExecutionContextDao
This commit is contained in:
robokaso
2009-01-20 13:55:39 +00:00
parent c08bdad717
commit 9c9fe8f6ca
4 changed files with 42 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractExecutionContextDaoTests.java
View File

@@ -72,11 +72,11 @@ public abstract class AbstractExecutionContextDaoTests extends AbstractTransacti
@Transactional
@Test
public void testSaveAndFindContext() {
public void testSaveAndFindJobContext() {
ExecutionContext ctx = new ExecutionContext(Collections.<String, Object> singletonMap("key", "value"));
jobExecution.setExecutionContext(ctx);
contextDao.updateExecutionContext(jobExecution);
contextDao.saveExecutionContext(jobExecution);
ExecutionContext retrieved = contextDao.getExecutionContext(jobExecution);
assertEquals(ctx, retrieved);
@@ -84,11 +84,11 @@ public abstract class AbstractExecutionContextDaoTests extends AbstractTransacti
@Transactional
@Test
public void testSaveAndFindEmptyContext() {
public void testSaveAndFindEmptyJobContext() {
ExecutionContext ctx = new ExecutionContext();
jobExecution.setExecutionContext(ctx);
contextDao.updateExecutionContext(jobExecution);
contextDao.saveExecutionContext(jobExecution);
ExecutionContext retrieved = contextDao.getExecutionContext(jobExecution);
assertEquals(ctx, retrieved);
@@ -101,7 +101,7 @@ public abstract class AbstractExecutionContextDaoTests extends AbstractTransacti
ExecutionContext ctx = new ExecutionContext(Collections
.<String, Object> singletonMap("key", "value"));
jobExecution.setExecutionContext(ctx);
contextDao.updateExecutionContext(jobExecution);
contextDao.saveExecutionContext(jobExecution);
ctx.putLong("longKey", 7);
contextDao.updateExecutionContext(jobExecution);
@@ -117,7 +117,7 @@ public abstract class AbstractExecutionContextDaoTests extends AbstractTransacti
ExecutionContext ctx = new ExecutionContext(Collections.<String, Object> singletonMap("key", "value"));
stepExecution.setExecutionContext(ctx);
contextDao.updateExecutionContext(stepExecution);
contextDao.saveExecutionContext(stepExecution);
ExecutionContext retrieved = contextDao.getExecutionContext(stepExecution);
assertEquals(ctx, retrieved);
@@ -129,7 +129,7 @@ public abstract class AbstractExecutionContextDaoTests extends AbstractTransacti
ExecutionContext ctx = new ExecutionContext();
stepExecution.setExecutionContext(ctx);
contextDao.updateExecutionContext(stepExecution);
contextDao.saveExecutionContext(stepExecution);
ExecutionContext retrieved = contextDao.getExecutionContext(stepExecution);
assertEquals(ctx, retrieved);
@@ -141,7 +141,7 @@ public abstract class AbstractExecutionContextDaoTests extends AbstractTransacti
ExecutionContext ctx = new ExecutionContext(Collections.<String, Object> singletonMap("key", "value"));
stepExecution.setExecutionContext(ctx);
contextDao.updateExecutionContext(stepExecution);
contextDao.saveExecutionContext(stepExecution);
ctx.putLong("longKey", 7);
contextDao.updateExecutionContext(stepExecution);
@@ -158,7 +158,7 @@ public abstract class AbstractExecutionContextDaoTests extends AbstractTransacti
ExecutionContext ec = new ExecutionContext();
ec.put("intValue", new Integer(343232));
stepExecution.setExecutionContext(ec);
contextDao.updateExecutionContext(stepExecution);
contextDao.saveExecutionContext(stepExecution);
ExecutionContext restoredEc = contextDao.getExecutionContext(stepExecution);
assertEquals(ec, restoredEc);
}

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

@@ -105,7 +105,6 @@ public class SimpleJobRepositoryIntegrationTests {
// first execution
JobExecution firstJobExec = jobRepository.createJobExecution(job.getName(), jobParameters);
StepExecution firstStepExec = new StepExecution(step.getName(), firstJobExec);
jobRepository.update(firstJobExec);
jobRepository.add(firstStepExec);
assertEquals(1, jobRepository.getStepExecutionCount(firstJobExec.getJobInstance(), step.getName()));
@@ -124,7 +123,6 @@ public class SimpleJobRepositoryIntegrationTests {
// second execution
JobExecution secondJobExec = jobRepository.createJobExecution(job.getName(), jobParameters);
StepExecution secondStepExec = new StepExecution(step.getName(), secondJobExec);
jobRepository.update(secondJobExec);
jobRepository.add(secondStepExec);
assertEquals(2, jobRepository.getStepExecutionCount(secondJobExec.getJobInstance(), step.getName()));
@@ -150,7 +148,6 @@ public class SimpleJobRepositoryIntegrationTests {
stepExec.setExecutionContext(ctx);
jobRepository.add(stepExec);
jobRepository.updateExecutionContext(stepExec);
StepExecution retrievedStepExec = jobRepository.getLastStepExecution(jobExec.getJobInstance(), step.getName());
assertEquals(stepExec, retrievedStepExec);