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

RESOLVED - issue BATCH-724: create tests for non-default table prefix. More extensive test using Job.

Browse Source
This commit is contained in:
dsyer
2010-01-04 14:08:09 +00:00
parent c07b2882f3
commit bfd6fccb7d
6 changed files with 63 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/TablePrefixTests.java
View File

@@ -21,8 +21,15 @@ import javax.sql.DataSource;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.Job;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.StepContribution;
import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.batch.core.scope.context.ChunkContext;
import org.springframework.batch.core.step.tasklet.Tasklet;
import org.springframework.batch.repeat.RepeatStatus;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
import org.springframework.test.context.ContextConfiguration;
@@ -34,7 +41,10 @@ import org.springframework.test.jdbc.SimpleJdbcTestUtils;
public class TablePrefixTests {
@Autowired
private JobRepository jobRepository;
private JobLauncher jobLauncher;
@Autowired
private Job job;
private SimpleJdbcTemplate simpleJdbcTemplate;
@@ -45,7 +55,17 @@ public class TablePrefixTests {
@Test
public void testJobLaunch() throws Exception {
jobRepository.createJobExecution("prefix-test", new JobParameters());
JobExecution jobExecution = jobLauncher.run(job, new JobParameters());
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
assertEquals(1, SimpleJdbcTestUtils.countRowsInTable(simpleJdbcTemplate, "PREFIX_JOB_INSTANCE"));
}
public static class TestTasklet implements Tasklet {
public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception {
return RepeatStatus.FINISHED;
}
}
}

44
spring-batch-core/src/test/java/test/jdbc/datasource/DataSourceInitializer.java
View File

@@ -25,7 +25,6 @@ import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.BeanInitializationException;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.core.io.Resource;
@@ -52,19 +51,17 @@ import org.springframework.util.StringUtils;
* @author Dave Syer
*
*/
public class DataSourceInitializer implements InitializingBean, DisposableBean {
public class DataSourceInitializer implements InitializingBean {
private static final Log logger = LogFactory.getLog(DataSourceInitializer.class);
private Resource[] initScripts;
private Resource[] destroyScripts;
private DataSource dataSource;
private boolean ignoreFailedDrop = true;
private static boolean initialized = false;
private boolean initialized = false;
/**
* Main method as convenient entry point.
@@ -76,34 +73,6 @@ public class DataSourceInitializer implements InitializingBean, DisposableBean {
DataSourceInitializer.class.getSimpleName() + "-context.xml"));
}
/**
* @throws Throwable
* @see java.lang.Object#finalize()
*/
protected void finalize() throws Throwable {
super.finalize();
initialized = false;
logger.debug("finalize called");
}
public void destroy() {
if (destroyScripts==null) return;
for (int i = 0; i < destroyScripts.length; i++) {
Resource destroyScript = initScripts[i];
try {
doExecuteScript(destroyScript);
}
catch (Exception e) {
if (logger.isDebugEnabled()) {
logger.warn("Could not execute destroy script [" + destroyScript + "]", e);
}
else {
logger.warn("Could not execute destroy script [" + destroyScript + "]");
}
}
}
}
public void afterPropertiesSet() throws Exception {
Assert.notNull(dataSource);
initialize();
@@ -111,11 +80,10 @@ public class DataSourceInitializer implements InitializingBean, DisposableBean {
private void initialize() {
if (!initialized) {
destroy();
if (initScripts != null) {
for (int i = 0; i < initScripts.length; i++) {
Resource initScript = initScripts[i];
doExecuteScript(initScript);
Resource script = initScripts[i];
doExecuteScript(script);
}
}
initialized = true;
@@ -176,10 +144,6 @@ public class DataSourceInitializer implements InitializingBean, DisposableBean {
this.initScripts = initScripts;
}
public void setDestroyScripts(Resource[] destroyScripts) {
this.destroyScripts = destroyScripts;
}
public void setDataSource(DataSource dataSource) {
this.dataSource = dataSource;
}