From c999fbbd1a2279e2712f37b22731e73c7f0b4a27 Mon Sep 17 00:00:00 2001 From: dsyer Date: Tue, 28 Aug 2007 20:50:58 +0000 Subject: [PATCH] Change Base* to Abstract* to stop it being run multiple times --- .../dao/{BaseJobDaoTests.java => AbstractJobDaoTests.java} | 6 +++++- .../{BaseStepDaoTests.java => AbstractStepDaoTests.java} | 3 ++- .../execution/repository/dao/HibernateJobDaoTests.java | 2 +- .../execution/repository/dao/HibernateStepDaoTests.java | 2 +- .../batch/execution/repository/dao/SqlJobDaoTests.java | 2 +- .../batch/execution/repository/dao/SqlStepDaoTests.java | 2 +- 6 files changed, 11 insertions(+), 6 deletions(-) rename execution/src/test/java/org/springframework/batch/execution/repository/dao/{BaseJobDaoTests.java => AbstractJobDaoTests.java} (98%) rename execution/src/test/java/org/springframework/batch/execution/repository/dao/{BaseStepDaoTests.java => AbstractStepDaoTests.java} (98%) diff --git a/execution/src/test/java/org/springframework/batch/execution/repository/dao/BaseJobDaoTests.java b/execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java similarity index 98% rename from execution/src/test/java/org/springframework/batch/execution/repository/dao/BaseJobDaoTests.java rename to execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java index 3a9c04d4d..43c0f2a71 100644 --- a/execution/src/test/java/org/springframework/batch/execution/repository/dao/BaseJobDaoTests.java +++ b/execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java @@ -33,7 +33,11 @@ import org.springframework.jdbc.core.RowMapper; import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests; import org.springframework.util.ClassUtils; -public class BaseJobDaoTests extends +/** + * @author Dave Syer + * + */ +public abstract class AbstractJobDaoTests extends AbstractTransactionalDataSourceSpringContextTests { private static final String GET_JOB_EXECUTION = "SELECT JOB_ID, START_TIME, END_TIME, STATUS from " diff --git a/execution/src/test/java/org/springframework/batch/execution/repository/dao/BaseStepDaoTests.java b/execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractStepDaoTests.java similarity index 98% rename from execution/src/test/java/org/springframework/batch/execution/repository/dao/BaseStepDaoTests.java rename to execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractStepDaoTests.java index d91d6af65..a7baf243a 100644 --- a/execution/src/test/java/org/springframework/batch/execution/repository/dao/BaseStepDaoTests.java +++ b/execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractStepDaoTests.java @@ -37,8 +37,9 @@ import org.springframework.util.ClassUtils; * jobs, to have an id for creating steps. * * @author Lucas Ward + * @author Dave Syer */ -public class BaseStepDaoTests extends AbstractTransactionalDataSourceSpringContextTests { +public abstract class AbstractStepDaoTests extends AbstractTransactionalDataSourceSpringContextTests { protected JobDao jobDao; diff --git a/execution/src/test/java/org/springframework/batch/execution/repository/dao/HibernateJobDaoTests.java b/execution/src/test/java/org/springframework/batch/execution/repository/dao/HibernateJobDaoTests.java index 30391e4ac..05fce0b2b 100644 --- a/execution/src/test/java/org/springframework/batch/execution/repository/dao/HibernateJobDaoTests.java +++ b/execution/src/test/java/org/springframework/batch/execution/repository/dao/HibernateJobDaoTests.java @@ -24,7 +24,7 @@ import org.hibernate.SessionFactory; import org.springframework.batch.core.domain.BatchStatus; import org.springframework.util.ClassUtils; -public class HibernateJobDaoTests extends BaseJobDaoTests { +public class HibernateJobDaoTests extends AbstractJobDaoTests { private SessionFactory sessionFactory; diff --git a/execution/src/test/java/org/springframework/batch/execution/repository/dao/HibernateStepDaoTests.java b/execution/src/test/java/org/springframework/batch/execution/repository/dao/HibernateStepDaoTests.java index 5d3212524..f1d6bd23b 100644 --- a/execution/src/test/java/org/springframework/batch/execution/repository/dao/HibernateStepDaoTests.java +++ b/execution/src/test/java/org/springframework/batch/execution/repository/dao/HibernateStepDaoTests.java @@ -24,7 +24,7 @@ import org.springframework.batch.core.domain.StepInstance; import org.springframework.batch.support.PropertiesConverter; import org.springframework.util.ClassUtils; -public class HibernateStepDaoTests extends BaseStepDaoTests { +public class HibernateStepDaoTests extends AbstractStepDaoTests { private SessionFactory sessionFactory; diff --git a/execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlJobDaoTests.java b/execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlJobDaoTests.java index 884220fbb..e3e68ecff 100644 --- a/execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlJobDaoTests.java +++ b/execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlJobDaoTests.java @@ -3,7 +3,7 @@ package org.springframework.batch.execution.repository.dao; import org.springframework.dao.DataAccessException; -public class SqlJobDaoTests extends BaseJobDaoTests { +public class SqlJobDaoTests extends AbstractJobDaoTests { protected void onSetUpBeforeTransaction() throws Exception { ((SqlJobDao) jobDao).setTablePrefix(SqlJobDao.DEFAULT_TABLE_PREFIX); diff --git a/execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlStepDaoTests.java b/execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlStepDaoTests.java index 78bb2303c..919211f35 100644 --- a/execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlStepDaoTests.java +++ b/execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlStepDaoTests.java @@ -2,7 +2,7 @@ package org.springframework.batch.execution.repository.dao; import org.springframework.dao.DataAccessException; -public class SqlStepDaoTests extends BaseStepDaoTests { +public class SqlStepDaoTests extends AbstractStepDaoTests { protected void onSetUpBeforeTransaction() throws Exception { ((SqlStepDao) stepDao).setTablePrefix(SqlJobDao.DEFAULT_TABLE_PREFIX);