BATCH-84:Added BATCH_JOB_INSTANCE_PROPERTIES table and removed schedule date from the BATCH_JOB table. Also updated JdbcJobDao to store a serialization of the JobInstanceProperties (renamed from JobParameters) in the JOB_KEY column, for unique identification.

This commit is contained in:
lucasward
2008-01-11 06:04:47 +00:00
parent 17963b3386
commit af3af0a82f
7 changed files with 61 additions and 34 deletions

View File

@@ -11,16 +11,16 @@ import junit.framework.TestCase;
* @author Lucas Ward
*
*/
public class JobRuntimeParametersBuilderTests extends TestCase {
public class JobInstancePropertiesBuilderTests extends TestCase {
JobRuntimeParametersBuilder parametersBuilder;
JobInstancePropertiesBuilder parametersBuilder;
Date date = new Date(System.currentTimeMillis());
protected void setUp() throws Exception {
super.setUp();
parametersBuilder = new JobRuntimeParametersBuilder();
parametersBuilder = new JobInstancePropertiesBuilder();
parametersBuilder.addDate("SCHEDULE_DATE", date);
parametersBuilder.addLong("LONG", new Long(1));
parametersBuilder.addString("STRING", "string value");
@@ -28,7 +28,7 @@ public class JobRuntimeParametersBuilderTests extends TestCase {
public void testToJobRuntimeParamters(){
JobRuntimeParameters parameters = parametersBuilder.toJobRuntimeParameters();
JobInstanceProperties parameters = parametersBuilder.toJobParameters();
assertEquals(parameters.getDate("SCHEDULE_DATE"), date);
assertEquals(parameters.getLong("LONG"), new Long(1));
assertEquals(parameters.getString("STRING"), "string value");

View File

@@ -13,9 +13,9 @@ import junit.framework.TestCase;
* @author Lucas Ward
*
*/
public class JobRuntimeParametersTests extends TestCase {
public class JobInstancePropertiesTests extends TestCase {
JobRuntimeParameters parameters;
JobInstanceProperties parameters;
Map stringMap;
@@ -31,7 +31,7 @@ public class JobRuntimeParametersTests extends TestCase {
parameters = getNewParameters();
}
private JobRuntimeParameters getNewParameters(){
private JobInstanceProperties getNewParameters(){
stringMap = new HashMap();
stringMap.put("string.key1", "value1");
@@ -45,7 +45,7 @@ public class JobRuntimeParametersTests extends TestCase {
dateMap.put("date.key1", date1 );
dateMap.put("date.key2", date2 );
return new JobRuntimeParameters(stringMap, longMap, dateMap);
return new JobInstanceProperties(stringMap, longMap, dateMap);
}
public void testBadLongConstructorException() throws Exception{
@@ -54,7 +54,7 @@ public class JobRuntimeParametersTests extends TestCase {
badLongMap.put("key", "bad long");
try{
JobRuntimeParameters testParameters = new JobRuntimeParameters(stringMap, badLongMap, dateMap);
JobInstanceProperties testParameters = new JobInstanceProperties(stringMap, badLongMap, dateMap);
fail();
}
catch(IllegalArgumentException ex){
@@ -68,7 +68,7 @@ public class JobRuntimeParametersTests extends TestCase {
badMap.put("key", new Integer(2));
try{
JobRuntimeParameters testParameters = new JobRuntimeParameters(badMap, longMap, dateMap);
JobInstanceProperties testParameters = new JobInstanceProperties(badMap, longMap, dateMap);
fail();
}
catch(IllegalArgumentException ex){
@@ -82,7 +82,7 @@ public class JobRuntimeParametersTests extends TestCase {
badMap.put("key", new java.sql.Date(System.currentTimeMillis()));
try{
JobRuntimeParameters testParameters = new JobRuntimeParameters(stringMap, longMap, badMap);
JobInstanceProperties testParameters = new JobInstanceProperties(stringMap, longMap, badMap);
fail();
}
catch(IllegalArgumentException ex){
@@ -110,7 +110,7 @@ public class JobRuntimeParametersTests extends TestCase {
public void testEquals(){
JobRuntimeParameters testParameters = getNewParameters();
JobInstanceProperties testParameters = getNewParameters();
assertTrue(testParameters.equals(parameters));
}