[SPR-5895] Upgraded to EasyMock 2.5.1.

org.springframework.transaction/.classpath

@@ -14,7 +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.easymock/com.springsource.org.easymock/2.5.1/com.springsource.org.easymock-2.5.1.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.5.1/com.springsource.org.easymock-sources-2.5.1.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-4.6.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.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="var" path="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.2.RELEASE/com.springsource.org.aspectj.weaver-1.6.2.RELEASE.jar" sourcepath="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.2.RELEASE/com.springsource.org.aspectj.weaver-sources-1.6.2.RELEASE.jar"/>

org.springframework.transaction/ivy.xml

@@ -35,7 +35,7 @@
 		<!-- test dependencies -->
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.6.0" conf="test->runtime"/>
 		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.3.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" rev="2.5.1" 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"/>

org.springframework.transaction/src/test/java/org/springframework/jca/cci/CciTemplateTests.java

@@ -16,8 +16,13 @@
 
 package org.springframework.jca.cci;
 
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.*;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import java.sql.SQLException;
 
@@ -58,7 +63,8 @@ public class CciTemplateTests {
 
 		expect(connectionFactory.getRecordFactory()).andReturn(recordFactory);
 
-		expect(recordFactory.createIndexedRecord("name")).andReturn(indexedRecord);
+		expect(recordFactory.createIndexedRecord("name")).andReturn(
+				indexedRecord);
 
 		replay(connectionFactory, recordFactory);
 
@@ -76,7 +82,8 @@ public class CciTemplateTests {
 
 		expect(connectionFactory.getRecordFactory()).andReturn(recordFactory);
 
-		expect(recordFactory.createMappedRecord("name")).andReturn(mappedRecord);
+		expect(recordFactory.createMappedRecord("name"))
+				.andReturn(mappedRecord);
 
 		replay(connectionFactory, recordFactory);
 
@@ -101,7 +108,8 @@ public class CciTemplateTests {
 
 		expect(connection.createInteraction()).andReturn(interaction);
 
-		expect(interaction.execute(interactionSpec, inputRecord, outputRecord)).andReturn(true);
+		expect(interaction.execute(interactionSpec, inputRecord, outputRecord))
+				.andReturn(true);
 
 		interaction.close();
 
@@ -116,7 +124,8 @@ public class CciTemplateTests {
 	}
 
 	@Test
-	public void testTemplateExecuteWithCreatorAndRecordFactoryNotSupported() throws ResourceException {
+	public void testTemplateExecuteWithCreatorAndRecordFactoryNotSupported()
+			throws ResourceException {
 		ConnectionFactory connectionFactory = createMock(ConnectionFactory.class);
 		Connection connection = createMock(Connection.class);
 		Interaction interaction = createMock(Interaction.class);
@@ -128,11 +137,13 @@ public class CciTemplateTests {
 
 		expect(connectionFactory.getConnection()).andReturn(connection);
 
-		expect(connectionFactory.getRecordFactory()).andThrow(new NotSupportedException("not supported"));
+		expect(connectionFactory.getRecordFactory()).andThrow(
+				new NotSupportedException("not supported"));
 
 		expect(connection.createInteraction()).andReturn(interaction);
 
-		expect(interaction.execute(interactionSpec, inputRecord, outputRecord)).andReturn(true);
+		expect(interaction.execute(interactionSpec, inputRecord, outputRecord))
+				.andReturn(true);
 
 		interaction.close();
 
@@ -151,9 +162,10 @@ public class CciTemplateTests {
 
 		verify(connectionFactory, connection, interaction);
 	}
-	
+
 	@Test
-	public void testTemplateExecuteInputTrueWithCreator2() throws ResourceException {
+	public void testTemplateExecuteInputTrueWithCreator2()
+			throws ResourceException {
 		ConnectionFactory connectionFactory = createMock(ConnectionFactory.class);
 		RecordFactory recordFactory = createMock(RecordFactory.class);
 		Connection connection = createMock(Connection.class);
@@ -173,7 +185,8 @@ public class CciTemplateTests {
 
 		expect(creator.createRecord(recordFactory)).andReturn(outputRecord);
 
-		expect(interaction.execute(interactionSpec, inputRecord, outputRecord)).andReturn(true);
+		expect(interaction.execute(interactionSpec, inputRecord, outputRecord))
+				.andReturn(true);
 
 		interaction.close();
 
@@ -203,7 +216,8 @@ public class CciTemplateTests {
 
 		expect(connection.createInteraction()).andReturn(interaction);
 
-		expect(interaction.execute(interactionSpec, inputRecord)).andReturn(outputRecord);
+		expect(interaction.execute(interactionSpec, inputRecord)).andReturn(
+				outputRecord);
 
 		interaction.close();
 
@@ -217,13 +231,15 @@ public class CciTemplateTests {
 		verify(connectionFactory, connection, interaction);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Test
-	public void testTemplateExecuteInputExtractorTrueWithCreator() throws ResourceException, SQLException {
+	public void testTemplateExecuteInputExtractorTrueWithCreator()
+			throws ResourceException, SQLException {
 		ConnectionFactory connectionFactory = createMock(ConnectionFactory.class);
 		RecordFactory recordFactory = createMock(RecordFactory.class);
 		Connection connection = createMock(Connection.class);
 		Interaction interaction = createMock(Interaction.class);
-		RecordExtractor<?> extractor = createMock(RecordExtractor.class);
+		RecordExtractor<Object> extractor = createMock(RecordExtractor.class);
 		RecordCreator creator = createMock(RecordCreator.class);
 
 		Record inputRecord = createMock(Record.class);
@@ -239,7 +255,8 @@ public class CciTemplateTests {
 
 		expect(creator.createRecord(recordFactory)).andReturn(outputRecord);
 
-		expect(interaction.execute(interactionSpec, inputRecord, outputRecord)).andReturn(true);
+		expect(interaction.execute(interactionSpec, inputRecord, outputRecord))
+				.andReturn(true);
 
 		expect(extractor.extractData(outputRecord)).andStubReturn(new Object());
 
@@ -256,12 +273,14 @@ public class CciTemplateTests {
 		verify(connectionFactory, connection, interaction, extractor, creator);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Test
-	public void testTemplateExecuteInputExtractorFalse() throws ResourceException, SQLException {
+	public void testTemplateExecuteInputExtractorFalse()
+			throws ResourceException, SQLException {
 		ConnectionFactory connectionFactory = createMock(ConnectionFactory.class);
 		Connection connection = createMock(Connection.class);
 		Interaction interaction = createMock(Interaction.class);
-		RecordExtractor<?> extractor = createMock(RecordExtractor.class);
+		RecordExtractor<Object> extractor = createMock(RecordExtractor.class);
 
 		Record inputRecord = createMock(Record.class);
 		Record outputRecord = createMock(Record.class);
@@ -272,7 +291,8 @@ public class CciTemplateTests {
 
 		expect(connection.createInteraction()).andReturn(interaction);
 
-		expect(interaction.execute(interactionSpec, inputRecord)).andReturn(outputRecord);
+		expect(interaction.execute(interactionSpec, inputRecord)).andReturn(
+				outputRecord);
 
 		expect(extractor.extractData(outputRecord)).andStubReturn(new Object());
 
@@ -289,7 +309,8 @@ public class CciTemplateTests {
 	}
 
 	@Test
-	public void testTemplateExecuteInputGeneratorTrueWithCreator() throws ResourceException {
+	public void testTemplateExecuteInputGeneratorTrueWithCreator()
+			throws ResourceException {
 		ConnectionFactory connectionFactory = createMock(ConnectionFactory.class);
 		RecordFactory recordFactory = createMock(RecordFactory.class);
 		Connection connection = createMock(Connection.class);
@@ -314,7 +335,8 @@ public class CciTemplateTests {
 
 		expect(connectionFactory.getRecordFactory()).andReturn(recordFactory);
 
-		expect(interaction.execute(interactionSpec, inputRecord, outputRecord)).andReturn(true);
+		expect(interaction.execute(interactionSpec, inputRecord, outputRecord))
+				.andReturn(true);
 
 		interaction.close();
 
@@ -328,9 +350,10 @@ public class CciTemplateTests {
 
 		verify(connectionFactory, connection, interaction, generator, creator);
 	}
-	
+
 	@Test
-	public void testTemplateExecuteInputGeneratorFalse() throws ResourceException {
+	public void testTemplateExecuteInputGeneratorFalse()
+			throws ResourceException {
 		ConnectionFactory connectionFactory = createMock(ConnectionFactory.class);
 		RecordFactory recordFactory = createMock(RecordFactory.class);
 		Connection connection = createMock(Connection.class);
@@ -343,14 +366,15 @@ public class CciTemplateTests {
 		InteractionSpec interactionSpec = createMock(InteractionSpec.class);
 
 		expect(connectionFactory.getRecordFactory()).andReturn(recordFactory);
-		
+
 		expect(connectionFactory.getConnection()).andReturn(connection);
 
 		expect(connection.createInteraction()).andReturn(interaction);
 
 		expect(generator.createRecord(recordFactory)).andReturn(inputRecord);
 
-		expect(interaction.execute(interactionSpec, inputRecord)).andReturn(outputRecord);
+		expect(interaction.execute(interactionSpec, inputRecord)).andReturn(
+				outputRecord);
 
 		interaction.close();
 
@@ -364,21 +388,23 @@ public class CciTemplateTests {
 		verify(connectionFactory, connection, interaction, generator);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Test
-	public void testTemplateExecuteInputGeneratorExtractorTrueWithCreator() throws ResourceException, SQLException {
+	public void testTemplateExecuteInputGeneratorExtractorTrueWithCreator()
+			throws ResourceException, SQLException {
 		ConnectionFactory connectionFactory = createMock(ConnectionFactory.class);
 		RecordFactory recordFactory = createMock(RecordFactory.class);
 		Connection connection = createMock(Connection.class);
 		Interaction interaction = createMock(Interaction.class);
 		RecordCreator generator = createMock(RecordCreator.class);
-		RecordExtractor<?> extractor = createMock(RecordExtractor.class);
+		RecordExtractor<Object> extractor = createMock(RecordExtractor.class);
 		RecordCreator creator = createMock(RecordCreator.class);
 
 		Record inputRecord = createMock(Record.class);
 		Record outputRecord = createMock(Record.class);
-		
+
 		Object obj = new Object();
-		
+
 		InteractionSpec interactionSpec = createMock(InteractionSpec.class);
 
 		expect(connectionFactory.getRecordFactory()).andReturn(recordFactory);
@@ -393,7 +419,8 @@ public class CciTemplateTests {
 
 		expect(generator.createRecord(recordFactory)).andReturn(inputRecord);
 
-		expect(interaction.execute(interactionSpec, inputRecord, outputRecord)).andReturn(true);
+		expect(interaction.execute(interactionSpec, inputRecord, outputRecord))
+				.andReturn(true);
 
 		expect(extractor.extractData(outputRecord)).andStubReturn(obj);
 
@@ -401,27 +428,31 @@ public class CciTemplateTests {
 
 		connection.close();
 
-		replay(connectionFactory, connection, interaction, generator, creator, extractor);
+		replay(connectionFactory, connection, interaction, generator, creator,
+				extractor);
 
 		CciTemplate ct = new CciTemplate(connectionFactory);
 		ct.setOutputRecordCreator(creator);
 		assertEquals(obj, ct.execute(interactionSpec, generator, extractor));
 
-		verify(connectionFactory, connection, interaction, generator, creator, extractor);
+		verify(connectionFactory, connection, interaction, generator, creator,
+				extractor);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Test
-	public void testTemplateExecuteInputGeneratorExtractorFalse() throws ResourceException, SQLException {
+	public void testTemplateExecuteInputGeneratorExtractorFalse()
+			throws ResourceException, SQLException {
 		ConnectionFactory connectionFactory = createMock(ConnectionFactory.class);
 		RecordFactory recordFactory = createMock(RecordFactory.class);
 		Connection connection = createMock(Connection.class);
 		Interaction interaction = createMock(Interaction.class);
 		RecordCreator generator = createMock(RecordCreator.class);
-		RecordExtractor<?> extractor = createMock(RecordExtractor.class);
+		RecordExtractor<Object> extractor = createMock(RecordExtractor.class);
 
 		Record inputRecord = createMock(Record.class);
 		Record outputRecord = createMock(Record.class);
-		
+
 		InteractionSpec interactionSpec = createMock(InteractionSpec.class);
 
 		expect(connectionFactory.getRecordFactory()).andReturn(recordFactory);
@@ -432,7 +463,8 @@ public class CciTemplateTests {
 
 		expect(generator.createRecord(recordFactory)).andReturn(inputRecord);
 
-		expect(interaction.execute(interactionSpec, inputRecord)).andReturn(outputRecord);
+		expect(interaction.execute(interactionSpec, inputRecord)).andReturn(
+				outputRecord);
 
 		expect(extractor.extractData(outputRecord)).andStubReturn(new Object());
 
@@ -449,7 +481,8 @@ public class CciTemplateTests {
 	}
 
 	@Test
-	public void testTemplateExecuteInputOutputConnectionSpec() throws ResourceException {
+	public void testTemplateExecuteInputOutputConnectionSpec()
+			throws ResourceException {
 		ConnectionFactory connectionFactory = createMock(ConnectionFactory.class);
 		ConnectionSpec connectionSpec = createMock(ConnectionSpec.class);
 		Connection connection = createMock(Connection.class);
@@ -457,15 +490,16 @@ public class CciTemplateTests {
 
 		Record inputRecord = createMock(Record.class);
 		Record outputRecord = createMock(Record.class);
-		
-		InteractionSpec interactionSpec = createMock(InteractionSpec.class);
-		
 
-		expect(connectionFactory.getConnection(connectionSpec)).andReturn(connection);
+		InteractionSpec interactionSpec = createMock(InteractionSpec.class);
+
+		expect(connectionFactory.getConnection(connectionSpec)).andReturn(
+				connection);
 
 		expect(connection.createInteraction()).andReturn(interaction);
 
-		expect(interaction.execute(interactionSpec, inputRecord, outputRecord)).andReturn(true);
+		expect(interaction.execute(interactionSpec, inputRecord, outputRecord))
+				.andReturn(true);
 
 		interaction.close();
 
@@ -482,8 +516,10 @@ public class CciTemplateTests {
 		verify(connectionFactory, connection, interaction);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Test
-	public void testTemplateExecuteInputOutputResultsSetFalse() throws ResourceException, SQLException {
+	public void testTemplateExecuteInputOutputResultsSetFalse()
+			throws ResourceException, SQLException {
 		ConnectionFactory connectionFactory = createMock(ConnectionFactory.class);
 		RecordFactory recordFactory = createMock(RecordFactory.class);
 		Connection connection = createMock(Connection.class);
@@ -491,7 +527,7 @@ public class CciTemplateTests {
 		Record record = createMock(Record.class);
 		ResultSet resultset = createMock(ResultSet.class);
 		RecordCreator generator = createMock(RecordCreator.class);
-		RecordExtractor<?> extractor = createMock(RecordExtractor.class);
+		RecordExtractor<Object> extractor = createMock(RecordExtractor.class);
 
 		InteractionSpec interactionSpec = createMock(InteractionSpec.class);
 
@@ -503,7 +539,8 @@ public class CciTemplateTests {
 
 		expect(generator.createRecord(recordFactory)).andReturn(record);
 
-		expect(interaction.execute(interactionSpec, record)).andReturn(resultset);
+		expect(interaction.execute(interactionSpec, record)).andReturn(
+				resultset);
 
 		expect(extractor.extractData(resultset)).andStubReturn(new Object());
 
@@ -513,23 +550,28 @@ public class CciTemplateTests {
 
 		connection.close();
 
-		replay(connectionFactory, connection, interaction, generator, extractor, resultset);
+		replay(connectionFactory, connection, interaction, generator,
+				extractor, resultset);
 
 		CciTemplate ct = new CciTemplate(connectionFactory);
 		ct.execute(interactionSpec, generator, extractor);
 
-		verify(connectionFactory, connection, interaction, generator, extractor, resultset);
+		verify(connectionFactory, connection, interaction, generator,
+				extractor, resultset);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Test
-	public void testTemplateExecuteConnectionCallback() throws ResourceException, SQLException {
+	public void testTemplateExecuteConnectionCallback()
+			throws ResourceException, SQLException {
 		ConnectionFactory connectionFactory = createMock(ConnectionFactory.class);
 		Connection connection = createMock(Connection.class);
-		ConnectionCallback<?> connectionCallback = createMock(ConnectionCallback.class);
+		ConnectionCallback<Object> connectionCallback = createMock(ConnectionCallback.class);
 
 		expect(connectionFactory.getConnection()).andReturn(connection);
 
-		expect(connectionCallback.doInConnection(connection, connectionFactory)).andStubReturn(new Object());
+		expect(connectionCallback.doInConnection(connection, connectionFactory))
+				.andStubReturn(new Object());
 
 		connection.close();
 
@@ -541,18 +583,22 @@ public class CciTemplateTests {
 		verify(connectionFactory, connection, connectionCallback);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Test
-	public void testTemplateExecuteInteractionCallback() throws ResourceException, SQLException {
+	public void testTemplateExecuteInteractionCallback()
+			throws ResourceException, SQLException {
 		ConnectionFactory connectionFactory = createMock(ConnectionFactory.class);
 		Connection connection = createMock(Connection.class);
 		Interaction interaction = createMock(Interaction.class);
-		InteractionCallback<?> interactionCallback = createMock(InteractionCallback.class);
+		InteractionCallback<Object> interactionCallback = createMock(InteractionCallback.class);
 
 		expect(connectionFactory.getConnection()).andReturn(connection);
 
 		expect(connection.createInteraction()).andReturn(interaction);
 
-		expect(interactionCallback.doInInteraction(interaction, connectionFactory)).andStubReturn(new Object());
+		expect(
+				interactionCallback.doInInteraction(interaction,
+						connectionFactory)).andStubReturn(new Object());
 
 		interaction.close();
 
@@ -567,7 +613,8 @@ public class CciTemplateTests {
 	}
 
 	@Test
-	public void testTemplateExecuteInputTrueTrueWithCreator() throws ResourceException {
+	public void testTemplateExecuteInputTrueTrueWithCreator()
+			throws ResourceException {
 		ConnectionFactory connectionFactory = createMock(ConnectionFactory.class);
 		Connection connection = createMock(Connection.class);
 		Interaction interaction = createMock(Interaction.class);
@@ -581,7 +628,9 @@ public class CciTemplateTests {
 
 		expect(connection.createInteraction()).andReturn(interaction);
 
-		expect(interaction.execute(interactionSpec, inputOutputRecord, inputOutputRecord)).andReturn(true);
+		expect(
+				interaction.execute(interactionSpec, inputOutputRecord,
+						inputOutputRecord)).andReturn(true);
 
 		interaction.close();
 
@@ -610,10 +659,12 @@ public class CciTemplateTests {
 
 		expect(connection.createInteraction()).andReturn(interaction);
 
-		expect(interaction.execute(interactionSpec, inputOutputRecord, inputOutputRecord)).andReturn(true);
+		expect(
+				interaction.execute(interactionSpec, inputOutputRecord,
+						inputOutputRecord)).andReturn(true);
 
 		interaction.close();
-		
+
 		connection.close();
 
 		replay(connectionFactory, connection, interaction);
@@ -638,7 +689,8 @@ public class CciTemplateTests {
 
 		expect(connection.createInteraction()).andReturn(interaction);
 
-		expect(interaction.execute(interactionSpec, inputOutputRecord)).andReturn(null);
+		expect(interaction.execute(interactionSpec, inputOutputRecord))
+				.andReturn(null);
 
 		interaction.close();
 
@@ -647,7 +699,8 @@ public class CciTemplateTests {
 		replay(connectionFactory, connection, interaction);
 
 		CciTemplate ct = new CciTemplate(connectionFactory);
-		Record tmpOutputRecord = (Record) ct.execute(interactionSpec, inputOutputRecord);
+		Record tmpOutputRecord = (Record) ct.execute(interactionSpec,
+				inputOutputRecord);
 		assertNull(tmpOutputRecord);
 
 		verify(connectionFactory, connection, interaction);

org.springframework.transaction/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * Copyright 2002-2009 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.
@@ -16,11 +16,12 @@
 
 package org.springframework.transaction.support;
 
+import static org.easymock.EasyMock.createMock;
+
 import javax.transaction.TransactionManager;
 import javax.transaction.UserTransaction;
 
 import junit.framework.TestCase;
-import org.easymock.MockControl;
 
 import org.springframework.mock.jndi.SimpleNamingContextBuilder;
 import org.springframework.transaction.jta.JtaTransactionManager;
@@ -32,28 +33,29 @@ import org.springframework.util.SerializationTestUtils;
 public class JtaTransactionManagerSerializationTests extends TestCase {
 
 	public void testSerializable() throws Exception {
-		MockControl utMock = MockControl.createControl(UserTransaction.class);
-		UserTransaction ut = (UserTransaction) utMock.getMock();
-		MockControl ut2Mock = MockControl.createControl(UserTransaction.class);
-		UserTransaction ut2 = (UserTransaction) ut2Mock.getMock();
-		MockControl tmMock = MockControl.createControl(TransactionManager.class);
-		TransactionManager tm = (TransactionManager) tmMock.getMock();
+		UserTransaction ut1 = createMock(UserTransaction.class);
+		UserTransaction ut2 = createMock(UserTransaction.class);
+		TransactionManager tm = createMock(TransactionManager.class);
 
 		JtaTransactionManager jtam = new JtaTransactionManager();
-		jtam.setUserTransaction(ut);
+		jtam.setUserTransaction(ut1);
 		jtam.setTransactionManager(tm);
 		jtam.setRollbackOnCommitFailure(true);
 		jtam.afterPropertiesSet();
 
-		SimpleNamingContextBuilder jndiEnv = SimpleNamingContextBuilder.emptyActivatedContextBuilder();
+		SimpleNamingContextBuilder jndiEnv = SimpleNamingContextBuilder
+				.emptyActivatedContextBuilder();
 		jndiEnv.bind(JtaTransactionManager.DEFAULT_USER_TRANSACTION_NAME, ut2);
-		JtaTransactionManager serializedJtatm =
-				(JtaTransactionManager) SerializationTestUtils.serializeAndDeserialize(jtam);
-		
+		JtaTransactionManager serializedJtatm = (JtaTransactionManager) SerializationTestUtils
+				.serializeAndDeserialize(jtam);
+
 		// should do client-side lookup
-		assertNotNull("Logger must survive serialization", serializedJtatm.logger);
-		assertTrue("UserTransaction looked up on client", serializedJtatm.getUserTransaction() == ut2);
-		assertNull("TransactionManager didn't survive", serializedJtatm.getTransactionManager());
+		assertNotNull("Logger must survive serialization",
+				serializedJtatm.logger);
+		assertTrue("UserTransaction looked up on client", serializedJtatm
+				.getUserTransaction() == ut2);
+		assertNull("TransactionManager didn't survive", serializedJtatm
+				.getTransactionManager());
 		assertEquals(true, serializedJtatm.isRollbackOnCommitFailure());
 	}
 

org.springframework.transaction/transaction.iml

@@ -126,11 +126,11 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$IVY_CACHE$/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.easymock/com.springsource.org.easymock/2.5.1/com.springsource.org.easymock-2.5.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$IVY_CACHE$/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.easymock/com.springsource.org.easymock/2.5.1/com.springsource.org.easymock-sources-2.5.1.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>