BATCH-337:No *Instance domain objects (or their respective tables) contain a 'status'. Instead, they contain the 'last execution', which can be used to determinte the status. RestartData is also no longer necessary, as everything can be 'restored' by calling stepInstance.getLastExecution().getExecutionAttributes(). Also changed all 'ID' columns to be complete, such as 'JOB_INSTANCE_ID' rather than just 'ID'.
This commit is contained in:
@@ -27,13 +27,11 @@ public class JobInstanceTests extends TestCase {
|
||||
|
||||
private JobInstance instance = new JobInstance(new Long(11), new JobParameters(), new JobSupport("job"));
|
||||
|
||||
/**
|
||||
* Test method for {@link org.springframework.batch.core.domain.JobInstance#getStatus()}.
|
||||
*/
|
||||
public void testGetStatus() {
|
||||
assertNull(instance.getStatus());
|
||||
instance.setStatus(BatchStatus.COMPLETED);
|
||||
assertNotNull(instance.getStatus());
|
||||
public void testLastExecution(){
|
||||
JobExecution lastExecution = new JobExecution();
|
||||
assertNull(instance.getLastExecution());
|
||||
instance.setLastExecution(lastExecution);
|
||||
assertEquals(lastExecution, instance.getLastExecution());
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -77,7 +75,9 @@ public class JobInstanceTests extends TestCase {
|
||||
}
|
||||
|
||||
public void testCreateJobExecution(){
|
||||
assertNotNull(instance.createJobExecution());
|
||||
JobExecution execution = instance.createJobExecution();
|
||||
assertNotNull(execution);
|
||||
assertEquals(execution, instance.getLastExecution());
|
||||
}
|
||||
|
||||
public void testCreateWithNulls(){
|
||||
|
||||
@@ -43,25 +43,11 @@ public class StepInstanceTests extends TestCase {
|
||||
assertEquals(23, instance.getStepExecutionCount());
|
||||
}
|
||||
|
||||
/**
|
||||
* Test method for {@link org.springframework.batch.core.domain.StepInstance#getExecutionAttributes()}.
|
||||
*/
|
||||
public void testGetExecutionAttributes() {
|
||||
assertNotNull(instance.getExecutionAttributes());
|
||||
assertTrue(instance.getExecutionAttributes().getProperties().isEmpty());
|
||||
ExecutionAttributes executionAttributes = new ExecutionAttributes();
|
||||
executionAttributes.putString("foo", "bar");
|
||||
instance.setExecutionAttributes(executionAttributes);
|
||||
assertEquals("bar", instance.getExecutionAttributes().getProperties().getProperty("foo"));
|
||||
}
|
||||
|
||||
/**
|
||||
* Test method for {@link org.springframework.batch.core.domain.StepInstance#getStatus()}.
|
||||
*/
|
||||
public void testGetStatus() {
|
||||
assertEquals(null, instance.getStatus());
|
||||
instance.setStatus(BatchStatus.COMPLETED);
|
||||
assertEquals(BatchStatus.COMPLETED, instance.getStatus());
|
||||
public void testLastExecution(){
|
||||
StepExecution lastExecution = new StepExecution();
|
||||
assertNull(instance.getLastExecution());
|
||||
instance.setLastExecution(lastExecution);
|
||||
assertEquals(lastExecution, instance.getLastExecution());
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -109,7 +95,6 @@ public class StepInstanceTests extends TestCase {
|
||||
|
||||
public void testToString() throws Exception {
|
||||
assertTrue("Should contain name", instance.toString().indexOf("name=")>=0);
|
||||
assertTrue("Should contain status", instance.toString().indexOf("status=")>=0);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user