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

Some bizarre classpath issues in Eclipse - moved data-source config out of default package except for samples. Also separated hibernate config from rest of samples.

Browse Source
This commit is contained in:
dsyer
2008-06-24 15:58:41 +00:00
parent 4bb67c50aa
commit 02d3c5756b
17 changed files with 28 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractJobDaoTests.java
View File

@@ -29,6 +29,7 @@ import org.springframework.batch.core.JobParametersBuilder;
import org.springframework.batch.core.job.JobSupport;
import org.springframework.batch.repeat.ExitStatus;
import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests;
import org.springframework.util.ClassUtils;
/**
* @author Dave Syer
@@ -52,7 +53,7 @@ public abstract class AbstractJobDaoTests extends AbstractTransactionalDataSourc
protected Date jobExecutionStartTime = new Date(System.currentTimeMillis());
protected String[] getConfigLocations() {
return new String[] { "sql-dao-test.xml" };
return new String[] { ClassUtils.addResourcePathToPackagePath(getClass(), "sql-dao-test.xml") };
}
/**

3
spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractStepDaoTests.java
View File

@@ -31,6 +31,7 @@ import org.springframework.batch.item.ExecutionContext;
import org.springframework.batch.repeat.ExitStatus;
import org.springframework.dao.OptimisticLockingFailureException;
import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests;
import org.springframework.util.ClassUtils;
/**
* Tests for step persistence (StepInstanceDao and StepExecutionDao). Because it is very reasonable to assume that there is a
@@ -79,7 +80,7 @@ public abstract class AbstractStepDaoTests extends AbstractTransactionalDataSour
* @see org.springframework.test.AbstractSingleSpringContextTests#getConfigLocations()
*/
protected String[] getConfigLocations() {
return new String[] { "sql-dao-test.xml" };
return new String[] { ClassUtils.addResourcePathToPackagePath(getClass(), "sql-dao-test.xml") };
}
/*

4
spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDaoTests.java
View File

@@ -1,5 +1,7 @@
package org.springframework.batch.core.repository.dao;
import org.springframework.util.ClassUtils;
public class JdbcJobExecutionDaoTests extends AbstractJobExecutionDaoTests {
protected JobExecutionDao getJobExecutionDao() {
@@ -14,7 +16,7 @@ public class JdbcJobExecutionDaoTests extends AbstractJobExecutionDaoTests {
}
protected String[] getConfigLocations() {
return new String[] { "sql-dao-test.xml" };
return new String[] { ClassUtils.addResourcePathToPackagePath(getClass(), "sql-dao-test.xml") };
}
}

4
spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcJobInstanceDaoTests.java
View File

@@ -1,5 +1,7 @@
package org.springframework.batch.core.repository.dao;
import org.springframework.util.ClassUtils;
public class JdbcJobInstanceDaoTests extends AbstractJobInstanceDaoTests {
@@ -10,7 +12,7 @@ public class JdbcJobInstanceDaoTests extends AbstractJobInstanceDaoTests {
}
protected String[] getConfigLocations() {
return new String[] { "sql-dao-test.xml" };
return new String[] { ClassUtils.addResourcePathToPackagePath(getClass(), "sql-dao-test.xml") };
}
}

3
spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDaoTests.java
View File

@@ -3,6 +3,7 @@ package org.springframework.batch.core.repository.dao;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.repeat.ExitStatus;
import org.springframework.util.ClassUtils;
public class JdbcStepExecutionDaoTests extends AbstractStepExecutionDaoTests {
@@ -17,7 +18,7 @@ public class JdbcStepExecutionDaoTests extends AbstractStepExecutionDaoTests {
}
protected String[] getConfigLocations() {
return new String[] { "sql-dao-test.xml" };
return new String[] { ClassUtils.addResourcePathToPackagePath(getClass(), "sql-dao-test.xml") };
}
/**

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

@@ -12,9 +12,11 @@ import org.springframework.batch.core.StepExecution;
import org.springframework.batch.core.job.JobSupport;
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
import org.springframework.batch.core.repository.JobRestartException;
import org.springframework.batch.core.repository.dao.AbstractJobDaoTests;
import org.springframework.batch.core.step.StepSupport;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests;
import org.springframework.util.ClassUtils;
/**
* Repository tests using JDBC DAOs (rather than mocks).
@@ -24,7 +26,7 @@ import org.springframework.test.AbstractTransactionalDataSourceSpringContextTest
public class SimpleJobRepositoryIntegrationTests extends AbstractTransactionalDataSourceSpringContextTests {
protected String[] getConfigLocations() {
return new String[] { "classpath:sql-dao-test.xml" };
return new String[] { ClassUtils.addResourcePathToPackagePath(AbstractJobDaoTests.class, "sql-dao-test.xml") };
}
private SimpleJobRepository jobRepository;

4
spring-batch-core/src/test/java/org/springframework/batch/core/resource/JdbcCursorItemReaderPreparedStatementIntegrationTests.java
View File

@@ -8,9 +8,11 @@ import org.springframework.batch.core.JobInstance;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.JobParametersBuilder;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.core.repository.dao.AbstractJobDaoTests;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.batch.item.database.JdbcCursorItemReader;
import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests;
import org.springframework.util.ClassUtils;
public class JdbcCursorItemReaderPreparedStatementIntegrationTests extends
AbstractTransactionalDataSourceSpringContextTests {
@@ -56,6 +58,6 @@ public class JdbcCursorItemReaderPreparedStatementIntegrationTests extends
}
protected String[] getConfigLocations() {
return new String[] { "data-source-context.xml" };
return new String[] { ClassUtils.addResourcePathToPackagePath(AbstractJobDaoTests.class, "data-source-context.xml") };
}
}

4
spring-batch-core/src/test/java/org/springframework/batch/core/resource/StepExecutionPreparedStatementSetterTests.java
View File

@@ -25,8 +25,10 @@ import org.springframework.batch.core.JobInstance;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.JobParametersBuilder;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.core.repository.dao.AbstractJobDaoTests;
import org.springframework.jdbc.core.RowCallbackHandler;
import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests;
import org.springframework.util.ClassUtils;
/**
* @author Lucas Ward
@@ -38,7 +40,7 @@ public class StepExecutionPreparedStatementSetterTests extends AbstractTransacti
StepExecution stepExecution;
protected String[] getConfigLocations() {
return new String[] { "data-source-context.xml" };
return new String[] { ClassUtils.addResourcePathToPackagePath(AbstractJobDaoTests.class, "data-source-context.xml") };
}
protected void onSetUpInTransaction() throws Exception {

4
spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ItemOrientedStepIntegrationTests.java
View File

@@ -28,6 +28,7 @@ import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.core.job.JobSupport;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.repository.dao.AbstractJobDaoTests;
import org.springframework.batch.core.repository.dao.MapJobExecutionDao;
import org.springframework.batch.core.repository.dao.MapJobInstanceDao;
import org.springframework.batch.core.repository.dao.MapStepExecutionDao;
@@ -43,6 +44,7 @@ import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.support.TransactionSynchronizationAdapter;
import org.springframework.transaction.support.TransactionSynchronizationManager;
import org.springframework.util.ClassUtils;
/**
* @author Dave Syer
@@ -118,7 +120,7 @@ public class ItemOrientedStepIntegrationTests extends AbstractDependencyInjectio
* @see org.springframework.test.AbstractSingleSpringContextTests#getConfigLocations()
*/
protected String[] getConfigLocations() {
return new String[] { "sql-dao-test.xml" };
return new String[] { ClassUtils.addResourcePathToPackagePath(AbstractJobDaoTests.class, "sql-dao-test.xml") };
}
public void testStatusForCommitFailedException() throws Exception {