From f2e9abf699dd0a919502d40b7755267ac9c03667 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Tue, 16 Dec 2008 22:55:07 +0000 Subject: [PATCH] moved jca.* unit tests from .testsuite -> .transaction --- org.springframework.transaction/.classpath | 1 + org.springframework.transaction/ivy.xml | 2 + .../jca/cci/CciLocalTransactionTests.java | 0 .../jca/cci/CciTemplateTests.java | 0 .../jca/cci/EisOperationTests.java | 0 .../LocalConnectionFactoryBeanTests.java | 46 +++++++++---------- 6 files changed, 24 insertions(+), 25 deletions(-) rename {org.springframework.testsuite => org.springframework.transaction}/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java (100%) rename {org.springframework.testsuite => org.springframework.transaction}/src/test/java/org/springframework/jca/cci/CciTemplateTests.java (100%) rename {org.springframework.testsuite => org.springframework.transaction}/src/test/java/org/springframework/jca/cci/EisOperationTests.java (100%) rename {org.springframework.testsuite => org.springframework.transaction}/src/test/java/org/springframework/jca/support/LocalConnectionFactoryBeanTests.java (57%) diff --git a/org.springframework.transaction/.classpath b/org.springframework.transaction/.classpath index 6aab36e5ac..347a3f42f6 100644 --- a/org.springframework.transaction/.classpath +++ b/org.springframework.transaction/.classpath @@ -14,6 +14,7 @@ + diff --git a/org.springframework.transaction/ivy.xml b/org.springframework.transaction/ivy.xml index a7a704242a..660e7df33a 100644 --- a/org.springframework.transaction/ivy.xml +++ b/org.springframework.transaction/ivy.xml @@ -35,6 +35,8 @@ + + diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java b/org.springframework.transaction/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java rename to org.springframework.transaction/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jca/cci/CciTemplateTests.java b/org.springframework.transaction/src/test/java/org/springframework/jca/cci/CciTemplateTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jca/cci/CciTemplateTests.java rename to org.springframework.transaction/src/test/java/org/springframework/jca/cci/CciTemplateTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jca/cci/EisOperationTests.java b/org.springframework.transaction/src/test/java/org/springframework/jca/cci/EisOperationTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jca/cci/EisOperationTests.java rename to org.springframework.transaction/src/test/java/org/springframework/jca/cci/EisOperationTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jca/support/LocalConnectionFactoryBeanTests.java b/org.springframework.transaction/src/test/java/org/springframework/jca/support/LocalConnectionFactoryBeanTests.java similarity index 57% rename from org.springframework.testsuite/src/test/java/org/springframework/jca/support/LocalConnectionFactoryBeanTests.java rename to org.springframework.transaction/src/test/java/org/springframework/jca/support/LocalConnectionFactoryBeanTests.java index b988bed10f..e79b0779a2 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/jca/support/LocalConnectionFactoryBeanTests.java +++ b/org.springframework.transaction/src/test/java/org/springframework/jca/support/LocalConnectionFactoryBeanTests.java @@ -16,77 +16,73 @@ package org.springframework.jca.support; -import junit.framework.TestCase; -import org.easymock.MockControl; -import org.springframework.test.AssertThrows; +import static org.easymock.EasyMock.*; +import static org.junit.Assert.*; import javax.resource.spi.ConnectionManager; import javax.resource.spi.ManagedConnectionFactory; +import org.junit.Test; + /** * Unit tests for the {@link LocalConnectionFactoryBean} class. * * @author Rick Evans + * @author Chris Beams */ -public final class LocalConnectionFactoryBeanTests extends TestCase { +public final class LocalConnectionFactoryBeanTests { + @Test(expected=IllegalArgumentException.class) public void testManagedConnectionFactoryIsRequired() throws Exception { - new AssertThrows(IllegalArgumentException.class) { - public void test() throws Exception { - new LocalConnectionFactoryBean().afterPropertiesSet(); - } - }.runTest(); + new LocalConnectionFactoryBean().afterPropertiesSet(); } + @Test public void testIsSingleton() throws Exception { LocalConnectionFactoryBean factory = new LocalConnectionFactoryBean(); assertTrue(factory.isSingleton()); } + @Test public void testGetObjectTypeIsNullIfConnectionFactoryHasNotBeenConfigured() throws Exception { LocalConnectionFactoryBean factory = new LocalConnectionFactoryBean(); assertNull(factory.getObjectType()); } + @Test public void testCreatesVanillaConnectionFactoryIfNoConnectionManagerHasBeenConfigured() throws Exception { final Object CONNECTION_FACTORY = new Object(); - MockControl mockManagedConnectionFactory = MockControl.createControl(ManagedConnectionFactory.class); - ManagedConnectionFactory managedConnectionFactory = (ManagedConnectionFactory) mockManagedConnectionFactory.getMock(); + ManagedConnectionFactory managedConnectionFactory = createMock(ManagedConnectionFactory.class); - managedConnectionFactory.createConnectionFactory(); - mockManagedConnectionFactory.setReturnValue(CONNECTION_FACTORY); - mockManagedConnectionFactory.replay(); + expect(managedConnectionFactory.createConnectionFactory()).andReturn(CONNECTION_FACTORY); + replay(managedConnectionFactory); LocalConnectionFactoryBean factory = new LocalConnectionFactoryBean(); factory.setManagedConnectionFactory(managedConnectionFactory); factory.afterPropertiesSet(); assertEquals(CONNECTION_FACTORY, factory.getObject()); - mockManagedConnectionFactory.verify(); + verify(managedConnectionFactory); } + @Test public void testCreatesManagedConnectionFactoryIfAConnectionManagerHasBeenConfigured() throws Exception { - MockControl mockManagedConnectionFactory = MockControl.createControl(ManagedConnectionFactory.class); - ManagedConnectionFactory managedConnectionFactory = (ManagedConnectionFactory) mockManagedConnectionFactory.getMock(); + ManagedConnectionFactory managedConnectionFactory = createMock(ManagedConnectionFactory.class); - MockControl mockConnectionManager = MockControl.createControl(ConnectionManager.class); - ConnectionManager connectionManager = (ConnectionManager) mockConnectionManager.getMock(); + ConnectionManager connectionManager = createMock(ConnectionManager.class); - managedConnectionFactory.createConnectionFactory(connectionManager); - mockManagedConnectionFactory.setReturnValue(null); + expect(managedConnectionFactory.createConnectionFactory(connectionManager)).andReturn(null); - mockConnectionManager.replay(); - mockManagedConnectionFactory.replay(); + replay(connectionManager, managedConnectionFactory); LocalConnectionFactoryBean factory = new LocalConnectionFactoryBean(); factory.setManagedConnectionFactory(managedConnectionFactory); factory.setConnectionManager(connectionManager); factory.afterPropertiesSet(); - mockManagedConnectionFactory.verify(); - mockConnectionManager.verify(); + verify(connectionManager, managedConnectionFactory); } }