root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

moved jca.* unit tests from .testsuite -> .transaction

This commit is contained in:
Chris Beams 2008-12-16 22:55:07 +00:00
parent 6285e61435
commit f2e9abf699
6 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
org.springframework.transaction/.classpath
View File

@ -14,6 +14,7 @@
<classpathentry kind="var" path="IVY_CACHE/com.ibm.websphere/com.springsource.com.ibm.websphere.uow/6.0.2.17/com.springsource.com.ibm.websphere.uow-6.0.2.17.jar"/>
<classpathentry kind="var" path="IVY_CACHE/javax.ejb/com.springsource.javax.ejb/3.0.0/com.springsource.javax.ejb-3.0.0.jar" sourcepath="/IVY_CACHE/javax.ejb/com.springsource.javax.ejb/3.0.0/com.springsource.javax.ejb-sources-3.0.0.jar"/>
<classpathentry kind="var" path="IVY_CACHE/javax.resource/com.springsource.javax.resource/1.5.0/com.springsource.javax.resource-1.5.0.jar" sourcepath="/IVY_CACHE/javax.resource/com.springsource.javax.resource/1.5.0/com.springsource.javax.resource-sources-1.5.0.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.5.0/com.springsource.org.junit-4.5.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.5.0/com.springsource.org.junit-sources-4.5.0.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="/IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-sources-1.0.0.jar"/>
<classpathentry kind="output" path="target/classes"/>

2
org.springframework.transaction/ivy.xml
View File

@ -35,6 +35,8 @@
<!-- test dependencies -->
<dependency org="org.junit" name="com.springsource.org.junit" rev="4.5.0" conf="test->runtime"/>
<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.2.RELEASE" conf="test->compile"/>
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.3.0" conf="test->compile"/>
<dependency org="org.easymock" name="com.springsource.org.easymock.classextension" rev="2.3.0" conf="test->compile"/>
<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="test->compile"/>
<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.1.3" conf="test->compile"/>
</dependencies>

0
org.springframework.testsuite/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java → org.springframework.transaction/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java
View File

0
org.springframework.testsuite/src/test/java/org/springframework/jca/cci/CciTemplateTests.java → org.springframework.transaction/src/test/java/org/springframework/jca/cci/CciTemplateTests.java
View File

0
org.springframework.testsuite/src/test/java/org/springframework/jca/cci/EisOperationTests.java → org.springframework.transaction/src/test/java/org/springframework/jca/cci/EisOperationTests.java
View File

46
org.springframework.testsuite/src/test/java/org/springframework/jca/support/LocalConnectionFactoryBeanTests.java → org.springframework.transaction/src/test/java/org/springframework/jca/support/LocalConnectionFactoryBeanTests.java
View File

@ -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);
}
}