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

Wrong exception type in test case

Browse Source
This commit is contained in:
dsyer
2007-10-05 09:19:36 +00:00
parent 24aa55f82d
commit 0123f9f88c
4 changed files with 7 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
execution/src/main/java/org/springframework/batch/execution/repository/dao/HibernateJobDao.java
View File

@@ -22,9 +22,9 @@ import org.hibernate.Criteria;
import org.hibernate.Session;
import org.hibernate.criterion.Expression;
import org.springframework.batch.core.domain.JobExecution;
import org.springframework.batch.core.domain.JobIdentifier;
import org.springframework.batch.core.domain.JobInstance;
import org.springframework.batch.core.repository.NoSuchBatchDomainObjectException;
import org.springframework.batch.core.runtime.JobIdentifier;
import org.springframework.batch.execution.runtime.ScheduledJobIdentifier;
import org.springframework.orm.hibernate3.HibernateCallback;
import org.springframework.orm.hibernate3.support.HibernateDaoSupport;

1
execution/src/main/java/org/springframework/batch/execution/repository/dao/SqlStepDao.java
View File

@@ -26,7 +26,6 @@ import org.springframework.batch.core.domain.JobExecution;
import org.springframework.batch.core.domain.JobInstance;
import org.springframework.batch.core.domain.StepExecution;
import org.springframework.batch.core.domain.StepInstance;
import org.springframework.batch.core.repository.NoSuchBatchDomainObjectException;
import org.springframework.batch.execution.repository.dao.SqlJobDao.JobExecutionRowMapper;
import org.springframework.batch.repeat.ExitStatus;
import org.springframework.batch.restart.GenericRestartData;

46
execution/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryTests.java
View File

@@ -25,17 +25,16 @@ import junit.framework.TestCase;
import org.easymock.MockControl;
import org.springframework.batch.core.configuration.JobConfiguration;
import org.springframework.batch.core.configuration.StepConfiguration;
import org.springframework.batch.core.configuration.StepConfigurationSupport;
import org.springframework.batch.core.domain.JobExecution;
import org.springframework.batch.core.domain.JobInstance;
import org.springframework.batch.core.domain.StepExecution;
import org.springframework.batch.core.domain.StepInstance;
import org.springframework.batch.core.repository.BatchRestartException;
import org.springframework.batch.core.runtime.SimpleJobIdentifier;
import org.springframework.batch.core.tasklet.Tasklet;
import org.springframework.batch.execution.repository.dao.JobDao;
import org.springframework.batch.execution.repository.dao.StepDao;
import org.springframework.batch.restart.GenericRestartData;
import org.springframework.dao.IncorrectResultSizeDataAccessException;
/*
* Test SimpleJobRepository. The majority of test cases are tested using EasyMock,
@@ -88,9 +87,9 @@ public class SimpleJobRepositoryTests extends TestCase {
jobConfiguration.setName("RepositoryTest");
jobConfiguration.setRestartable(true);
stepConfiguration1 = new StubStepConfiguration("TestStep1");
stepConfiguration1 = new StepConfigurationSupport("TestStep1");
stepConfiguration2 = new StubStepConfiguration("TestStep2");
stepConfiguration2 = new StepConfigurationSupport("TestStep2");
List stepConfigurations = new ArrayList();
stepConfigurations.add(stepConfiguration1);
@@ -169,15 +168,15 @@ public class SimpleJobRepositoryTests extends TestCase {
List jobs = new ArrayList();
jobs.add(databaseJob);
jobs.add(new JobInstance(jobRuntimeInformation));
jobs.add(new JobInstance(jobRuntimeInformation, new Long(127)));
jobDao.findJobs(jobRuntimeInformation);
jobDaoControl.setReturnValue(jobs);
jobDaoControl.replay();
try{
jobRepository.findOrCreateJob(jobConfiguration, jobRuntimeInformation);
fail();
}catch(IncorrectResultSizeDataAccessException ex){
fail("Expected BatchRestartException");
}catch(BatchRestartException e){
//expected
}
@@ -406,37 +405,4 @@ public class SimpleJobRepositoryTests extends TestCase {
assertTrue(step.equals(databaseStep2));
}
/**
* @author Dave Syer
*
*/
private class StubStepConfiguration implements StepConfiguration {
private String name;
/**
* @param name
*/
public StubStepConfiguration(String name) {
this.name = name;
}
public Tasklet getTasklet() {
return null;
}
public String getName() {
return name;
}
public int getStartLimit() {
return 1;
}
public boolean isAllowStartIfComplete() {
return true;
}
}
}

7
execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java
View File

@@ -16,8 +16,6 @@
package org.springframework.batch.execution.repository.dao;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import java.util.List;
@@ -30,7 +28,6 @@ import org.springframework.batch.core.repository.NoSuchBatchDomainObjectExceptio
import org.springframework.batch.core.runtime.SimpleJobIdentifier;
import org.springframework.batch.execution.runtime.ScheduledJobIdentifier;
import org.springframework.batch.repeat.ExitStatus;
import org.springframework.jdbc.core.RowMapper;
import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests;
import org.springframework.util.ClassUtils;
@@ -41,10 +38,6 @@ import org.springframework.util.ClassUtils;
public abstract class AbstractJobDaoTests extends
AbstractTransactionalDataSourceSpringContextTests {
private static final String GET_JOB_EXECUTION = "SELECT JOB_ID, START_TIME, END_TIME, STATUS, "
+ "CONTINUABLE, EXIT_CODE, EXIT_MESSAGE from "
+ "BATCH_JOB_EXECUTION where ID = ?";
protected JobDao jobDao;
protected ScheduledJobIdentifier jobRuntimeInformation;