From 6531b0ad79c2bb29b830c15514b6cc079463dd0a Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Tue, 16 Dec 2008 23:29:28 +0000 Subject: [PATCH] moving unit tests from .testsuite -> .jdbc git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@438 50f2f4bb-b051-0410-bef5-90022cba6387 --- .../jdbc/AbstractJdbcTests.java | 4 +- .../org/springframework/jdbc/Customer.java | 2 +- .../jdbc/core/AbstractRowMapperTests.java | 19 ++- .../core/SimpleRowCountCallbackHandler.java | 2 +- .../NamedParameterJdbcTemplateTests.java | 20 ++- .../core/simple/CallMetaDataContextTests.java | 0 ...rameterizedBeanPropertyRowMapperTests.java | 0 .../jdbc/core/simple/SimpleJdbcCallTests.java | 0 .../core/simple/SimpleJdbcInsertTests.java | 0 .../core/simple/SimpleJdbcTemplateTests.java | 0 .../simple/TableMetaDataContextTests.java | 0 .../BeanFactoryDataSourceLookupTests.java | 58 ++++--- .../lookup/JndiDataSourceLookupTests.java | 30 ++-- .../lookup/MapDataSourceLookupTests.java | 55 ++++--- .../datasource/lookup/StubDataSource.java | 0 .../support/CustomErrorCodeException.java | 3 +- .../support/SQLExceptionSubclassFactory.java | 2 +- .../SQLStateSQLExceptionTranslatorTests.java | 24 +-- .../jdbc/support/custom-error-codes.xml | 0 .../jdbc/support/test-error-codes.xml | 0 .../jdbc/support/wildcard-error-codes.xml | 0 .../jdbc/AbstractJdbcTests.java | 85 ---------- .../org/springframework/jdbc/Customer.java | 50 ------ .../jdbc/core/AbstractRowMapperTests.java | 145 ------------------ .../core/SimpleRowCountCallbackHandler.java | 42 ----- .../jdbc/core/test/AbstractPerson.java | 57 ------- .../jdbc/core/test/ConcretePerson.java | 37 ----- .../jdbc/core/test/ExtendedPerson.java | 35 ----- .../jdbc/core/test/Person.java | 67 -------- .../support/CustomErrorCodeException.java | 34 ---- .../support/SQLExceptionSubclassFactory.java | 78 ---------- 31 files changed, 108 insertions(+), 741 deletions(-) rename {org.springframework.testsuite => org.springframework.jdbc}/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java (97%) rename {org.springframework.testsuite => org.springframework.jdbc}/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java (100%) rename {org.springframework.testsuite => org.springframework.jdbc}/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java (100%) rename {org.springframework.testsuite => org.springframework.jdbc}/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java (100%) rename {org.springframework.testsuite => org.springframework.jdbc}/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java (100%) rename {org.springframework.testsuite => org.springframework.jdbc}/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java (100%) rename {org.springframework.testsuite => org.springframework.jdbc}/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java (100%) rename {org.springframework.testsuite => org.springframework.jdbc}/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java (54%) rename {org.springframework.testsuite => org.springframework.jdbc}/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java (73%) rename {org.springframework.testsuite => org.springframework.jdbc}/src/test/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookupTests.java (73%) rename {org.springframework.testsuite => org.springframework.jdbc}/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java (100%) rename {org.springframework.testsuite => org.springframework.jdbc}/src/test/java/org/springframework/jdbc/support/SQLStateSQLExceptionTranslatorTests.java (88%) rename {org.springframework.testsuite => org.springframework.jdbc}/src/test/java/org/springframework/jdbc/support/custom-error-codes.xml (100%) rename {org.springframework.testsuite => org.springframework.jdbc}/src/test/java/org/springframework/jdbc/support/test-error-codes.xml (100%) rename {org.springframework.testsuite => org.springframework.jdbc}/src/test/java/org/springframework/jdbc/support/wildcard-error-codes.xml (100%) delete mode 100644 org.springframework.testsuite/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java delete mode 100644 org.springframework.testsuite/src/test/java/org/springframework/jdbc/Customer.java delete mode 100644 org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java delete mode 100644 org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java delete mode 100644 org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/test/AbstractPerson.java delete mode 100644 org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/test/ConcretePerson.java delete mode 100644 org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/test/ExtendedPerson.java delete mode 100644 org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/test/Person.java delete mode 100644 org.springframework.testsuite/src/test/java/org/springframework/jdbc/support/CustomErrorCodeException.java delete mode 100644 org.springframework.testsuite/src/test/java/org/springframework/jdbc/support/SQLExceptionSubclassFactory.java diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java index 8ddc2e5d3c7..c8fecfdf969 100644 --- a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java +++ b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java @@ -37,7 +37,7 @@ public abstract class AbstractJdbcTests extends TestCase { protected DataSource mockDataSource; protected MockControl ctrlConnection; protected Connection mockConnection; - + /** * Set to true if the user wants verification, indicated * by a call to replay(). We need to make this optional, @@ -82,4 +82,4 @@ public abstract class AbstractJdbcTests extends TestCase { return this.shouldVerify; } -} \ No newline at end of file +} diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/Customer.java b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/Customer.java index e4fedc60ec5..7c804be1d82 100644 --- a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/Customer.java +++ b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/Customer.java @@ -47,4 +47,4 @@ public class Customer { return "Customer: id=" + id + "; forename=" + forename; } -} \ No newline at end of file +} diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java index 8a5e6301d5f..271fadee7c7 100644 --- a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java +++ b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java @@ -26,7 +26,6 @@ import java.sql.Timestamp; import java.sql.Types; import junit.framework.TestCase; -import junit.framework.Assert; import org.easymock.MockControl; import org.apache.commons.logging.LogFactory; @@ -122,18 +121,18 @@ public abstract class AbstractRowMapperTests extends TestCase { protected void verifyPerson(Person bean) { verify(); - Assert.assertEquals("Bubba", bean.getName()); - Assert.assertEquals(22L, bean.getAge()); - Assert.assertEquals(new java.util.Date(1221222L), bean.getBirth_date()); - Assert.assertEquals(new BigDecimal("1234.56"), bean.getBalance()); + assertEquals("Bubba", bean.getName()); + assertEquals(22L, bean.getAge()); + assertEquals(new java.util.Date(1221222L), bean.getBirth_date()); + assertEquals(new BigDecimal("1234.56"), bean.getBalance()); } protected void verifyConcretePerson(ConcretePerson bean) { verify(); - Assert.assertEquals("Bubba", bean.getName()); - Assert.assertEquals(22L, bean.getAge()); - Assert.assertEquals(new java.util.Date(1221222L), bean.getBirth_date()); - Assert.assertEquals(new BigDecimal("1234.56"), bean.getBalance()); + assertEquals("Bubba", bean.getName()); + assertEquals(22L, bean.getAge()); + assertEquals(new java.util.Date(1221222L), bean.getBirth_date()); + assertEquals(new BigDecimal("1234.56"), bean.getBalance()); } private void verify() { @@ -143,4 +142,4 @@ public abstract class AbstractRowMapperTests extends TestCase { stmtControl.verify(); } -} \ No newline at end of file +} diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java index 0589540ca0a..ae4d9737026 100644 --- a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java +++ b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java @@ -39,4 +39,4 @@ public class SimpleRowCountCallbackHandler implements RowCallbackHandler { return count; } -} \ No newline at end of file +} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java similarity index 97% rename from org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java rename to org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java index b2b6f0f73d4..d221bf5a472 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java +++ b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java @@ -40,11 +40,11 @@ import org.springframework.jdbc.core.RowCallbackHandler; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.SqlParameterValue; import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.test.AssertThrows; /** * @author Rick Evans * @author Juergen Hoeller + * @author Chris Beams */ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests { @@ -91,19 +91,17 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests { public void testNullDataSourceProvidedToCtor() throws Exception { - new AssertThrows(IllegalArgumentException.class) { - public void test() throws Exception { - new NamedParameterJdbcTemplate((DataSource) null); - } - }.runTest(); + try { + new NamedParameterJdbcTemplate((DataSource) null); + fail("should have thrown IllegalArgumentException"); + } catch (IllegalArgumentException ex) { /* expected */ } } public void testNullJdbcTemplateProvidedToCtor() throws Exception { - new AssertThrows(IllegalArgumentException.class) { - public void test() throws Exception { - new NamedParameterJdbcTemplate((JdbcOperations) null); - } - }.runTest(); + try { + new NamedParameterJdbcTemplate((JdbcOperations) null); + fail("should have thrown IllegalArgumentException"); + } catch (IllegalArgumentException ex) { /* expected */ } } public void testExecute() throws SQLException { diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java rename to org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java rename to org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java rename to org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java rename to org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java rename to org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java rename to org.springframework.jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java similarity index 54% rename from org.springframework.testsuite/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java rename to org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java index 30b78b33e54..e6e8e10c077 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java +++ b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java @@ -16,69 +16,67 @@ package org.springframework.jdbc.datasource.lookup; +import static org.easymock.EasyMock.*; +import static org.junit.Assert.*; + import javax.sql.DataSource; -import junit.framework.TestCase; -import org.easymock.MockControl; - +import org.junit.Test; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanNotOfRequiredTypeException; -import org.springframework.test.AssertThrows; /** * @author Rick Evans * @author Juergen Hoeller + * @author Chris Beams */ -public class BeanFactoryDataSourceLookupTests extends TestCase { +public class BeanFactoryDataSourceLookupTests { private static final String DATASOURCE_BEAN_NAME = "dataSource"; - public void testLookupSunnyDay() throws Exception { - MockControl mockBeanFactory = MockControl.createControl(BeanFactory.class); - BeanFactory beanFactory = (BeanFactory) mockBeanFactory.getMock(); - - beanFactory.getBean(DATASOURCE_BEAN_NAME, DataSource.class); + @Test + public void testLookupSunnyDay() { + BeanFactory beanFactory = createMock(BeanFactory.class); + StubDataSource expectedDataSource = new StubDataSource(); - mockBeanFactory.setReturnValue(expectedDataSource); + expect(beanFactory.getBean(DATASOURCE_BEAN_NAME, DataSource.class)).andReturn(expectedDataSource); - mockBeanFactory.replay(); + replay(beanFactory); BeanFactoryDataSourceLookup lookup = new BeanFactoryDataSourceLookup(); lookup.setBeanFactory(beanFactory); DataSource dataSource = lookup.getDataSource(DATASOURCE_BEAN_NAME); - assertNotNull("A DataSourceLookup implementation must *never* return null from getDataSource(): this one obviously (and incorrectly) is", dataSource); + assertNotNull("A DataSourceLookup implementation must *never* return null from " + + "getDataSource(): this one obviously (and incorrectly) is", dataSource); assertSame(expectedDataSource, dataSource); - mockBeanFactory.verify(); + verify(beanFactory); } + @Test public void testLookupWhereBeanFactoryYieldsNonDataSourceType() throws Exception { - MockControl mockBeanFactory = MockControl.createControl(BeanFactory.class); - final BeanFactory beanFactory = (BeanFactory) mockBeanFactory.getMock(); + final BeanFactory beanFactory = createMock(BeanFactory.class); - beanFactory.getBean(DATASOURCE_BEAN_NAME, DataSource.class); - mockBeanFactory.setThrowable(new BeanNotOfRequiredTypeException(DATASOURCE_BEAN_NAME, DataSource.class, String.class)); + expect( + beanFactory.getBean(DATASOURCE_BEAN_NAME, DataSource.class) + ).andThrow(new BeanNotOfRequiredTypeException(DATASOURCE_BEAN_NAME, DataSource.class, String.class)); - mockBeanFactory.replay(); + replay(beanFactory); - new AssertThrows(DataSourceLookupFailureException.class) { - public void test() throws Exception { + try { BeanFactoryDataSourceLookup lookup = new BeanFactoryDataSourceLookup(beanFactory); lookup.getDataSource(DATASOURCE_BEAN_NAME); - } - }.runTest(); + fail("should have thrown DataSourceLookupFailureException"); + } catch (DataSourceLookupFailureException ex) { /* expected */ } - mockBeanFactory.verify(); + verify(beanFactory); } + @Test(expected=IllegalStateException.class) public void testLookupWhereBeanFactoryHasNotBeenSupplied() throws Exception { - new AssertThrows(IllegalStateException.class) { - public void test() throws Exception { - BeanFactoryDataSourceLookup lookup = new BeanFactoryDataSourceLookup(); - lookup.getDataSource(DATASOURCE_BEAN_NAME); - } - }.runTest(); + BeanFactoryDataSourceLookup lookup = new BeanFactoryDataSourceLookup(); + lookup.getDataSource(DATASOURCE_BEAN_NAME); } } diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java similarity index 73% rename from org.springframework.testsuite/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java rename to org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java index eebfac250b9..4534d493ed6 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java +++ b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java @@ -16,24 +16,26 @@ package org.springframework.jdbc.datasource.lookup; +import static org.junit.Assert.*; + import javax.naming.NamingException; import javax.sql.DataSource; -import junit.framework.TestCase; - -import org.springframework.test.AssertThrows; +import org.junit.Test; /** * @author Rick Evans + * @author Chris Beams */ -public final class JndiDataSourceLookupTests extends TestCase { +public final class JndiDataSourceLookupTests { private static final String DATA_SOURCE_NAME = "Love is like a stove, burns you when it's hot"; - + @Test public void testSunnyDay() throws Exception { final DataSource expectedDataSource = new StubDataSource(); JndiDataSourceLookup lookup = new JndiDataSourceLookup() { + @SuppressWarnings("unchecked") protected Object lookup(String jndiName, Class requiredType) { assertEquals(DATA_SOURCE_NAME, jndiName); return expectedDataSource; @@ -44,18 +46,16 @@ public final class JndiDataSourceLookupTests extends TestCase { assertSame(expectedDataSource, dataSource); } + @Test(expected=DataSourceLookupFailureException.class) public void testNoDataSourceAtJndiLocation() throws Exception { - new AssertThrows(DataSourceLookupFailureException.class) { - public void test() throws Exception { - JndiDataSourceLookup lookup = new JndiDataSourceLookup() { - protected Object lookup(String jndiName, Class requiredType) throws NamingException { - assertEquals(DATA_SOURCE_NAME, jndiName); - throw new NamingException(); - } - }; - lookup.getDataSource(DATA_SOURCE_NAME); + JndiDataSourceLookup lookup = new JndiDataSourceLookup() { + @SuppressWarnings("unchecked") + protected Object lookup(String jndiName, Class requiredType) throws NamingException { + assertEquals(DATA_SOURCE_NAME, jndiName); + throw new NamingException(); } - }.runTest(); + }; + lookup.getDataSource(DATA_SOURCE_NAME); } } diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookupTests.java b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookupTests.java similarity index 73% rename from org.springframework.testsuite/src/test/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookupTests.java rename to org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookupTests.java index a7260b5c965..2c91098e01d 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookupTests.java +++ b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookupTests.java @@ -16,35 +16,35 @@ package org.springframework.jdbc.datasource.lookup; +import static org.junit.Assert.*; + import java.util.HashMap; import java.util.Map; import javax.sql.DataSource; -import junit.framework.TestCase; - -import org.springframework.test.AssertThrows; +import org.junit.Test; /** * @author Rick Evans + * @author Chris Beams */ -public final class MapDataSourceLookupTests extends TestCase { +public final class MapDataSourceLookupTests { private static final String DATA_SOURCE_NAME = "dataSource"; + @SuppressWarnings("unchecked") + @Test(expected=UnsupportedOperationException.class) public void testGetDataSourcesReturnsUnmodifiableMap() throws Exception { - new AssertThrows(UnsupportedOperationException.class, "The Map returned from getDataSources() *must* be unmodifiable") { - public void test() throws Exception { - MapDataSourceLookup lookup = new MapDataSourceLookup(new HashMap()); - Map dataSources = lookup.getDataSources(); - dataSources.put("", ""); - } - }.runTest(); + MapDataSourceLookup lookup = new MapDataSourceLookup(new HashMap()); + Map dataSources = lookup.getDataSources(); + dataSources.put("", ""); } + @Test public void testLookupSunnyDay() throws Exception { - Map dataSources = new HashMap(); + Map dataSources = new HashMap(); StubDataSource expectedDataSource = new StubDataSource(); dataSources.put(DATA_SOURCE_NAME, expectedDataSource); MapDataSourceLookup lookup = new MapDataSourceLookup(); @@ -54,8 +54,9 @@ public final class MapDataSourceLookupTests extends TestCase { assertSame(expectedDataSource, dataSource); } + @Test public void testSettingDataSourceMapToNullIsAnIdempotentOperation() throws Exception { - Map dataSources = new HashMap(); + Map dataSources = new HashMap(); StubDataSource expectedDataSource = new StubDataSource(); dataSources.put(DATA_SOURCE_NAME, expectedDataSource); MapDataSourceLookup lookup = new MapDataSourceLookup(); @@ -66,8 +67,9 @@ public final class MapDataSourceLookupTests extends TestCase { assertSame(expectedDataSource, dataSource); } + @Test public void testAddingDataSourcePermitsOverride() throws Exception { - Map dataSources = new HashMap(); + Map dataSources = new HashMap(); StubDataSource overridenDataSource = new StubDataSource(); StubDataSource expectedDataSource = new StubDataSource(); dataSources.put(DATA_SOURCE_NAME, overridenDataSource); @@ -79,25 +81,20 @@ public final class MapDataSourceLookupTests extends TestCase { assertSame(expectedDataSource, dataSource); } + @SuppressWarnings("unchecked") + @Test(expected=ClassCastException.class) public void testGetDataSourceWhereSuppliedMapHasNonDataSourceTypeUnderSpecifiedKey() throws Exception { - new AssertThrows(ClassCastException.class) { - public void test() throws Exception { - Map dataSources = new HashMap(); - dataSources.put(DATA_SOURCE_NAME, new Object()); - MapDataSourceLookup lookup = new MapDataSourceLookup(); - lookup.setDataSources(dataSources); - lookup.getDataSource(DATA_SOURCE_NAME); - } - }.runTest(); + Map dataSources = new HashMap(); + dataSources.put(DATA_SOURCE_NAME, new Object()); + MapDataSourceLookup lookup = new MapDataSourceLookup(); + lookup.setDataSources(dataSources); + lookup.getDataSource(DATA_SOURCE_NAME); } + @Test(expected=DataSourceLookupFailureException.class) public void testGetDataSourceWhereSuppliedMapHasNoEntryForSpecifiedKey() throws Exception { - new AssertThrows(DataSourceLookupFailureException.class) { - public void test() throws Exception { - MapDataSourceLookup lookup = new MapDataSourceLookup(); - lookup.getDataSource(DATA_SOURCE_NAME); - } - }.runTest(); + MapDataSourceLookup lookup = new MapDataSourceLookup(); + lookup.getDataSource(DATA_SOURCE_NAME); } } diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java rename to org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/CustomErrorCodeException.java b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/CustomErrorCodeException.java index 3931fe84ce7..7a26db34718 100644 --- a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/CustomErrorCodeException.java +++ b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/CustomErrorCodeException.java @@ -21,6 +21,7 @@ import org.springframework.dao.DataAccessException; /** * @author Thomas Risberg */ +@SuppressWarnings("serial") public class CustomErrorCodeException extends DataAccessException { public CustomErrorCodeException(String msg) { @@ -31,4 +32,4 @@ public class CustomErrorCodeException extends DataAccessException { super(msg, ex); } -} \ No newline at end of file +} diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/SQLExceptionSubclassFactory.java b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/SQLExceptionSubclassFactory.java index eec10be906c..3d6f05949a7 100644 --- a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/SQLExceptionSubclassFactory.java +++ b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/SQLExceptionSubclassFactory.java @@ -75,4 +75,4 @@ public class SQLExceptionSubclassFactory { return new SQLRecoverableException(reason, SQLState, vendorCode); } -} \ No newline at end of file +} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/support/SQLStateSQLExceptionTranslatorTests.java b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/SQLStateSQLExceptionTranslatorTests.java similarity index 88% rename from org.springframework.testsuite/src/test/java/org/springframework/jdbc/support/SQLStateSQLExceptionTranslatorTests.java rename to org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/SQLStateSQLExceptionTranslatorTests.java index 418c0f8e084..9f124d15448 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/support/SQLStateSQLExceptionTranslatorTests.java +++ b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/SQLStateSQLExceptionTranslatorTests.java @@ -16,10 +16,11 @@ package org.springframework.jdbc.support; +import static org.junit.Assert.*; + import java.sql.SQLException; -import junit.framework.TestCase; - +import org.junit.Test; import org.springframework.dao.ConcurrencyFailureException; import org.springframework.dao.DataAccessException; import org.springframework.dao.DataAccessResourceFailureException; @@ -27,13 +28,13 @@ import org.springframework.dao.DataIntegrityViolationException; import org.springframework.dao.TransientDataAccessResourceException; import org.springframework.jdbc.BadSqlGrammarException; import org.springframework.jdbc.UncategorizedSQLException; -import org.springframework.test.AssertThrows; /** * @author Rick Evans * @author Juergen Hoeller + * @author Chris Beams */ -public class SQLStateSQLExceptionTranslatorTests extends TestCase { +public class SQLStateSQLExceptionTranslatorTests { private static final String REASON = "The game is afoot!"; @@ -42,40 +43,43 @@ public class SQLStateSQLExceptionTranslatorTests extends TestCase { private static final String SQL = "select count(0) from t_sheep where over_fence = ... yawn... 1"; + @Test(expected=IllegalArgumentException.class) public void testTranslateNullException() throws Exception { - new AssertThrows(IllegalArgumentException.class) { - public void test() throws Exception { - new SQLStateSQLExceptionTranslator().translate("", "", null); - } - }.runTest(); + new SQLStateSQLExceptionTranslator().translate("", "", null); } + @Test public void testTranslateBadSqlGrammar() throws Exception { doTest("07", BadSqlGrammarException.class); } + @Test public void testTranslateDataIntegrityViolation() throws Exception { doTest("23", DataIntegrityViolationException.class); } + @Test public void testTranslateDataAccessResourceFailure() throws Exception { doTest("53", DataAccessResourceFailureException.class); } + @Test public void testTranslateTransientDataAccessResourceFailure() throws Exception { doTest("S1", TransientDataAccessResourceException.class); } + @Test public void testTranslateConcurrencyFailure() throws Exception { doTest("40", ConcurrencyFailureException.class); } + @Test public void testTranslateUncategorized() throws Exception { doTest("00000000", UncategorizedSQLException.class); } - private void doTest(String sqlState, Class dataAccessExceptionType) { + private void doTest(String sqlState, Class dataAccessExceptionType) { SQLException ex = new SQLException(REASON, sqlState); SQLExceptionTranslator translator = new SQLStateSQLExceptionTranslator(); DataAccessException dax = translator.translate(TASK, SQL, ex); diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/support/custom-error-codes.xml b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/custom-error-codes.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jdbc/support/custom-error-codes.xml rename to org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/custom-error-codes.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/support/test-error-codes.xml b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/test-error-codes.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jdbc/support/test-error-codes.xml rename to org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/test-error-codes.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/support/wildcard-error-codes.xml b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/wildcard-error-codes.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jdbc/support/wildcard-error-codes.xml rename to org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/wildcard-error-codes.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java b/org.springframework.testsuite/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java deleted file mode 100644 index c8fecfdf969..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * AbstractJdbcTests.java - * - * Copyright (C) 2002 by Interprise Software. All rights reserved. - */ -/* - * Copyright 2002-2005 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.jdbc; - -import java.sql.Connection; - -import javax.sql.DataSource; - -import junit.framework.TestCase; -import org.easymock.MockControl; - -/** - * @author Trevor D. Cook - */ -public abstract class AbstractJdbcTests extends TestCase { - - protected MockControl ctrlDataSource; - protected DataSource mockDataSource; - protected MockControl ctrlConnection; - protected Connection mockConnection; - - /** - * Set to true if the user wants verification, indicated - * by a call to replay(). We need to make this optional, - * otherwise we setUp() will always result in verification failures - */ - private boolean shouldVerify; - - protected void setUp() throws Exception { - this.shouldVerify = false; - super.setUp(); - - ctrlConnection = MockControl.createControl(Connection.class); - mockConnection = (Connection) ctrlConnection.getMock(); - mockConnection.getMetaData(); - ctrlConnection.setDefaultReturnValue(null); - mockConnection.close(); - ctrlConnection.setDefaultVoidCallable(); - - ctrlDataSource = MockControl.createControl(DataSource.class); - mockDataSource = (DataSource) ctrlDataSource.getMock(); - mockDataSource.getConnection(); - ctrlDataSource.setDefaultReturnValue(mockConnection); - } - - protected void replay() { - ctrlDataSource.replay(); - ctrlConnection.replay(); - this.shouldVerify = true; - } - - protected void tearDown() throws Exception { - super.tearDown(); - - // we shouldn't verify unless the user called replay() - if (shouldVerify()) { - ctrlDataSource.verify(); - //ctrlConnection.verify(); - } - } - - protected boolean shouldVerify() { - return this.shouldVerify; - } - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/Customer.java b/org.springframework.testsuite/src/test/java/org/springframework/jdbc/Customer.java deleted file mode 100644 index 7c804be1d82..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/Customer.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2002-2007 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.jdbc; - -/** - * @author Juergen Hoeller - */ -public class Customer { - - private int id; - - private String forename; - - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public String getForename() { - return forename; - } - - public void setForename(String forename) { - this.forename = forename; - } - - - public String toString() { - return "Customer: id=" + id + "; forename=" + forename; - } - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java b/org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java deleted file mode 100644 index 271fadee7c7..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java +++ /dev/null @@ -1,145 +0,0 @@ -/* - * Copyright 2002-2008 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.jdbc.core; - -import java.math.BigDecimal; -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; -import java.sql.SQLException; -import java.sql.Statement; -import java.sql.Timestamp; -import java.sql.Types; - -import junit.framework.TestCase; -import org.easymock.MockControl; -import org.apache.commons.logging.LogFactory; - -import org.springframework.jdbc.core.test.ConcretePerson; -import org.springframework.jdbc.core.test.Person; -import org.springframework.jdbc.datasource.SingleConnectionDataSource; -import org.springframework.jdbc.support.SQLStateSQLExceptionTranslator; - -/** - * Mock object based abstract class for RowMapper tests. - * Initializes mock objects and verifies results. - * - * @author Thomas Risberg - */ -public abstract class AbstractRowMapperTests extends TestCase { - - private final boolean debugEnabled = LogFactory.getLog(JdbcTemplate.class).isDebugEnabled(); - - protected MockControl conControl; - protected Connection con; - protected MockControl rsmdControl; - protected ResultSetMetaData rsmd; - protected MockControl rsControl; - protected ResultSet rs; - protected MockControl stmtControl; - protected Statement stmt; - protected JdbcTemplate jdbcTemplate; - - protected void setUp() throws SQLException { - conControl = MockControl.createControl(Connection.class); - con = (Connection) conControl.getMock(); - con.isClosed(); - conControl.setDefaultReturnValue(false); - - rsmdControl = MockControl.createControl(ResultSetMetaData.class); - rsmd = (ResultSetMetaData)rsmdControl.getMock(); - rsmd.getColumnCount(); - rsmdControl.setReturnValue(4, 1); - rsmd.getColumnLabel(1); - rsmdControl.setReturnValue("name", 1); - rsmd.getColumnLabel(2); - rsmdControl.setReturnValue("age", 1); - rsmd.getColumnLabel(3); - rsmdControl.setReturnValue("birth_date", 1); - rsmd.getColumnLabel(4); - rsmdControl.setReturnValue("balance", 1); - rsmdControl.replay(); - - rsControl = MockControl.createControl(ResultSet.class); - rs = (ResultSet) rsControl.getMock(); - rs.getMetaData(); - rsControl.setReturnValue(rsmd, 1); - rs.next(); - rsControl.setReturnValue(true, 1); - rs.getString(1); - rsControl.setReturnValue("Bubba", 1); - rs.wasNull(); - rsControl.setReturnValue(false, 1); - rs.getLong(2); - rsControl.setReturnValue(22, 1); - rs.getTimestamp(3); - rsControl.setReturnValue(new Timestamp(1221222L), 1); - rs.getBigDecimal(4); - rsControl.setReturnValue(new BigDecimal("1234.56"), 1); - rs.next(); - rsControl.setReturnValue(false, 1); - rs.close(); - rsControl.setVoidCallable(1); - rsControl.replay(); - - stmtControl = MockControl.createControl(Statement.class); - stmt = (Statement) stmtControl.getMock(); - - con.createStatement(); - conControl.setReturnValue(stmt, 1); - stmt.executeQuery("select name, age, birth_date, balance from people"); - stmtControl.setReturnValue(rs, 1); - if (debugEnabled) { - stmt.getWarnings(); - stmtControl.setReturnValue(null, 1); - } - stmt.close(); - stmtControl.setVoidCallable(1); - - conControl.replay(); - stmtControl.replay(); - - jdbcTemplate = new JdbcTemplate(); - jdbcTemplate.setDataSource(new SingleConnectionDataSource(con, false)); - jdbcTemplate.setExceptionTranslator(new SQLStateSQLExceptionTranslator()); - jdbcTemplate.afterPropertiesSet(); - } - - protected void verifyPerson(Person bean) { - verify(); - assertEquals("Bubba", bean.getName()); - assertEquals(22L, bean.getAge()); - assertEquals(new java.util.Date(1221222L), bean.getBirth_date()); - assertEquals(new BigDecimal("1234.56"), bean.getBalance()); - } - - protected void verifyConcretePerson(ConcretePerson bean) { - verify(); - assertEquals("Bubba", bean.getName()); - assertEquals(22L, bean.getAge()); - assertEquals(new java.util.Date(1221222L), bean.getBirth_date()); - assertEquals(new BigDecimal("1234.56"), bean.getBalance()); - } - - private void verify() { - conControl.verify(); - rsControl.verify(); - rsmdControl.verify(); - stmtControl.verify(); - } - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java b/org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java deleted file mode 100644 index ae4d9737026..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2002-2006 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.jdbc.core; - -import java.sql.ResultSet; -import java.sql.SQLException; - -/** - * Simple row count callback handler for testing purposes. - * Does not call any JDBC methods on the given ResultSet. - * - * @author Juergen Hoeller - * @since 2.0 - */ -public class SimpleRowCountCallbackHandler implements RowCallbackHandler { - - private int count; - - - public void processRow(ResultSet rs) throws SQLException { - count++; - } - - public int getCount() { - return count; - } - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/test/AbstractPerson.java b/org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/test/AbstractPerson.java deleted file mode 100644 index 89148bc0821..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/test/AbstractPerson.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2002-2008 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.jdbc.core.test; - -import java.util.Date; - -/** - * @author Thomas Risberg - */ -public abstract class AbstractPerson { - - private String name; - - private long age; - - private java.util.Date birth_date; - - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public long getAge() { - return age; - } - - public void setAge(long age) { - this.age = age; - } - - public Date getBirth_date() { - return birth_date; - } - - public void setBirth_date(Date birth_date) { - this.birth_date = birth_date; - } - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/test/ConcretePerson.java b/org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/test/ConcretePerson.java deleted file mode 100644 index 5d13c99c1b0..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/test/ConcretePerson.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2002-2008 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.jdbc.core.test; - -import java.math.BigDecimal; - -/** - * @author Thomas Risberg - */ -public class ConcretePerson extends AbstractPerson { - - private BigDecimal balance; - - - public BigDecimal getBalance() { - return balance; - } - - public void setBalance(BigDecimal balance) { - this.balance = balance; - } - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/test/ExtendedPerson.java b/org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/test/ExtendedPerson.java deleted file mode 100644 index 21c4f2eb6e2..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/test/ExtendedPerson.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2002-2008 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.jdbc.core.test; - -/** - * @author Juergen Hoeller - */ -public class ExtendedPerson extends ConcretePerson { - - private Object someField; - - - public Object getSomeField() { - return someField; - } - - public void setSomeField(Object someField) { - this.someField = someField; - } - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/test/Person.java b/org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/test/Person.java deleted file mode 100644 index 9613b37e94b..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/core/test/Person.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright 2002-2008 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.jdbc.core.test; - -import java.math.BigDecimal; - -/** - * @author Thomas Risberg - */ -public class Person { - - private String name; - - private long age; - - private java.util.Date birth_date; - - private BigDecimal balance; - - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public long getAge() { - return age; - } - - public void setAge(long age) { - this.age = age; - } - - public java.util.Date getBirth_date() { - return birth_date; - } - - public void setBirth_date(java.util.Date birth_date) { - this.birth_date = birth_date; - } - - public BigDecimal getBalance() { - return balance; - } - - public void setBalance(BigDecimal balanace) { - this.balance = balanace; - } - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/support/CustomErrorCodeException.java b/org.springframework.testsuite/src/test/java/org/springframework/jdbc/support/CustomErrorCodeException.java deleted file mode 100644 index 579a91cbb64..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/support/CustomErrorCodeException.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2002-2005 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.jdbc.support; - -import org.springframework.dao.DataAccessException; - -/** - * @author Thomas Risberg - */ -public class CustomErrorCodeException extends DataAccessException { - - public CustomErrorCodeException(String msg) { - super(msg); - } - - public CustomErrorCodeException(String msg, Throwable ex) { - super(msg, ex); - } - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/support/SQLExceptionSubclassFactory.java b/org.springframework.testsuite/src/test/java/org/springframework/jdbc/support/SQLExceptionSubclassFactory.java deleted file mode 100644 index 3d6f05949a7..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/jdbc/support/SQLExceptionSubclassFactory.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright 2002-2008 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.jdbc.support; - -import java.sql.SQLDataException; -import java.sql.SQLException; -import java.sql.SQLFeatureNotSupportedException; -import java.sql.SQLIntegrityConstraintViolationException; -import java.sql.SQLInvalidAuthorizationSpecException; -import java.sql.SQLNonTransientConnectionException; -import java.sql.SQLRecoverableException; -import java.sql.SQLSyntaxErrorException; -import java.sql.SQLTimeoutException; -import java.sql.SQLTransactionRollbackException; -import java.sql.SQLTransientConnectionException; - -/** - * Class to generate Java 6 SQLException subclasses for testing purposes. - * - * @author Thomas Risberg - */ -public class SQLExceptionSubclassFactory { - - public static SQLException newSQLDataException(String reason, String SQLState, int vendorCode) { - return new SQLDataException(reason, SQLState, vendorCode); - } - - public static SQLException newSQLFeatureNotSupportedException(String reason, String SQLState, int vendorCode) { - return new SQLFeatureNotSupportedException(reason, SQLState, vendorCode); - } - - public static SQLException newSQLIntegrityConstraintViolationException(String reason, String SQLState, int vendorCode) { - return new SQLIntegrityConstraintViolationException(reason, SQLState, vendorCode); - } - - public static SQLException newSQLInvalidAuthorizationSpecException(String reason, String SQLState, int vendorCode) { - return new SQLInvalidAuthorizationSpecException(reason, SQLState, vendorCode); - } - - public static SQLException newSQLNonTransientConnectionException(String reason, String SQLState, int vendorCode) { - return new SQLNonTransientConnectionException(reason, SQLState, vendorCode); - } - - public static SQLException newSQLSyntaxErrorException(String reason, String SQLState, int vendorCode) { - return new SQLSyntaxErrorException(reason, SQLState, vendorCode); - } - - public static SQLException newSQLTransactionRollbackException(String reason, String SQLState, int vendorCode) { - return new SQLTransactionRollbackException(reason, SQLState, vendorCode); - } - - public static SQLException newSQLTransientConnectionException(String reason, String SQLState, int vendorCode) { - return new SQLTransientConnectionException(reason, SQLState, vendorCode); - } - - public static SQLException newSQLTimeoutException(String reason, String SQLState, int vendorCode) { - return new SQLTimeoutException(reason, SQLState, vendorCode); - } - - public static SQLException newSQLRecoverableException(String reason, String SQLState, int vendorCode) { - return new SQLRecoverableException(reason, SQLState, vendorCode); - } - -}