Merge branch 'SPR-10126' into cleanup-3.2.x

* SPR-10126:
  Replace EasyMock with Mockito in spring-orm

build.gradle

@@ -71,7 +71,7 @@ configure(allprojects) { project ->
 		testCompile("junit:junit:${junitVersion}")
 		testCompile("org.hamcrest:hamcrest-all:1.3")
 		testCompile("org.mockito:mockito-core:1.9.5")
-		if (project.name in ["spring", "spring-jms", "spring-orm",
+		if (project.name in ["spring", "spring-jms",
 				"spring-orm-hibernate4", "spring-oxm", "spring-struts",
 				"spring-test", "spring-test-mvc", "spring-tx", "spring-web",
 				"spring-webmvc", "spring-webmvc-portlet", "spring-webmvc-tiles3"]) {

spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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,389 +16,293 @@
 
 package org.springframework.orm.hibernate3;
 
-import java.lang.reflect.AccessibleObject;
+import static org.junit.Assert.assertEquals;
-import java.lang.reflect.Method;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.BDDMockito.willThrow;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
 import java.sql.SQLException;
 
-import junit.framework.TestCase;
-import org.aopalliance.intercept.Interceptor;
-import org.aopalliance.intercept.Invocation;
 import org.aopalliance.intercept.MethodInvocation;
-import org.easymock.MockControl;
 import org.hibernate.FlushMode;
 import org.hibernate.HibernateException;
 import org.hibernate.SessionFactory;
 import org.hibernate.classic.Session;
 import org.hibernate.exception.ConstraintViolationException;
-
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.InOrder;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 /**
  * @author Juergen Hoeller
+ * @author Phillip Webb
  * @since 05.03.2005
  */
-public class HibernateInterceptorTests extends TestCase {
+public class HibernateInterceptorTests {
 
+	private SessionFactory sessionFactory;
+	private Session session;
+	private MethodInvocation invocation;
+
+	@Before
+	public void setUp() throws Throwable {
+		this.sessionFactory = mock(SessionFactory.class);
+		this.session = mock(Session.class);
+		this.invocation = mock(MethodInvocation.class);
+		given(sessionFactory.openSession()).willReturn(session);
+		given(session.getSessionFactory()).willReturn(sessionFactory);
+		given(invocation.proceed()).willAnswer(new Answer<Object>() {
+			@Override
+			public Object answer(InvocationOnMock invocation) throws Throwable {
+				if (!TransactionSynchronizationManager.hasResource(sessionFactory)) {
+					throw new IllegalStateException("Session not bound");
+				}
+				return null;
+			}
+		});
+	}
+
+	@After
+	public void tearDown() {
+		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
+		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
+	}
+
+	@Test
 	public void testInterceptorWithNewSession() throws HibernateException {
-		MockControl sfControl = MockControl.createControl(SessionFactory.class);
-		SessionFactory sf = (SessionFactory) sfControl.getMock();
-		MockControl sessionControl = MockControl.createControl(Session.class);
-		Session session = (Session) sessionControl.getMock();
-		sf.openSession();
-		sfControl.setReturnValue(session, 1);
-		session.getSessionFactory();
-		sessionControl.setReturnValue(sf);
-		session.flush();
-		sessionControl.setVoidCallable(1);
-		session.close();
-		sessionControl.setReturnValue(null, 1);
-		sfControl.replay();
-		sessionControl.replay();
-
 		HibernateInterceptor interceptor = new HibernateInterceptor();
-		interceptor.setSessionFactory(sf);
+		interceptor.setSessionFactory(sessionFactory);
 		try {
-			interceptor.invoke(new TestInvocation(sf));
+			interceptor.invoke(invocation);
 		}
 		catch (Throwable t) {
 			fail("Should not have thrown Throwable: " + t.getMessage());
 		}
 
-		sfControl.verify();
+		verify(session).flush();
-		sessionControl.verify();
+		verify(session).close();
 	}
 
+	@Test
 	public void testInterceptorWithNewSessionAndFlushNever() throws HibernateException {
-		MockControl sfControl = MockControl.createControl(SessionFactory.class);
-		SessionFactory sf = (SessionFactory) sfControl.getMock();
-		MockControl sessionControl = MockControl.createControl(Session.class);
-		Session session = (Session) sessionControl.getMock();
-		sf.openSession();
-		sfControl.setReturnValue(session, 1);
-		session.getSessionFactory();
-		sessionControl.setReturnValue(sf);
-		session.setFlushMode(FlushMode.MANUAL);
-		sessionControl.setVoidCallable(1);
-		session.close();
-			sessionControl.setReturnValue(null, 1);
-		sfControl.replay();
-		sessionControl.replay();
-
 		HibernateInterceptor interceptor = new HibernateInterceptor();
 		interceptor.setFlushModeName("FLUSH_NEVER");
-		interceptor.setSessionFactory(sf);
+		interceptor.setSessionFactory(sessionFactory);
 		try {
-			interceptor.invoke(new TestInvocation(sf));
+			interceptor.invoke(invocation);
 		}
 		catch (Throwable t) {
 			fail("Should not have thrown Throwable: " + t.getMessage());
 		}
-
+		verify(session).setFlushMode(FlushMode.MANUAL);
-		sfControl.verify();
+		verify(session, never()).flush();
-		sessionControl.verify();
+		verify(session).close();
 	}
 
+	@Test
 	public void testInterceptorWithNewSessionAndFilter() throws HibernateException {
-		MockControl sfControl = MockControl.createControl(SessionFactory.class);
-		SessionFactory sf = (SessionFactory) sfControl.getMock();
-		MockControl sessionControl = MockControl.createControl(Session.class);
-		Session session = (Session) sessionControl.getMock();
-		sf.openSession();
-		sfControl.setReturnValue(session, 1);
-		session.getSessionFactory();
-		sessionControl.setReturnValue(sf);
-		session.enableFilter("myFilter");
-		sessionControl.setReturnValue(null, 1);
-		session.flush();
-		sessionControl.setVoidCallable(1);
-		session.close();
-		sessionControl.setReturnValue(null, 1);
-		sfControl.replay();
-		sessionControl.replay();
-
 		HibernateInterceptor interceptor = new HibernateInterceptor();
-		interceptor.setSessionFactory(sf);
+		interceptor.setSessionFactory(sessionFactory);
 		interceptor.setFilterName("myFilter");
 		try {
-			interceptor.invoke(new TestInvocation(sf));
+			interceptor.invoke(invocation);
 		}
 		catch (Throwable t) {
 			fail("Should not have thrown Throwable: " + t.getMessage());
 		}
 
-		sfControl.verify();
+		verify(session).flush();
-		sessionControl.verify();
+		verify(session).close();
 	}
 
+	@Test
 	public void testInterceptorWithThreadBound() {
-		MockControl sfControl = MockControl.createControl(SessionFactory.class);
+		given(session.isOpen()).willReturn(true);
-		SessionFactory sf = (SessionFactory) sfControl.getMock();
-		MockControl sessionControl = MockControl.createControl(Session.class);
-		Session session = (Session) sessionControl.getMock();
-		session.getSessionFactory();
-		sessionControl.setReturnValue(sf, 1);
-		session.isOpen();
-		sessionControl.setReturnValue(true, 1);
-		sfControl.replay();
-		sessionControl.replay();
 
-		TransactionSynchronizationManager.bindResource(sf, new SessionHolder(session));
+		TransactionSynchronizationManager.bindResource(sessionFactory, new SessionHolder(session));
 		HibernateInterceptor interceptor = new HibernateInterceptor();
-		interceptor.setSessionFactory(sf);
+		interceptor.setSessionFactory(sessionFactory);
 		try {
-			interceptor.invoke(new TestInvocation(sf));
+			interceptor.invoke(invocation);
 		}
 		catch (Throwable t) {
 			fail("Should not have thrown Throwable: " + t.getMessage());
 		}
 		finally {
-			TransactionSynchronizationManager.unbindResource(sf);
+			verify(session, never()).flush();
-		}
+			verify(session, never()).close();
-
+			TransactionSynchronizationManager.unbindResource(sessionFactory);
-		sfControl.verify();
+		}
-		sessionControl.verify();
 	}
 
+	@Test
 	public void testInterceptorWithThreadBoundAndFlushEager() throws HibernateException {
-		MockControl sfControl = MockControl.createControl(SessionFactory.class);
+		given(session.isOpen()).willReturn(true);
-		SessionFactory sf = (SessionFactory) sfControl.getMock();
+		given(session.getFlushMode()).willReturn(FlushMode.AUTO);
-		MockControl sessionControl = MockControl.createControl(Session.class);
-		Session session = (Session) sessionControl.getMock();
-		session.getSessionFactory();
-		sessionControl.setReturnValue(sf, 1);
-		session.isOpen();
-		sessionControl.setReturnValue(true, 1);
-		session.getFlushMode();
-		sessionControl.setReturnValue(FlushMode.AUTO, 1);
-		session.flush();
-		sessionControl.setVoidCallable(1);
-		sfControl.replay();
-		sessionControl.replay();
 
-		TransactionSynchronizationManager.bindResource(sf, new SessionHolder(session));
+		TransactionSynchronizationManager.bindResource(sessionFactory, new SessionHolder(session));
 		HibernateInterceptor interceptor = new HibernateInterceptor();
 		interceptor.setFlushMode(HibernateInterceptor.FLUSH_EAGER);
-		interceptor.setSessionFactory(sf);
+		interceptor.setSessionFactory(sessionFactory);
 		try {
-			interceptor.invoke(new TestInvocation(sf));
+			interceptor.invoke(invocation);
 		}
 		catch (Throwable t) {
 			fail("Should not have thrown Throwable: " + t.getMessage());
 		}
 		finally {
-			TransactionSynchronizationManager.unbindResource(sf);
+			TransactionSynchronizationManager.unbindResource(sessionFactory);
 		}
 
-		sfControl.verify();
+		verify(session).flush();
-		sessionControl.verify();
 	}
 
+	@Test
 	public void testInterceptorWithThreadBoundAndFlushEagerSwitch() throws HibernateException {
-		MockControl sfControl = MockControl.createControl(SessionFactory.class);
+		given(session.isOpen()).willReturn(true);
-		SessionFactory sf = (SessionFactory) sfControl.getMock();
+		given(session.getFlushMode()).willReturn(FlushMode.NEVER);
-		MockControl sessionControl = MockControl.createControl(Session.class);
-		Session session = (Session) sessionControl.getMock();
-		session.getSessionFactory();
-		sessionControl.setReturnValue(sf, 1);
-		session.isOpen();
-		sessionControl.setReturnValue(true, 1);
-		session.getFlushMode();
-		sessionControl.setReturnValue(FlushMode.NEVER, 1);
-		session.setFlushMode(FlushMode.AUTO);
-		sessionControl.setVoidCallable(1);
-		session.flush();
-		sessionControl.setVoidCallable(1);
-		session.setFlushMode(FlushMode.NEVER);
-		sessionControl.setVoidCallable(1);
-		sfControl.replay();
-		sessionControl.replay();
 
-		TransactionSynchronizationManager.bindResource(sf, new SessionHolder(session));
+		TransactionSynchronizationManager.bindResource(sessionFactory, new SessionHolder(session));
 		HibernateInterceptor interceptor = new HibernateInterceptor();
 		interceptor.setFlushMode(HibernateInterceptor.FLUSH_EAGER);
-		interceptor.setSessionFactory(sf);
+		interceptor.setSessionFactory(sessionFactory);
 		try {
-			interceptor.invoke(new TestInvocation(sf));
+			interceptor.invoke(invocation);
 		}
 		catch (Throwable t) {
 			fail("Should not have thrown Throwable: " + t.getMessage());
 		}
 		finally {
-			TransactionSynchronizationManager.unbindResource(sf);
+			TransactionSynchronizationManager.unbindResource(sessionFactory);
 		}
 
-		sfControl.verify();
+		InOrder ordered = inOrder(session);
-		sessionControl.verify();
+		ordered.verify(session).setFlushMode(FlushMode.AUTO);
+		ordered.verify(session).flush();
+		ordered.verify(session).setFlushMode(FlushMode.NEVER);
 	}
 
+	@Test
 	public void testInterceptorWithThreadBoundAndFlushCommit() {
-		MockControl sfControl = MockControl.createControl(SessionFactory.class);
+		given(session.isOpen()).willReturn(true);
-		SessionFactory sf = (SessionFactory) sfControl.getMock();
+		given(session.getFlushMode()).willReturn(FlushMode.AUTO);
-		MockControl sessionControl = MockControl.createControl(Session.class);
-		Session session = (Session) sessionControl.getMock();
-		session.getSessionFactory();
-		sessionControl.setReturnValue(sf, 1);
-		session.isOpen();
-		sessionControl.setReturnValue(true, 1);
-		session.getFlushMode();
-		sessionControl.setReturnValue(FlushMode.AUTO, 1);
-		session.setFlushMode(FlushMode.COMMIT);
-		sessionControl.setVoidCallable(1);
-		session.setFlushMode(FlushMode.AUTO);
-		sessionControl.setVoidCallable(1);
-		sfControl.replay();
-		sessionControl.replay();
 
-		TransactionSynchronizationManager.bindResource(sf, new SessionHolder(session));
+		TransactionSynchronizationManager.bindResource(sessionFactory, new SessionHolder(session));
 		HibernateInterceptor interceptor = new HibernateInterceptor();
-		interceptor.setSessionFactory(sf);
+		interceptor.setSessionFactory(sessionFactory);
 		interceptor.setFlushMode(HibernateInterceptor.FLUSH_COMMIT);
 		try {
-			interceptor.invoke(new TestInvocation(sf));
+			interceptor.invoke(invocation);
 		}
 		catch (Throwable t) {
 			fail("Should not have thrown Throwable: " + t.getMessage());
 		}
 		finally {
-			TransactionSynchronizationManager.unbindResource(sf);
+			TransactionSynchronizationManager.unbindResource(sessionFactory);
 		}
 
-		sfControl.verify();
+		InOrder ordered = inOrder(session);
-		sessionControl.verify();
+		ordered.verify(session).setFlushMode(FlushMode.COMMIT);
+		ordered.verify(session).setFlushMode(FlushMode.AUTO);
+		verify(session, never()).flush();
 	}
 
+	@Test
 	public void testInterceptorWithThreadBoundAndFlushAlways() {
-		MockControl sfControl = MockControl.createControl(SessionFactory.class);
+		given(session.isOpen()).willReturn(true);
-		SessionFactory sf = (SessionFactory) sfControl.getMock();
+		given(session.getFlushMode()).willReturn(FlushMode.AUTO);
-		MockControl sessionControl = MockControl.createControl(Session.class);
-		Session session = (Session) sessionControl.getMock();
-		session.getSessionFactory();
-		sessionControl.setReturnValue(sf, 1);
-		session.isOpen();
-		sessionControl.setReturnValue(true, 1);
-		session.getFlushMode();
-		sessionControl.setReturnValue(FlushMode.AUTO, 1);
-		session.setFlushMode(FlushMode.ALWAYS);
-		sessionControl.setVoidCallable(1);
-		session.setFlushMode(FlushMode.AUTO);
-		sessionControl.setVoidCallable(1);
-		sfControl.replay();
-		sessionControl.replay();
 
-		TransactionSynchronizationManager.bindResource(sf, new SessionHolder(session));
+		TransactionSynchronizationManager.bindResource(sessionFactory, new SessionHolder(session));
 		HibernateInterceptor interceptor = new HibernateInterceptor();
-		interceptor.setSessionFactory(sf);
+		interceptor.setSessionFactory(sessionFactory);
 		interceptor.setFlushMode(HibernateInterceptor.FLUSH_ALWAYS);
 		try {
-			interceptor.invoke(new TestInvocation(sf));
+			interceptor.invoke(invocation);
 		}
 		catch (Throwable t) {
 			fail("Should not have thrown Throwable: " + t.getMessage());
 		}
 		finally {
-			TransactionSynchronizationManager.unbindResource(sf);
+			TransactionSynchronizationManager.unbindResource(sessionFactory);
 		}
 
-		sfControl.verify();
+		InOrder ordered = inOrder(session);
-		sessionControl.verify();
+		ordered.verify(session).setFlushMode(FlushMode.ALWAYS);
+		ordered.verify(session).setFlushMode(FlushMode.AUTO);
+		verify(session, never()).flush();
 	}
 
+	@Test
 	public void testInterceptorWithThreadBoundAndFilter() {
-		MockControl sfControl = MockControl.createControl(SessionFactory.class);
+		given(session.isOpen()).willReturn(true);
-		SessionFactory sf = (SessionFactory) sfControl.getMock();
-		MockControl sessionControl = MockControl.createControl(Session.class);
-		Session session = (Session) sessionControl.getMock();
-		session.getSessionFactory();
-		sessionControl.setReturnValue(sf, 1);
-		session.isOpen();
-		sessionControl.setReturnValue(true, 1);
-		session.enableFilter("myFilter");
-		sessionControl.setReturnValue(null, 1);
-		session.disableFilter("myFilter");
-		sessionControl.setVoidCallable(1);
-		sfControl.replay();
-		sessionControl.replay();
 
-		TransactionSynchronizationManager.bindResource(sf, new SessionHolder(session));
+		TransactionSynchronizationManager.bindResource(sessionFactory, new SessionHolder(session));
 		HibernateInterceptor interceptor = new HibernateInterceptor();
-		interceptor.setSessionFactory(sf);
+		interceptor.setSessionFactory(sessionFactory);
 		interceptor.setFilterName("myFilter");
 		try {
-			interceptor.invoke(new TestInvocation(sf));
+			interceptor.invoke(invocation);
 		}
 		catch (Throwable t) {
 			fail("Should not have thrown Throwable: " + t.getMessage());
 		}
 		finally {
-			TransactionSynchronizationManager.unbindResource(sf);
+			TransactionSynchronizationManager.unbindResource(sessionFactory);
 		}
 
-		sfControl.verify();
+		InOrder ordered = inOrder(session);
-		sessionControl.verify();
+		ordered.verify(session).enableFilter("myFilter");
+		ordered.verify(session).disableFilter("myFilter");
 	}
 
+	@Test
 	public void testInterceptorWithThreadBoundAndFilters() {
-		MockControl sfControl = MockControl.createControl(SessionFactory.class);
+		given(session.isOpen()).willReturn(true);
-		SessionFactory sf = (SessionFactory) sfControl.getMock();
-		MockControl sessionControl = MockControl.createControl(Session.class);
-		Session session = (Session) sessionControl.getMock();
-		session.getSessionFactory();
-		sessionControl.setReturnValue(sf, 1);
-		session.isOpen();
-		sessionControl.setReturnValue(true, 1);
-		session.enableFilter("myFilter");
-		sessionControl.setReturnValue(null, 1);
-		session.enableFilter("yourFilter");
-		sessionControl.setReturnValue(null, 1);
-		session.disableFilter("myFilter");
-		sessionControl.setVoidCallable(1);
-		session.disableFilter("yourFilter");
-		sessionControl.setVoidCallable(1);
-		sfControl.replay();
-		sessionControl.replay();
 
-		TransactionSynchronizationManager.bindResource(sf, new SessionHolder(session));
+		TransactionSynchronizationManager.bindResource(sessionFactory, new SessionHolder(session));
 		HibernateInterceptor interceptor = new HibernateInterceptor();
-		interceptor.setSessionFactory(sf);
+		interceptor.setSessionFactory(sessionFactory);
 		interceptor.setFilterNames(new String[] {"myFilter", "yourFilter"});
 		try {
-			interceptor.invoke(new TestInvocation(sf));
+			interceptor.invoke(invocation);
 		}
 		catch (Throwable t) {
 			fail("Should not have thrown Throwable: " + t.getMessage());
 		}
 		finally {
-			TransactionSynchronizationManager.unbindResource(sf);
+			TransactionSynchronizationManager.unbindResource(sessionFactory);
 		}
 
-		sfControl.verify();
+		InOrder ordered = inOrder(session);
-		sessionControl.verify();
+		ordered.verify(session).enableFilter("myFilter");
+		ordered.verify(session).enableFilter("yourFilter");
+		ordered.verify(session).disableFilter("myFilter");
+		ordered.verify(session).disableFilter("yourFilter");
 	}
 
+	@Test
 	public void testInterceptorWithFlushFailure() throws Throwable {
-		MockControl sfControl = MockControl.createControl(SessionFactory.class);
-		SessionFactory sf = (SessionFactory) sfControl.getMock();
-		MockControl sessionControl = MockControl.createControl(Session.class);
-		Session session = (Session) sessionControl.getMock();
-		sf.openSession();
-		sfControl.setReturnValue(session, 1);
-		session.getSessionFactory();
-		sessionControl.setReturnValue(sf, 1);
 		SQLException sqlEx = new SQLException("argh", "27");
-		session.flush();
 		ConstraintViolationException jdbcEx = new ConstraintViolationException("", sqlEx, null);
-		sessionControl.setThrowable(jdbcEx, 1);
+		willThrow(jdbcEx).given(session).flush();
-		session.close();
-		sessionControl.setReturnValue(null, 1);
-		sfControl.replay();
-		sessionControl.replay();
 
 		HibernateInterceptor interceptor = new HibernateInterceptor();
-		interceptor.setSessionFactory(sf);
+		interceptor.setSessionFactory(sessionFactory);
 		try {
-			interceptor.invoke(new TestInvocation(sf));
+			interceptor.invoke(invocation);
 			fail("Should have thrown DataIntegrityViolationException");
 		}
 		catch (DataIntegrityViolationException ex) {
@@ -406,204 +310,72 @@ public class HibernateInterceptorTests extends TestCase {
 			assertEquals(jdbcEx, ex.getCause());
 		}
 
-		sfControl.verify();
+		verify(session).close();
-		sessionControl.verify();
 	}
 
+	@Test
 	public void testInterceptorWithThreadBoundEmptyHolder() {
-		MockControl sfControl = MockControl.createControl(SessionFactory.class);
-		SessionFactory sf = (SessionFactory) sfControl.getMock();
-		MockControl sessionControl = MockControl.createControl(Session.class);
-		Session session = (Session) sessionControl.getMock();
-		sf.openSession();
-		sfControl.setReturnValue(session, 1);
-		session.getSessionFactory();
-		sessionControl.setReturnValue(sf, 1);
-		session.flush();
-		sessionControl.setVoidCallable(1);
-		session.close();
-		sessionControl.setReturnValue(null, 1);
-		sfControl.replay();
-		sessionControl.replay();
-
 		SessionHolder holder = new SessionHolder("key", session);
 		holder.removeSession("key");
-		TransactionSynchronizationManager.bindResource(sf, holder);
+		TransactionSynchronizationManager.bindResource(sessionFactory, holder);
 		HibernateInterceptor interceptor = new HibernateInterceptor();
-		interceptor.setSessionFactory(sf);
+		interceptor.setSessionFactory(sessionFactory);
 		try {
-			interceptor.invoke(new TestInvocation(sf));
+			interceptor.invoke(invocation);
 		}
 		catch (Throwable t) {
 			fail("Should not have thrown Throwable: " + t.getMessage());
 		}
 
-		sfControl.verify();
+		verify(session).flush();
-		sessionControl.verify();
+		verify(session).close();
 	}
 
+	@Test
 	public void testInterceptorWithEntityInterceptor() throws HibernateException {
-		MockControl interceptorControl = MockControl.createControl(org.hibernate.Interceptor.class);
+		org.hibernate.Interceptor entityInterceptor = mock(org.hibernate.Interceptor.class);
-		org.hibernate.Interceptor entityInterceptor = (org.hibernate.Interceptor) interceptorControl.getMock();
+		given(sessionFactory.openSession(entityInterceptor)).willReturn(session);
-		interceptorControl.replay();
-		MockControl sfControl = MockControl.createControl(SessionFactory.class);
-		SessionFactory sf = (SessionFactory) sfControl.getMock();
-		MockControl sessionControl = MockControl.createControl(Session.class);
-		Session session = (Session) sessionControl.getMock();
-		sf.openSession(entityInterceptor);
-		sfControl.setReturnValue(session, 1);
-		session.getSessionFactory();
-		sessionControl.setReturnValue(sf, 1);
-		session.flush();
-		sessionControl.setVoidCallable(1);
-		session.close();
-		sessionControl.setReturnValue(null, 1);
-		sfControl.replay();
-		sessionControl.replay();
 
 		HibernateInterceptor interceptor = new HibernateInterceptor();
-		interceptor.setSessionFactory(sf);
+		interceptor.setSessionFactory(sessionFactory);
 		interceptor.setEntityInterceptor(entityInterceptor);
 		try {
-			interceptor.invoke(new TestInvocation(sf));
+			interceptor.invoke(invocation);
 		}
 		catch (Throwable t) {
 			fail("Should not have thrown Throwable: " + t.getMessage());
 		}
 
-		interceptorControl.verify();
+		verify(session).flush();
-		sfControl.verify();
+		verify(session).close();
-		sessionControl.verify();
 	}
 
+	@Test
 	public void testInterceptorWithEntityInterceptorBeanName() throws HibernateException {
-		MockControl interceptorControl = MockControl.createControl(org.hibernate.Interceptor.class);
+		org.hibernate.Interceptor entityInterceptor = mock(org.hibernate.Interceptor.class);
-		org.hibernate.Interceptor entityInterceptor = (org.hibernate.Interceptor) interceptorControl.getMock();
+		org.hibernate.Interceptor entityInterceptor2 = mock(org.hibernate.Interceptor.class);
-		interceptorControl.replay();
-		MockControl interceptor2Control = MockControl.createControl(org.hibernate.Interceptor.class);
-		org.hibernate.Interceptor entityInterceptor2 = (org.hibernate.Interceptor) interceptor2Control.getMock();
-		interceptor2Control.replay();
 
-		MockControl sfControl = MockControl.createControl(SessionFactory.class);
+		given(sessionFactory.openSession(entityInterceptor)).willReturn(session);
-		SessionFactory sf = (SessionFactory) sfControl.getMock();
+		given(sessionFactory.openSession(entityInterceptor2)).willReturn(session);
-		MockControl sessionControl = MockControl.createControl(Session.class);
-		Session session = (Session) sessionControl.getMock();
-		sf.openSession(entityInterceptor);
-		sfControl.setReturnValue(session, 1);
-		sf.openSession(entityInterceptor2);
-		sfControl.setReturnValue(session, 1);
-		session.getSessionFactory();
-		sessionControl.setReturnValue(sf, 2);
-		session.flush();
-		sessionControl.setVoidCallable(2);
-		session.close();
-		sessionControl.setReturnValue(null, 2);
-		sfControl.replay();
-		sessionControl.replay();
 
-		MockControl beanFactoryControl = MockControl.createControl(BeanFactory.class);
+		BeanFactory beanFactory = mock(BeanFactory.class);
-		BeanFactory beanFactory = (BeanFactory) beanFactoryControl.getMock();
+		given(beanFactory.getBean("entityInterceptor", org.hibernate.Interceptor.class)).willReturn(
-		beanFactory.getBean("entityInterceptor", org.hibernate.Interceptor.class);
+				entityInterceptor, entityInterceptor2);
-		beanFactoryControl.setReturnValue(entityInterceptor, 1);
-		beanFactory.getBean("entityInterceptor", org.hibernate.Interceptor.class);
-		beanFactoryControl.setReturnValue(entityInterceptor2, 1);
-		beanFactoryControl.replay();
 
 		HibernateInterceptor interceptor = new HibernateInterceptor();
-		interceptor.setSessionFactory(sf);
+		interceptor.setSessionFactory(sessionFactory);
 		interceptor.setEntityInterceptorBeanName("entityInterceptor");
 		interceptor.setBeanFactory(beanFactory);
 		for (int i = 0; i < 2; i++) {
 			try {
-				interceptor.invoke(new TestInvocation(sf));
+				interceptor.invoke(invocation);
 			}
 			catch (Throwable t) {
 				fail("Should not have thrown Throwable: " + t.getMessage());
 			}
 		}
 
-		interceptorControl.verify();
+		verify(session, times(2)).flush();
-		interceptor2Control.verify();
+		verify(session, times(2)).close();
-		sfControl.verify();
-		sessionControl.verify();
-	}
-
-	@Override
-	protected void tearDown() {
-		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
-		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
-	}
-
-
-	private static class TestInvocation implements MethodInvocation {
-
-		private SessionFactory sessionFactory;
-
-		public TestInvocation(SessionFactory sessionFactory) {
-			this.sessionFactory = sessionFactory;
-		}
-
-		@Override
-		public Object proceed() throws Throwable {
-			if (!TransactionSynchronizationManager.hasResource(this.sessionFactory)) {
-				throw new IllegalStateException("Session not bound");
-			}
-			return null;
-		}
-
-		public int getCurrentInterceptorIndex() {
-			return 0;
-		}
-
-		public int getNumberOfInterceptors() {
-			return 0;
-		}
-
-		public Interceptor getInterceptor(int i) {
-			return null;
-		}
-
-		@Override
-		public Method getMethod() {
-			return null;
-		}
-
-		@Override
-		public AccessibleObject getStaticPart() {
-			return null;
-		}
-
-		public Object getArgument(int i) {
-			return null;
-		}
-
-		@Override
-		public Object[] getArguments() {
-			return null;
-		}
-
-		public void setArgument(int i, Object handler) {
-		}
-
-		public int getArgumentCount() {
-			return 0;
-		}
-
-		@Override
-		public Object getThis() {
-			return null;
-		}
-
-		public Object getProxy() {
-			return null;
-		}
-
-		public Invocation cloneInstance() {
-			return null;
-		}
-
-		public void release() {
 	}
 }
-
-}

spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java

@@ -16,6 +16,13 @@
 
 package org.springframework.orm.hibernate3;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -31,9 +38,6 @@ import java.util.Set;
 
 import javax.transaction.TransactionManager;
 
-import junit.framework.TestCase;
-
-import org.easymock.MockControl;
 import org.hibernate.HibernateException;
 import org.hibernate.Interceptor;
 import org.hibernate.SessionFactory;
@@ -51,6 +55,7 @@ import org.hibernate.engine.FilterDefinition;
 import org.hibernate.event.MergeEvent;
 import org.hibernate.event.MergeEventListener;
 import org.hibernate.mapping.TypeDef;
+import org.junit.Test;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.ClassPathResource;
@@ -60,10 +65,12 @@ import org.springframework.jdbc.datasource.DriverManagerDataSource;
 
 /**
  * @author Juergen Hoeller
+ * @author Phillip Webb
  * @since 05.03.2005
  */
-public class LocalSessionFactoryBeanTests extends TestCase {
+public class LocalSessionFactoryBeanTests {
 
+	@Test
 	@SuppressWarnings("serial")
 	public void testLocalSessionFactoryBeanWithDataSource() throws Exception {
 		final DriverManagerDataSource ds = new DriverManagerDataSource();
@@ -99,6 +106,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		assertEquals("newSessionFactory", invocations.get(0));
 	}
 
+	@Test
 	@SuppressWarnings("serial")
 	public void testLocalSessionFactoryBeanWithCacheRegionFactory() throws Exception {
 		final RegionFactory regionFactory = new NoCachingRegionFactory(null);
@@ -134,6 +142,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		assertEquals("newSessionFactory", invocations.get(0));
 	}
 
+	@Test
 	@SuppressWarnings("serial")
 	public void testLocalSessionFactoryBeanWithCacheProvider() throws Exception {
 		final CacheProvider cacheProvider = new NoCacheProvider();
@@ -170,6 +179,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		assertEquals("newSessionFactory", invocations.get(0));
 	}
 
+	@Test
 	@SuppressWarnings("serial")
 	public void testLocalSessionFactoryBeanWithTransactionAwareDataSource() throws Exception {
 		final DriverManagerDataSource ds = new DriverManagerDataSource();
@@ -207,11 +217,11 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		assertEquals("newSessionFactory", invocations.get(0));
 	}
 
+	@Test
 	@SuppressWarnings("serial")
 	public void testLocalSessionFactoryBeanWithDataSourceAndMappingResources() throws Exception {
 		final DriverManagerDataSource ds = new DriverManagerDataSource();
-		MockControl tmControl = MockControl.createControl(TransactionManager.class);
+		final TransactionManager tm = mock(TransactionManager.class);
-		final TransactionManager tm = (TransactionManager) tmControl.getMock();
 		final List invocations = new ArrayList();
 		LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() {
 			@Override
@@ -254,6 +264,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		assertEquals("newSessionFactory", invocations.get(2));
 	}
 
+	@Test
 	@SuppressWarnings("serial")
 	public void testLocalSessionFactoryBeanWithDataSourceAndMappingJarLocations() throws Exception {
 		final DriverManagerDataSource ds = new DriverManagerDataSource();
@@ -289,6 +300,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		assertTrue(invocations.contains("newSessionFactory"));
 	}
 
+	@Test
 	@SuppressWarnings("serial")
 	public void testLocalSessionFactoryBeanWithDataSourceAndProperties() throws Exception {
 		final DriverManagerDataSource ds = new DriverManagerDataSource();
@@ -333,6 +345,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		assertTrue(invocations.contains("newSessionFactory"));
 	}
 
+	@Test
 	public void testLocalSessionFactoryBeanWithValidProperties() throws Exception {
 		final Set invocations = new HashSet();
 		LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() {
@@ -354,6 +367,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		assertTrue(invocations.contains("newSessionFactory"));
 	}
 
+	@Test
 	public void testLocalSessionFactoryBeanWithInvalidProperties() throws Exception {
 		LocalSessionFactoryBean sfb = new LocalSessionFactoryBean();
 		sfb.setMappingResources(new String[0]);
@@ -368,6 +382,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testLocalSessionFactoryBeanWithInvalidMappings() throws Exception {
 		LocalSessionFactoryBean sfb = new LocalSessionFactoryBean();
 		sfb.setMappingResources(new String[]{"mapping.hbm.xml"});
@@ -379,12 +394,9 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testLocalSessionFactoryBeanWithCustomSessionFactory() throws Exception {
-		MockControl factoryControl = MockControl.createControl(SessionFactory.class);
+		final SessionFactory sessionFactory = mock(SessionFactory.class);
-		final SessionFactory sessionFactory = (SessionFactory) factoryControl.getMock();
-		sessionFactory.close();
-		factoryControl.setVoidCallable(1);
-		factoryControl.replay();
 		LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() {
 			@Override
 			protected SessionFactory newSessionFactory(Configuration config) {
@@ -397,9 +409,10 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		sfb.afterPropertiesSet();
 		assertTrue(sessionFactory == sfb.getObject());
 		sfb.destroy();
-		factoryControl.verify();
+		verify(sessionFactory).close();
 	}
 
+	@Test
 	@SuppressWarnings("serial")
 	public void testLocalSessionFactoryBeanWithEntityInterceptor() throws Exception {
 		LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() {
@@ -415,9 +428,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		};
 		sfb.setMappingResources(new String[0]);
 		sfb.setDataSource(new DriverManagerDataSource());
-		MockControl interceptorControl = MockControl.createControl(Interceptor.class);
+		Interceptor entityInterceptor = mock(Interceptor.class);
-		Interceptor entityInterceptor = (Interceptor) interceptorControl.getMock();
-		interceptorControl.replay();
 		sfb.setEntityInterceptor(entityInterceptor);
 		try {
 			sfb.afterPropertiesSet();
@@ -429,6 +440,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		}
 	}
 
+	@Test
 	@SuppressWarnings("serial")
 	public void testLocalSessionFactoryBeanWithNamingStrategy() throws Exception {
 		LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() {
@@ -455,6 +467,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		}
 	}
 
+	@Test
 	@SuppressWarnings("serial")
 	public void testLocalSessionFactoryBeanWithCacheStrategies() throws Exception {
 		final Properties registeredClassCache = new Properties();
@@ -495,6 +508,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		assertEquals(collectionCache, registeredCollectionCache);
 	}
 
+	@Test
 	@SuppressWarnings("serial")
 	public void testLocalSessionFactoryBeanWithCacheStrategiesAndRegions() throws Exception {
 		final Properties registeredClassCache = new Properties();
@@ -534,6 +548,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		assertEquals(collectionCache, registeredCollectionCache);
 	}
 
+	@Test
 	@SuppressWarnings("serial")
 	public void testLocalSessionFactoryBeanWithEventListeners() throws Exception {
 		final Map registeredListeners = new HashMap();
@@ -562,6 +577,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		assertEquals(listeners, registeredListeners);
 	}
 
+	@Test
 	@SuppressWarnings("serial")
 	public void testLocalSessionFactoryBeanWithEventListenerSet() throws Exception {
 		final Map registeredListeners = new HashMap();
@@ -594,6 +610,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 	}
 
 	/*
+	@Test
 	public void testLocalSessionFactoryBeanWithFilterDefinitions() throws Exception {
 		XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("filterDefinitions.xml", getClass()));
 		FilterTestLocalSessionFactoryBean sf = (FilterTestLocalSessionFactoryBean) xbf.getBean("&sessionFactory");
@@ -613,6 +630,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 	}
 	*/
 
+	@Test
 	public void testLocalSessionFactoryBeanWithTypeDefinitions() throws Exception {
 		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
 		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(new ClassPathResource("typeDefinitions.xml", getClass()));

spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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,25 +16,26 @@
 
 package org.springframework.orm.hibernate3.support;
 
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.TestCase;
 import org.hibernate.SessionFactory;
-import org.easymock.MockControl;
+import org.junit.Test;
-
 import org.springframework.orm.hibernate3.HibernateTemplate;
 
 /**
  * @author Juergen Hoeller
+ * @author Phillip Webb
  * @since 05.03.2005
  */
-public class HibernateDaoSupportTests extends TestCase {
+public class HibernateDaoSupportTests {
 
+	@Test
 	public void testHibernateDaoSupportWithSessionFactory() throws Exception {
-		MockControl sfControl = MockControl.createControl(SessionFactory.class);
+		SessionFactory sf = mock(SessionFactory.class);
-		SessionFactory sf = (SessionFactory) sfControl.getMock();
-		sfControl.replay();
 		final List test = new ArrayList();
 		HibernateDaoSupport dao = new HibernateDaoSupport() {
 			@Override
@@ -47,9 +48,9 @@ public class HibernateDaoSupportTests extends TestCase {
 		assertEquals("Correct SessionFactory", sf, dao.getSessionFactory());
 		assertEquals("Correct HibernateTemplate", sf, dao.getHibernateTemplate().getSessionFactory());
 		assertEquals("initDao called", test.size(), 1);
-		sfControl.verify();
 	}
 
+	@Test
 	public void testHibernateDaoSupportWithHibernateTemplate() throws Exception {
 		HibernateTemplate template = new HibernateTemplate();
 		final List test = new ArrayList();

spring-orm/src/test/java/org/springframework/orm/hibernate3/support/LobTypeTests.java

@@ -16,6 +16,11 @@
 
 package org.springframework.orm.hibernate3.support;
 
+import static org.junit.Assert.*;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.ObjectOutputStream;
@@ -31,12 +36,11 @@ import javax.transaction.Status;
 import javax.transaction.Synchronization;
 import javax.transaction.TransactionManager;
 
-import junit.framework.TestCase;
-import org.easymock.MockControl;
-import org.easymock.internal.ArrayMatcher;
 import org.hibernate.SessionFactory;
 import org.hibernate.classic.Session;
-
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.jdbc.support.lob.LobCreator;
 import org.springframework.jdbc.support.lob.LobHandler;
 import org.springframework.orm.hibernate3.SessionFactoryUtils;
@@ -46,39 +50,31 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
 
 /**
  * @author Juergen Hoeller
+ * @author Phillip Webb
  * @since 05.03.2005
  */
-public class LobTypeTests extends TestCase {
+public class LobTypeTests {
 
-	private MockControl rsControl = MockControl.createControl(ResultSet.class);
+	private ResultSet rs = mock(ResultSet.class);
-	private ResultSet rs = (ResultSet) rsControl.getMock();
+	private PreparedStatement ps = mock(PreparedStatement.class);
-	private MockControl psControl = MockControl.createControl(PreparedStatement.class);
+	private LobHandler lobHandler = mock(LobHandler.class);
-	private PreparedStatement ps = (PreparedStatement) psControl.getMock();
+	private LobCreator lobCreator = mock(LobCreator.class);
 
-	private MockControl lobHandlerControl = MockControl.createControl(LobHandler.class);
+	@Before
-	private LobHandler lobHandler = (LobHandler) lobHandlerControl.getMock();
+	public void setUp() throws SQLException {
-	private MockControl lobCreatorControl = MockControl.createControl(LobCreator.class);
+		given(lobHandler.getLobCreator()).willReturn(lobCreator);
-	private LobCreator lobCreator = (LobCreator) lobCreatorControl.getMock();
-
-	@Override
-	protected void setUp() throws SQLException {
-		lobHandler.getLobCreator();
-		lobHandlerControl.setReturnValue(lobCreator);
-		lobCreator.close();
-		lobCreatorControl.setVoidCallable(1);
-
-		rsControl.replay();
-		psControl.replay();
 	}
 
-	public void testClobStringType() throws Exception {
+	@After
-		lobHandler.getClobAsString(rs, "column");
+	public void tearDown() {
-		lobHandlerControl.setReturnValue("content");
+		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
-		lobCreator.setClobAsString(ps, 1, "content");
+		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
-		lobCreatorControl.setVoidCallable(1);
+		verify(lobCreator).close();
+	}
 
-		lobHandlerControl.replay();
+	@Test
-		lobCreatorControl.replay();
+	public void testClobStringType() throws Exception {
+		given(lobHandler.getClobAsString(rs, "column")).willReturn("content");
 
 		ClobStringType type = new ClobStringType(lobHandler, null);
 		assertEquals(1, type.sqlTypes().length);
@@ -101,29 +97,16 @@ public class LobTypeTests extends TestCase {
 		finally {
 			TransactionSynchronizationManager.clearSynchronization();
 		}
+		verify(lobCreator).setClobAsString(ps, 1, "content");
 	}
 
+	@Test
 	public void testClobStringTypeWithSynchronizedSession() throws Exception {
-		MockControl sfControl = MockControl.createControl(SessionFactory.class);
+		SessionFactory sf = mock(SessionFactory.class);
-		SessionFactory sf = (SessionFactory) sfControl.getMock();
+		Session session = mock(Session.class);
-		MockControl sessionControl = MockControl.createControl(Session.class);
+		given(sf.openSession()).willReturn(session);
-		Session session = (Session) sessionControl.getMock();
+		given(session.getSessionFactory()).willReturn(sf);
-		sf.openSession();
+		given(lobHandler.getClobAsString(rs, "column")).willReturn("content");
-		sfControl.setReturnValue(session, 1);
-		session.getSessionFactory();
-		sessionControl.setReturnValue(sf, 1);
-		session.close();
-		sessionControl.setReturnValue(null, 1);
-		sfControl.replay();
-		sessionControl.replay();
-
-		lobHandler.getClobAsString(rs, "column");
-		lobHandlerControl.setReturnValue("content");
-		lobCreator.setClobAsString(ps, 1, "content");
-		lobCreatorControl.setVoidCallable(1);
-
-		lobHandlerControl.replay();
-		lobCreatorControl.replay();
 
 		ClobStringType type = new ClobStringType(lobHandler, null);
 		assertEquals(1, type.sqlTypes().length);
@@ -150,18 +133,13 @@ public class LobTypeTests extends TestCase {
 			TransactionSynchronizationManager.clearSynchronization();
 		}
 
-		sfControl.verify();
+		verify(session).close();
-		sessionControl.verify();
+		verify(lobCreator).setClobAsString(ps, 1, "content");
 	}
 
+	@Test
 	public void testClobStringTypeWithFlushOnCommit() throws Exception {
-		lobHandler.getClobAsString(rs, "column");
+		given(lobHandler.getClobAsString(rs, "column")).willReturn("content");
-		lobHandlerControl.setReturnValue("content");
-		lobCreator.setClobAsString(ps, 1, "content");
-		lobCreatorControl.setVoidCallable(1);
-
-		lobHandlerControl.replay();
-		lobCreatorControl.replay();
 
 		ClobStringType type = new ClobStringType(lobHandler, null);
 		assertEquals(1, type.sqlTypes().length);
@@ -182,73 +160,51 @@ public class LobTypeTests extends TestCase {
 		finally {
 			TransactionSynchronizationManager.clearSynchronization();
 		}
+		verify(lobCreator).setClobAsString(ps, 1, "content");
 	}
 
+	@Test
 	public void testClobStringTypeWithJtaSynchronization() throws Exception {
-		MockControl tmControl = MockControl.createControl(TransactionManager.class);
+		TransactionManager tm = mock(TransactionManager.class);
-		TransactionManager tm = (TransactionManager) tmControl.getMock();
 		MockJtaTransaction transaction = new MockJtaTransaction();
-		tm.getStatus();
+		given(tm.getStatus()).willReturn(Status.STATUS_ACTIVE);
-		tmControl.setReturnValue(Status.STATUS_ACTIVE, 1);
+		given(tm.getTransaction()).willReturn(transaction);
-		tm.getTransaction();
-		tmControl.setReturnValue(transaction, 1);
 
-		lobHandler.getClobAsString(rs, "column");
+		given(lobHandler.getClobAsString(rs, "column")).willReturn("content");
-		lobHandlerControl.setReturnValue("content");
-		lobCreator.setClobAsString(ps, 1, "content");
-		lobCreatorControl.setVoidCallable(1);
-
-		lobHandlerControl.replay();
-		lobCreatorControl.replay();
 
 		ClobStringType type = new ClobStringType(lobHandler, tm);
 		assertEquals("content", type.nullSafeGet(rs, new String[] {"column"}, null));
-		tmControl.replay();
 		type.nullSafeSet(ps, "content", 1);
 		Synchronization synch = transaction.getSynchronization();
 		assertNotNull(synch);
 		synch.beforeCompletion();
 		synch.afterCompletion(Status.STATUS_COMMITTED);
-		tmControl.verify();
+		verify(lobCreator).setClobAsString(ps, 1, "content");
 	}
 
+	@Test
 	public void testClobStringTypeWithJtaSynchronizationAndRollback() throws Exception {
-		MockControl tmControl = MockControl.createControl(TransactionManager.class);
+		TransactionManager tm = mock(TransactionManager.class);
-		TransactionManager tm = (TransactionManager) tmControl.getMock();
 		MockJtaTransaction transaction = new MockJtaTransaction();
-		tm.getStatus();
+		given(tm.getStatus()).willReturn(Status.STATUS_ACTIVE);
-		tmControl.setReturnValue(Status.STATUS_ACTIVE, 1);
+		given(tm.getTransaction()).willReturn(transaction);
-		tm.getTransaction();
+		given(lobHandler.getClobAsString(rs, "column")).willReturn("content");
-		tmControl.setReturnValue(transaction, 1);
-
-		lobHandler.getClobAsString(rs, "column");
-		lobHandlerControl.setReturnValue("content");
-		lobCreator.setClobAsString(ps, 1, "content");
-		lobCreatorControl.setVoidCallable(1);
-
-		lobHandlerControl.replay();
-		lobCreatorControl.replay();
 
 		ClobStringType type = new ClobStringType(lobHandler, tm);
 		assertEquals("content", type.nullSafeGet(rs, new String[] {"column"}, null));
-		tmControl.replay();
 		type.nullSafeSet(ps, "content", 1);
 		Synchronization synch = transaction.getSynchronization();
 		assertNotNull(synch);
 		synch.afterCompletion(Status.STATUS_ROLLEDBACK);
-		tmControl.verify();
+
+		verify(lobCreator).setClobAsString(ps, 1, "content");
 	}
 
+	@Test
 	public void testBlobStringType() throws Exception {
 		String content = "content";
 		byte[] contentBytes = content.getBytes();
-		lobHandler.getBlobAsBytes(rs, "column");
+		given(lobHandler.getBlobAsBytes(rs, "column")).willReturn(contentBytes);
-		lobHandlerControl.setReturnValue(contentBytes);
-		lobCreator.setBlobAsBytes(ps, 1, contentBytes);
-		lobCreatorControl.setMatcher(new ArrayMatcher());
-
-		lobHandlerControl.replay();
-		lobCreatorControl.replay();
 
 		BlobStringType type = new BlobStringType(lobHandler, null);
 		assertEquals(1, type.sqlTypes().length);
@@ -270,15 +226,12 @@ public class LobTypeTests extends TestCase {
 		finally {
 			TransactionSynchronizationManager.clearSynchronization();
 		}
+		verify(lobCreator).setBlobAsBytes(ps, 1, contentBytes);
 	}
 
+	@Test
 	public void testBlobStringTypeWithNull() throws Exception {
-		lobHandler.getBlobAsBytes(rs, "column");
+		given(lobHandler.getBlobAsBytes(rs, "column")).willReturn(null);
-		lobHandlerControl.setReturnValue(null);
-		lobCreator.setBlobAsBytes(ps, 1, null);
-
-		lobHandlerControl.replay();
-		lobCreatorControl.replay();
 
 		BlobStringType type = new BlobStringType(lobHandler, null);
 		assertEquals(null, type.nullSafeGet(rs, new String[] {"column"}, null));
@@ -292,76 +245,56 @@ public class LobTypeTests extends TestCase {
 		finally {
 			TransactionSynchronizationManager.clearSynchronization();
 		}
+
+		verify(lobCreator).setBlobAsBytes(ps, 1, null);
 	}
 
+	@Test
 	public void testBlobStringTypeWithJtaSynchronization() throws Exception {
-		MockControl tmControl = MockControl.createControl(TransactionManager.class);
+		TransactionManager tm = mock(TransactionManager.class);
-		TransactionManager tm = (TransactionManager) tmControl.getMock();
 		MockJtaTransaction transaction = new MockJtaTransaction();
-		tm.getStatus();
+		given(tm.getStatus()).willReturn(Status.STATUS_ACTIVE);
-		tmControl.setReturnValue(Status.STATUS_ACTIVE, 1);
+		given(tm.getTransaction()).willReturn(transaction);
-		tm.getTransaction();
-		tmControl.setReturnValue(transaction, 1);
 
 		String content = "content";
 		byte[] contentBytes = content.getBytes();
-		lobHandler.getBlobAsBytes(rs, "column");
+		given(lobHandler.getBlobAsBytes(rs, "column")).willReturn(contentBytes);
-		lobHandlerControl.setReturnValue(contentBytes);
-		lobCreator.setBlobAsBytes(ps, 1, contentBytes);
-		lobCreatorControl.setMatcher(new ArrayMatcher());
-
-		lobHandlerControl.replay();
-		lobCreatorControl.replay();
 
 		BlobStringType type = new BlobStringType(lobHandler, tm);
 		assertEquals(content, type.nullSafeGet(rs, new String[] {"column"}, null));
-		tmControl.replay();
 		type.nullSafeSet(ps, content, 1);
 		Synchronization synch = transaction.getSynchronization();
 		assertNotNull(synch);
 		synch.beforeCompletion();
 		synch.afterCompletion(Status.STATUS_COMMITTED);
-		tmControl.verify();
+
+		verify(lobCreator).setBlobAsBytes(ps, 1, contentBytes);
 	}
 
+	@Test
 	public void testBlobStringTypeWithJtaSynchronizationAndRollback() throws Exception {
-		MockControl tmControl = MockControl.createControl(TransactionManager.class);
+		TransactionManager tm = mock(TransactionManager.class);
-		TransactionManager tm = (TransactionManager) tmControl.getMock();
 		MockJtaTransaction transaction = new MockJtaTransaction();
-		tm.getStatus();
+		given(tm.getStatus()).willReturn(Status.STATUS_ACTIVE);
-		tmControl.setReturnValue(Status.STATUS_ACTIVE, 1);
+		given(tm.getTransaction()).willReturn(transaction);
-		tm.getTransaction();
-		tmControl.setReturnValue(transaction, 1);
 
 		String content = "content";
 		byte[] contentBytes = content.getBytes();
-		lobHandler.getBlobAsBytes(rs, "column");
+		given(lobHandler.getBlobAsBytes(rs, "column")).willReturn(contentBytes);
-		lobHandlerControl.setReturnValue(contentBytes);
-		lobCreator.setBlobAsBytes(ps, 1, contentBytes);
-		lobCreatorControl.setMatcher(new ArrayMatcher());
-
-		lobHandlerControl.replay();
-		lobCreatorControl.replay();
 
 		BlobStringType type = new BlobStringType(lobHandler, tm);
 		assertEquals(content, type.nullSafeGet(rs, new String[] {"column"}, null));
-		tmControl.replay();
 		type.nullSafeSet(ps, content, 1);
 		Synchronization synch = transaction.getSynchronization();
 		assertNotNull(synch);
 		synch.afterCompletion(Status.STATUS_ROLLEDBACK);
-		tmControl.verify();
+		verify(lobCreator).setBlobAsBytes(ps, 1, contentBytes);
 	}
 
+	@Test
 	public void testBlobByteArrayType() throws Exception {
 		byte[] content = "content".getBytes();
-		lobHandler.getBlobAsBytes(rs, "column");
+		given(lobHandler.getBlobAsBytes(rs, "column")).willReturn(content);
-		lobHandlerControl.setReturnValue(content);
-		lobCreator.setBlobAsBytes(ps, 1, content);
-		lobCreatorControl.setVoidCallable(1);
-
-		lobHandlerControl.replay();
-		lobCreatorControl.replay();
 
 		BlobByteArrayType type = new BlobByteArrayType(lobHandler, null);
 		assertEquals(1, type.sqlTypes().length);
@@ -383,78 +316,56 @@ public class LobTypeTests extends TestCase {
 		finally {
 			TransactionSynchronizationManager.clearSynchronization();
 		}
+		verify(lobCreator).setBlobAsBytes(ps, 1, content);
 	}
 
+	@Test
 	public void testBlobByteArrayTypeWithJtaSynchronization() throws Exception {
-		MockControl tmControl = MockControl.createControl(TransactionManager.class);
+		TransactionManager tm = mock(TransactionManager.class);
-		TransactionManager tm = (TransactionManager) tmControl.getMock();
 		MockJtaTransaction transaction = new MockJtaTransaction();
-		tm.getStatus();
+		given(tm.getStatus()).willReturn(Status.STATUS_ACTIVE);
-		tmControl.setReturnValue(Status.STATUS_ACTIVE, 1);
+		given(tm.getTransaction()).willReturn(transaction);
-		tm.getTransaction();
-		tmControl.setReturnValue(transaction, 1);
 
 		byte[] content = "content".getBytes();
-		lobHandler.getBlobAsBytes(rs, "column");
+		given(lobHandler.getBlobAsBytes(rs, "column")).willReturn(content);
-		lobHandlerControl.setReturnValue(content);
-		lobCreator.setBlobAsBytes(ps, 1, content);
-		lobCreatorControl.setVoidCallable(1);
-
-		lobHandlerControl.replay();
-		lobCreatorControl.replay();
 
 		BlobByteArrayType type = new BlobByteArrayType(lobHandler, tm);
 		assertEquals(content, type.nullSafeGet(rs, new String[] {"column"}, null));
-		tmControl.replay();
 		type.nullSafeSet(ps, content, 1);
 		Synchronization synch = transaction.getSynchronization();
 		assertNotNull(synch);
 		synch.beforeCompletion();
 		synch.afterCompletion(Status.STATUS_COMMITTED);
-		tmControl.verify();
+		verify(lobCreator).setBlobAsBytes(ps, 1, content);
 	}
 
+	@Test
 	public void testBlobByteArrayTypeWithJtaSynchronizationAndRollback() throws Exception {
-		MockControl tmControl = MockControl.createControl(TransactionManager.class);
+		TransactionManager tm = mock(TransactionManager.class);
-		TransactionManager tm = (TransactionManager) tmControl.getMock();
 		MockJtaTransaction transaction = new MockJtaTransaction();
-		tm.getStatus();
+		given(tm.getStatus()).willReturn(Status.STATUS_ACTIVE);
-		tmControl.setReturnValue(Status.STATUS_ACTIVE, 1);
+		given(tm.getTransaction()).willReturn(transaction);
-		tm.getTransaction();
-		tmControl.setReturnValue(transaction, 1);
 
 		byte[] content = "content".getBytes();
-		lobHandler.getBlobAsBytes(rs, "column");
+		given(lobHandler.getBlobAsBytes(rs, "column")).willReturn(content);
-		lobHandlerControl.setReturnValue(content);
-		lobCreator.setBlobAsBytes(ps, 1, content);
-		lobCreatorControl.setVoidCallable(1);
-
-		lobHandlerControl.replay();
-		lobCreatorControl.replay();
 
 		BlobByteArrayType type = new BlobByteArrayType(lobHandler, tm);
 		assertEquals(content, type.nullSafeGet(rs, new String[] {"column"}, null));
-		tmControl.replay();
 		type.nullSafeSet(ps, content, 1);
 		Synchronization synch = transaction.getSynchronization();
 		assertNotNull(synch);
 		synch.afterCompletion(Status.STATUS_ROLLEDBACK);
-		tmControl.verify();
+		verify(lobCreator).setBlobAsBytes(ps, 1, content);
 	}
 
+	@Test
 	public void testBlobSerializableType() throws Exception {
 		ByteArrayOutputStream baos = new ByteArrayOutputStream();
 		ObjectOutputStream oos = new ObjectOutputStream(baos);
 		oos.writeObject("content");
 		oos.close();
 
-		lobHandler.getBlobAsBinaryStream(rs, "column");
+		given(lobHandler.getBlobAsBinaryStream(rs, "column")).willReturn(new ByteArrayInputStream(baos.toByteArray()));
-		lobHandlerControl.setReturnValue(new ByteArrayInputStream(baos.toByteArray()));
-		lobCreator.setBlobAsBytes(ps, 1, baos.toByteArray());
-		lobCreatorControl.setMatcher(new ArrayMatcher());
-
-		lobHandlerControl.replay();
-		lobCreatorControl.replay();
 
 		BlobSerializableType type = new BlobSerializableType(lobHandler, null);
 		assertEquals(1, type.sqlTypes().length);
@@ -474,15 +385,12 @@ public class LobTypeTests extends TestCase {
 		finally {
 			TransactionSynchronizationManager.clearSynchronization();
 		}
+		verify(lobCreator).setBlobAsBytes(ps, 1, baos.toByteArray());
 	}
 
+	@Test
 	public void testBlobSerializableTypeWithNull() throws Exception {
-		lobHandler.getBlobAsBinaryStream(rs, "column");
+		given(lobHandler.getBlobAsBinaryStream(rs, "column")).willReturn(null);
-		lobHandlerControl.setReturnValue(null);
-		lobCreator.setBlobAsBytes(ps, 1, null);
-
-		lobHandlerControl.replay();
-		lobCreatorControl.replay();
 
 		BlobSerializableType type = new BlobSerializableType(lobHandler, null);
 		assertEquals(null, type.nullSafeGet(rs, new String[] {"column"}, null));
@@ -496,29 +404,23 @@ public class LobTypeTests extends TestCase {
 		finally {
 			TransactionSynchronizationManager.clearSynchronization();
 		}
+		verify(lobCreator).setBlobAsBytes(ps, 1, null);
 	}
 
+	@Test
 	public void testBlobSerializableTypeWithJtaSynchronization() throws Exception {
-		MockControl tmControl = MockControl.createControl(TransactionManager.class);
+		TransactionManager tm = mock(TransactionManager.class);
-		TransactionManager tm = (TransactionManager) tmControl.getMock();
 		MockJtaTransaction transaction = new MockJtaTransaction();
-		tm.getStatus();
+		given(tm.getStatus()).willReturn(Status.STATUS_ACTIVE);
-		tmControl.setReturnValue(Status.STATUS_ACTIVE, 1);
+		given(tm.getTransaction()).willReturn(transaction);
-		tm.getTransaction();
-		tmControl.setReturnValue(transaction, 1);
 
 		ByteArrayOutputStream baos = new ByteArrayOutputStream();
 		ObjectOutputStream oos = new ObjectOutputStream(baos);
 		oos.writeObject("content");
 		oos.close();
 
-		lobHandler.getBlobAsBinaryStream(rs, "column");
+		given(lobHandler.getBlobAsBinaryStream(rs, "column")).willReturn(
-		lobHandlerControl.setReturnValue(new ByteArrayInputStream(baos.toByteArray()));
+				new ByteArrayInputStream(baos.toByteArray()));
-		lobCreator.setBlobAsBytes(ps, 1, baos.toByteArray());
-		lobCreatorControl.setMatcher(new ArrayMatcher());
-
-		lobHandlerControl.replay();
-		lobCreatorControl.replay();
 
 		BlobSerializableType type = new BlobSerializableType(lobHandler, tm);
 		assertEquals(1, type.sqlTypes().length);
@@ -527,36 +429,28 @@ public class LobTypeTests extends TestCase {
 		assertTrue(type.isMutable());
 
 		assertEquals("content", type.nullSafeGet(rs, new String[] {"column"}, null));
-		tmControl.replay();
 		type.nullSafeSet(ps, "content", 1);
 		Synchronization synch = transaction.getSynchronization();
 		assertNotNull(synch);
 		synch.beforeCompletion();
 		synch.afterCompletion(Status.STATUS_COMMITTED);
-		tmControl.verify();
+		verify(lobCreator).setBlobAsBytes(ps, 1, baos.toByteArray());
 	}
 
+	@Test
 	public void testBlobSerializableTypeWithJtaSynchronizationAndRollback() throws Exception {
-		MockControl tmControl = MockControl.createControl(TransactionManager.class);
+		TransactionManager tm = mock(TransactionManager.class);
-		TransactionManager tm = (TransactionManager) tmControl.getMock();
 		MockJtaTransaction transaction = new MockJtaTransaction();
-		tm.getStatus();
+		given(tm.getStatus()).willReturn(Status.STATUS_ACTIVE);
-		tmControl.setReturnValue(Status.STATUS_ACTIVE, 1);
+		given(tm.getTransaction()).willReturn(transaction);
-		tm.getTransaction();
-		tmControl.setReturnValue(transaction, 1);
 
 		ByteArrayOutputStream baos = new ByteArrayOutputStream();
 		ObjectOutputStream oos = new ObjectOutputStream(baos);
 		oos.writeObject("content");
 		oos.close();
 
-		lobHandler.getBlobAsBinaryStream(rs, "column");
+		given(lobHandler.getBlobAsBinaryStream(rs, "column")).willReturn(
-		lobHandlerControl.setReturnValue(new ByteArrayInputStream(baos.toByteArray()));
+				new ByteArrayInputStream(baos.toByteArray()));
-		lobCreator.setBlobAsBytes(ps, 1, baos.toByteArray());
-		lobCreatorControl.setMatcher(new ArrayMatcher());
-
-		lobHandlerControl.replay();
-		lobCreatorControl.replay();
 
 		BlobSerializableType type = new BlobSerializableType(lobHandler, tm);
 		assertEquals(1, type.sqlTypes().length);
@@ -565,20 +459,15 @@ public class LobTypeTests extends TestCase {
 		assertTrue(type.isMutable());
 
 		assertEquals("content", type.nullSafeGet(rs, new String[] {"column"}, null));
-		tmControl.replay();
 		type.nullSafeSet(ps, "content", 1);
 		Synchronization synch = transaction.getSynchronization();
 		assertNotNull(synch);
 		synch.afterCompletion(Status.STATUS_ROLLEDBACK);
-		tmControl.verify();
+		verify(lobCreator).setBlobAsBytes(ps, 1, baos.toByteArray());
 	}
 
+	@Test
 	public void testHbm2JavaStyleInitialization() throws Exception {
-		rsControl.reset();
-		psControl.reset();
-		lobHandlerControl.reset();
-		lobCreatorControl.reset();
-
 		ClobStringType cst = null;
 		BlobByteArrayType bbat = null;
 		BlobSerializableType bst = null;
@@ -612,21 +501,6 @@ public class LobTypeTests extends TestCase {
 		catch (IllegalStateException ex) {
 			// expected
 		}
+		lobCreator.close();
 	}
-
-	@Override
-	protected void tearDown() {
-		try {
-			rsControl.verify();
-			psControl.verify();
-			lobHandlerControl.verify();
-			lobCreatorControl.verify();
-		}
-		catch (IllegalStateException ex) {
-			// ignore: test method didn't call replay
-		}
-		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
-		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
-	}
-
 }

spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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,15 @@
 
 package org.springframework.orm.hibernate3.support;
 
-import static org.easymock.EasyMock.*;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -33,9 +37,7 @@ import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.transaction.TransactionManager;
 
-import org.easymock.EasyMock;
 import org.hibernate.FlushMode;
-import org.hibernate.HibernateException;
 import org.hibernate.SessionFactory;
 import org.hibernate.Transaction;
 import org.hibernate.classic.Session;
@@ -66,6 +68,7 @@ import org.springframework.web.context.support.StaticWebApplicationContext;
 /**
  * @author Juergen Hoeller
  * @author Rossen Stoyanchev
+ * @author Phillip Webb
  * @since 05.03.2005
  */
 public class OpenSessionInViewTests {
@@ -90,19 +93,16 @@ public class OpenSessionInViewTests {
 	@Test
 	public void testOpenSessionInViewInterceptorWithSingleSession() throws Exception {
 
-		SessionFactory sf = createStrictMock(SessionFactory.class);
+		SessionFactory sf = mock(SessionFactory.class);
-		Session session = createStrictMock(Session.class);
+		Session session = mock(Session.class);
 
 		OpenSessionInViewInterceptor interceptor = new OpenSessionInViewInterceptor();
 		interceptor.setSessionFactory(sf);
 
-		expect(sf.openSession()).andReturn(session);
+		given(sf.openSession()).willReturn(session);
-		expect(session.getSessionFactory()).andReturn(sf);
+		given(session.getSessionFactory()).willReturn(sf);
-		session.setFlushMode(FlushMode.MANUAL);
+		given(session.getSessionFactory()).willReturn(sf);
-		expect(session.getSessionFactory()).andReturn(sf);
+		given(session.isOpen()).willReturn(true);
-		expect(session.isOpen()).andReturn(true);
-		replay(sf);
-		replay(session);
 
 		interceptor.preHandle(this.webRequest);
 		assertTrue(TransactionSynchronizationManager.hasResource(sf));
@@ -122,29 +122,14 @@ public class OpenSessionInViewTests {
 		interceptor.postHandle(this.webRequest, null);
 		interceptor.afterCompletion(this.webRequest, null);
 
-		verify(sf);
-		verify(session);
-		reset(sf);
-		reset(session);
-		replay(sf);
-		replay(session);
-
 		interceptor.postHandle(this.webRequest, null);
 		assertTrue(TransactionSynchronizationManager.hasResource(sf));
 
-		verify(sf);
-		verify(session);
-		reset(sf);
-		reset(session);
-		expect(session.close()).andReturn(null);
-		replay(sf);
-		replay(session);
-
 		interceptor.afterCompletion(this.webRequest, null);
 		assertFalse(TransactionSynchronizationManager.hasResource(sf));
 
-		verify(sf);
+		verify(session).setFlushMode(FlushMode.MANUAL);
-		verify(session);
+		verify(session).close();
 	}
 
 	@Test
@@ -152,30 +137,19 @@ public class OpenSessionInViewTests {
 
 		// Initial request thread
 
-		final SessionFactory sf = createStrictMock(SessionFactory.class);
+		final SessionFactory sf = mock(SessionFactory.class);
-		Session session = createStrictMock(Session.class);
+		Session session = mock(Session.class);
 
 		OpenSessionInViewInterceptor interceptor = new OpenSessionInViewInterceptor();
 		interceptor.setSessionFactory(sf);
 
-		expect(sf.openSession()).andReturn(session);
+		given(sf.openSession()).willReturn(session);
-		expect(session.getSessionFactory()).andReturn(sf);
+		given(session.getSessionFactory()).willReturn(sf);
-		session.setFlushMode(FlushMode.MANUAL);
-		replay(sf);
-		replay(session);
 
 		interceptor.preHandle(this.webRequest);
 		assertTrue(TransactionSynchronizationManager.hasResource(sf));
 
-		verify(sf);
+		AsyncWebRequest asyncWebRequest = mock(AsyncWebRequest.class);
-		verify(session);
-
-		AsyncWebRequest asyncWebRequest = createStrictMock(AsyncWebRequest.class);
-		asyncWebRequest.addCompletionHandler((Runnable) anyObject());
-		asyncWebRequest.addTimeoutHandler((Runnable) anyObject());
-		asyncWebRequest.addCompletionHandler((Runnable) anyObject());
-		asyncWebRequest.startAsync();
-		replay(asyncWebRequest);
 
 		WebAsyncManager asyncManager = WebAsyncUtils.getAsyncManager(this.request);
 		asyncManager.setTaskExecutor(new SyncTaskExecutor());
@@ -188,8 +162,6 @@ public class OpenSessionInViewTests {
 			}
 		});
 
-		verify(asyncWebRequest);
-
 		interceptor.afterConcurrentHandlingStarted(this.webRequest);
 		assertFalse(TransactionSynchronizationManager.hasResource(sf));
 
@@ -198,56 +170,34 @@ public class OpenSessionInViewTests {
 		interceptor.preHandle(this.webRequest);
 		assertTrue("Session not bound to async thread", TransactionSynchronizationManager.hasResource(sf));
 
-		verify(sf);
-		reset(sf);
-		replay(sf);
-
-		verify(session);
-		reset(session);
-		replay(session);
-
 		interceptor.postHandle(this.webRequest, null);
 		assertTrue(TransactionSynchronizationManager.hasResource(sf));
 
-		verify(sf);
-		reset(sf);
-
-		verify(session);
-		reset(session);
-
-		expect(session.close()).andReturn(null);
-
-		replay(sf);
-		replay(session);
-
 		interceptor.afterCompletion(this.webRequest, null);
 		assertFalse(TransactionSynchronizationManager.hasResource(sf));
 
-		verify(sf);
+		verify(session).setFlushMode(FlushMode.MANUAL);
-		verify(session);
+		verify(asyncWebRequest, times(2)).addCompletionHandler(any(Runnable.class));
+		verify(asyncWebRequest).addTimeoutHandler(any(Runnable.class));
+		verify(asyncWebRequest).startAsync();
 	}
 
 	@Test
 	public void testOpenSessionInViewInterceptorWithSingleSessionAndJtaTm() throws Exception {
-		final SessionFactoryImplementor sf = createStrictMock(SessionFactoryImplementor.class);
+		final SessionFactoryImplementor sf = mock(SessionFactoryImplementor.class);
-		Session session = createStrictMock(Session.class);
+		Session session = mock(Session.class);
 
-		TransactionManager tm = createStrictMock(TransactionManager.class);
+		TransactionManager tm = mock(TransactionManager.class);
-		expect(tm.getTransaction()).andReturn(null);
+		given(tm.getTransaction()).willReturn(null);
-		expect(tm.getTransaction()).andReturn(null);
+		given(tm.getTransaction()).willReturn(null);
-		replay(tm);
 
 		OpenSessionInViewInterceptor interceptor = new OpenSessionInViewInterceptor();
 		interceptor.setSessionFactory(sf);
 
-		expect(sf.openSession()).andReturn(session);
+		given(sf.openSession()).willReturn(session);
-		expect(sf.getTransactionManager()).andReturn(tm);
+		given(sf.getTransactionManager()).willReturn(tm);
-		session.setFlushMode(FlushMode.MANUAL);
+		given(sf.getTransactionManager()).willReturn(tm);
-		expect(sf.getTransactionManager()).andReturn(tm);
+		given(session.isOpen()).willReturn(true);
-		expect(session.isOpen()).andReturn(true);
-
-		replay(sf);
-		replay(session);
 
 		interceptor.preHandle(this.webRequest);
 		assertTrue(TransactionSynchronizationManager.hasResource(sf));
@@ -268,86 +218,50 @@ public class OpenSessionInViewTests {
 		interceptor.postHandle(this.webRequest, null);
 		interceptor.afterCompletion(this.webRequest, null);
 
-		verify(sf);
-		verify(session);
-
-		reset(sf);
-		reset(session);
-		replay(sf);
-		replay(session);
-
 		interceptor.postHandle(this.webRequest, null);
 		assertTrue(TransactionSynchronizationManager.hasResource(sf));
 
-		verify(sf);
-		verify(session);
-
-		reset(sf);
-		reset(session);
-		expect(session.close()).andReturn(null);
-		replay(sf);
-		replay(session);
-
 		interceptor.afterCompletion(this.webRequest, null);
 		assertFalse(TransactionSynchronizationManager.hasResource(sf));
 
-		verify(sf);
+		verify(session).setFlushMode(FlushMode.MANUAL);
-		verify(session);
+		verify(session).close();
 	}
 
 	@Test
 	public void testOpenSessionInViewInterceptorWithSingleSessionAndFlush() throws Exception {
-		SessionFactory sf = createStrictMock(SessionFactory.class);
+		SessionFactory sf = mock(SessionFactory.class);
-		Session session = createStrictMock(Session.class);
+		Session session = mock(Session.class);
 
 		OpenSessionInViewInterceptor interceptor = new OpenSessionInViewInterceptor();
 		interceptor.setSessionFactory(sf);
 		interceptor.setFlushMode(HibernateAccessor.FLUSH_AUTO);
 
-		expect(sf.openSession()).andReturn(session);
+		given(sf.openSession()).willReturn(session);
-		expect(session.getSessionFactory()).andReturn(sf);
+		given(session.getSessionFactory()).willReturn(sf);
-		replay(sf);
-		replay(session);
 		interceptor.preHandle(this.webRequest);
 		assertTrue(TransactionSynchronizationManager.hasResource(sf));
-		verify(sf);
-		verify(session);
 
-		reset(sf);
-		reset(session);
-		session.flush();
-		replay(sf);
-		replay(session);
 		interceptor.postHandle(this.webRequest, null);
 		assertTrue(TransactionSynchronizationManager.hasResource(sf));
-		verify(sf);
-		verify(session);
 
-		reset(sf);
-		reset(session);
-		expect(session.close()).andReturn(null);
-		replay(sf);
-		replay(session);
 		interceptor.afterCompletion(this.webRequest, null);
 		assertFalse(TransactionSynchronizationManager.hasResource(sf));
-		verify(sf);
+		verify(session).flush();
-		verify(session);
+		verify(session).close();
 	}
 
 	@Test
 	public void testOpenSessionInViewInterceptorAndDeferredClose() throws Exception {
-		SessionFactory sf = createStrictMock(SessionFactory.class);
+		SessionFactory sf = mock(SessionFactory.class);
-		Session session = createStrictMock(Session.class);
+		Session session = mock(Session.class);
 
 		OpenSessionInViewInterceptor interceptor = new OpenSessionInViewInterceptor();
 		interceptor.setSessionFactory(sf);
 		interceptor.setSingleSession(false);
 
-		expect(sf.openSession()).andReturn(session);
+		given(sf.openSession()).willReturn(session);
-		expect(session.getSessionFactory()).andReturn(sf);
+		given(session.getSessionFactory()).willReturn(sf);
-		session.setFlushMode(FlushMode.MANUAL);
-		replay(sf);
-		replay(session);
 
 		interceptor.preHandle(this.webRequest);
 		org.hibernate.Session sess = SessionFactoryUtils.getSession(sf, true);
@@ -367,43 +281,28 @@ public class OpenSessionInViewTests {
 		interceptor.postHandle(this.webRequest, null);
 		interceptor.afterCompletion(this.webRequest, null);
 
-		verify(sf);
-		verify(session);
-
-		reset(sf);
-		reset(session);
-		expect(session.close()).andReturn(null);
-		replay(sf);
-		replay(session);
-
 		interceptor.postHandle(this.webRequest, null);
 		interceptor.afterCompletion(this.webRequest, null);
 
-		verify(sf);
+		verify(session).setFlushMode(FlushMode.MANUAL);
-		verify(session);
+		verify(session).close();
 	}
 
 	@Test
 	public void testOpenSessionInViewFilterWithSingleSession() throws Exception {
-		final SessionFactory sf = createStrictMock(SessionFactory.class);
+		final SessionFactory sf = mock(SessionFactory.class);
-		Session session = createStrictMock(Session.class);
+		Session session = mock(Session.class);
 
-		expect(sf.openSession()).andReturn(session);
+		given(sf.openSession()).willReturn(session);
-		expect(session.getSessionFactory()).andReturn(sf);
+		given(session.getSessionFactory()).willReturn(sf);
-		session.setFlushMode(FlushMode.MANUAL);
+		given(session.close()).willReturn(null);
-		expect(session.close()).andReturn(null);
-		replay(sf);
-		replay(session);
 
-		final SessionFactory sf2 = createStrictMock(SessionFactory.class);
+		final SessionFactory sf2 = mock(SessionFactory.class);
-		Session session2 = createStrictMock(Session.class);
+		Session session2 = mock(Session.class);
 
-		expect(sf2.openSession()).andReturn(session2);
+		given(sf2.openSession()).willReturn(session2);
-		expect(session2.getSessionFactory()).andReturn(sf2);
+		given(session2.getSessionFactory()).willReturn(sf2);
-		session2.setFlushMode(FlushMode.AUTO);
+		given(session2.close()).willReturn(null);
-		expect(session2.close()).andReturn(null);
-		replay(sf2);
-		replay(session2);
 
 		StaticWebApplicationContext wac = new StaticWebApplicationContext();
 		wac.setServletContext(sc);
@@ -448,26 +347,20 @@ public class OpenSessionInViewTests {
 		assertFalse(TransactionSynchronizationManager.hasResource(sf2));
 		assertNotNull(this.request.getAttribute("invoked"));
 
-		verify(sf);
+		verify(session).setFlushMode(FlushMode.MANUAL);
-		verify(session);
+		verify(session2).setFlushMode(FlushMode.AUTO);
-		verify(sf2);
-		verify(session2);
-
 		wac.close();
 	}
 
 	@Test
 	public void testOpenSessionInViewFilterAsyncScenario() throws Exception {
-		final SessionFactory sf = createStrictMock(SessionFactory.class);
+		final SessionFactory sf = mock(SessionFactory.class);
-		Session session = createStrictMock(Session.class);
+		Session session = mock(Session.class);
 
 		// Initial request during which concurrent handling starts..
 
-		expect(sf.openSession()).andReturn(session);
+		given(sf.openSession()).willReturn(session);
-		expect(session.getSessionFactory()).andReturn(sf);
+		given(session.getSessionFactory()).willReturn(sf);
-		session.setFlushMode(FlushMode.MANUAL);
-		replay(sf);
-		replay(session);
 
 		StaticWebApplicationContext wac = new StaticWebApplicationContext();
 		wac.setServletContext(sc);
@@ -490,13 +383,8 @@ public class OpenSessionInViewTests {
 			}
 		};
 
-		AsyncWebRequest asyncWebRequest = createMock(AsyncWebRequest.class);
+		AsyncWebRequest asyncWebRequest = mock(AsyncWebRequest.class);
-		asyncWebRequest.addCompletionHandler((Runnable) anyObject());
+		given(asyncWebRequest.isAsyncStarted()).willReturn(true);
-		asyncWebRequest.addTimeoutHandler(EasyMock.<Runnable>anyObject());
-		asyncWebRequest.addCompletionHandler((Runnable) anyObject());
-		asyncWebRequest.startAsync();
-		expect(asyncWebRequest.isAsyncStarted()).andReturn(true).anyTimes();
-		replay(asyncWebRequest);
 
 		WebAsyncManager asyncManager = WebAsyncUtils.getAsyncManager(this.request);
 		asyncManager.setTaskExecutor(new SyncTaskExecutor());
@@ -513,46 +401,29 @@ public class OpenSessionInViewTests {
 		assertFalse(TransactionSynchronizationManager.hasResource(sf));
 		assertEquals(1, count.get());
 
-		verify(sf);
-		verify(session);
-		verify(asyncWebRequest);
-
-		reset(sf);
-		reset(session);
-		reset(asyncWebRequest);
 
 		// Async dispatch after concurrent handling produces result ...
 
-		expect(session.close()).andReturn(null);
-		expect(asyncWebRequest.isAsyncStarted()).andReturn(false).anyTimes();
-
-		replay(sf);
-		replay(session);
-		replay(asyncWebRequest);
-
 		assertFalse(TransactionSynchronizationManager.hasResource(sf));
 		filter.doFilter(this.request, this.response, filterChain);
 		assertFalse(TransactionSynchronizationManager.hasResource(sf));
 		assertEquals(2, count.get());
 
-		verify(sf);
+		verify(session).setFlushMode(FlushMode.MANUAL);
-		verify(session);
+		verify(asyncWebRequest, times(2)).addCompletionHandler(any(Runnable.class));
-		verify(asyncWebRequest);
+		verify(asyncWebRequest).addTimeoutHandler(any(Runnable.class));
+		verify(asyncWebRequest).startAsync();
 
 		wac.close();
 	}
 
 	@Test
 	public void testOpenSessionInViewFilterWithSingleSessionAndPreBoundSession() throws Exception {
-		final SessionFactory sf = createStrictMock(SessionFactory.class);
+		final SessionFactory sf = mock(SessionFactory.class);
-		Session session = createStrictMock(Session.class);
+		Session session = mock(Session.class);
 
-		expect(sf.openSession()).andReturn(session);
+		given(sf.openSession()).willReturn(session);
-		expect(session.getSessionFactory()).andReturn(sf);
+		given(session.getSessionFactory()).willReturn(sf);
-		session.setFlushMode(FlushMode.MANUAL);
-		expect(session.close()).andReturn(null);
-		replay(sf);
-		replay(session);
 
 		StaticWebApplicationContext wac = new StaticWebApplicationContext();
 		wac.setServletContext(sc);
@@ -588,43 +459,32 @@ public class OpenSessionInViewTests {
 		interceptor.postHandle(this.webRequest, null);
 		interceptor.afterCompletion(this.webRequest, null);
 
-		verify(sf);
+		verify(session).setFlushMode(FlushMode.MANUAL);
-		verify(session);
+		verify(session).close();
 
 		wac.close();
 	}
 
 	@Test
 	public void testOpenSessionInViewFilterWithDeferredClose() throws Exception {
-		final SessionFactory sf = createStrictMock(SessionFactory.class);
+		final SessionFactory sf = mock(SessionFactory.class);
-		final Session session = createStrictMock(Session.class);
+		final Session session = mock(Session.class);
 
-		expect(sf.openSession()).andReturn(session);
+		given(sf.openSession()).willReturn(session);
-		expect(session.getSessionFactory()).andReturn(sf);
+		given(session.getSessionFactory()).willReturn(sf);
-		expect(session.getFlushMode()).andReturn(FlushMode.MANUAL);
+		given(session.getFlushMode()).willReturn(FlushMode.MANUAL);
-		session.setFlushMode(FlushMode.MANUAL);
-		replay(sf);
-		replay(session);
 
-		final SessionFactory sf2 = createStrictMock(SessionFactory.class);
+		final SessionFactory sf2 = mock(SessionFactory.class);
-		final Session session2 = createStrictMock(Session.class);
+		final Session session2 = mock(Session.class);
 
-		Transaction tx = createStrictMock(Transaction.class);
+		Transaction tx = mock(Transaction.class);
-		Connection con = createStrictMock(Connection.class);
+		Connection con = mock(Connection.class);
 
-		expect(sf2.openSession()).andReturn(session2);
+		given(sf2.openSession()).willReturn(session2);
-		expect(session2.connection()).andReturn(con);
+		given(session2.connection()).willReturn(con);
-		expect(session2.beginTransaction()).andReturn(tx);
+		given(session2.beginTransaction()).willReturn(tx);
-		expect(session2.isConnected()).andReturn(true);
+		given(session2.isConnected()).willReturn(true);
-		expect(session2.connection()).andReturn(con);
+		given(session2.connection()).willReturn(con);
-		tx.commit();
-		expect(con.isReadOnly()).andReturn(false);
-		session2.setFlushMode(FlushMode.MANUAL);
-
-		replay(sf2);
-		replay(session2);
-		replay(tx);
-		replay(con);
 
 		StaticWebApplicationContext wac = new StaticWebApplicationContext();
 		wac.setServletContext(sc);
@@ -653,13 +513,6 @@ public class OpenSessionInViewTests {
 				org.hibernate.Session sess = SessionFactoryUtils.getSession(sf, true);
 				SessionFactoryUtils.releaseSession(sess, sf);
 				tm.commit(ts);
-
-				verify(session);
-				reset(session);
-
-				expect(session.close()).andReturn(null);
-				replay(session);
-
 				servletRequest.setAttribute("invoked", Boolean.TRUE);
 			}
 		};
@@ -668,17 +521,9 @@ public class OpenSessionInViewTests {
 			@Override
 			public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse)
 				throws IOException, ServletException {
-
 				HibernateTransactionManager tm = new HibernateTransactionManager(sf2);
 				TransactionStatus ts = tm.getTransaction(new DefaultTransactionDefinition());
 				tm.commit(ts);
-
-				verify(session2);
-				reset(session2);
-
-				expect(session2.close()).andReturn(null);
-				replay(session2);
-
 				filter.doFilter(servletRequest, servletResponse, filterChain);
 			}
 		};
@@ -688,39 +533,23 @@ public class OpenSessionInViewTests {
 		filter2.doFilter(this.request, this.response, filterChain3);
 		assertNotNull(this.request.getAttribute("invoked"));
 
-		verify(sf);
+		verify(session).setFlushMode(FlushMode.MANUAL);
-		verify(session);
+		verify(tx).commit();
-
+		verify(session2).setFlushMode(FlushMode.MANUAL);
-		verify(sf2);
+		verify(session).close();
-		verify(session2);
+		verify(session2).close();
-		verify(tx);
-		verify(con);
 
 		wac.close();
 	}
 
 	@Test
 	public void testOpenSessionInViewFilterWithDeferredCloseAndAlreadyActiveDeferredClose() throws Exception {
-		final SessionFactory sf = createStrictMock(SessionFactory.class);
+		final SessionFactory sf = mock(SessionFactory.class);
-		final Session session = createStrictMock(Session.class);
+		final Session session = mock(Session.class);
 
-		expect(sf.openSession()).andReturn(session);
+		given(sf.openSession()).willReturn(session);
-		expect(session.getSessionFactory()).andReturn(sf);
+		given(session.getSessionFactory()).willReturn(sf);
-		expect(session.getFlushMode()).andReturn(FlushMode.MANUAL);
+		given(session.getFlushMode()).willReturn(FlushMode.MANUAL);
-		session.setFlushMode(FlushMode.MANUAL);
-		replay(sf);
-		replay(session);
-
-//		sf.openSession();
-//		sfControl.setReturnValue(session, 1);
-//		session.getSessionFactory();
-//		sessionControl.setReturnValue(sf);
-//		session.getFlushMode();
-//		sessionControl.setReturnValue(FlushMode.MANUAL, 1);
-//		session.setFlushMode(FlushMode.MANUAL);
-//		sessionControl.setVoidCallable(1);
-//		sfControl.replay();
-//		sessionControl.replay();
 
 		StaticWebApplicationContext wac = new StaticWebApplicationContext();
 		wac.setServletContext(sc);
@@ -754,16 +583,6 @@ public class OpenSessionInViewTests {
 				org.hibernate.Session sess = SessionFactoryUtils.getSession(sf, true);
 				SessionFactoryUtils.releaseSession(sess, sf);
 				tm.commit(ts);
-
-				verify(session);
-				reset(session);
-				try {
-					expect(session.close()).andReturn(null);
-				}
-				catch (HibernateException ex) {
-				}
-				replay(session);
-
 				servletRequest.setAttribute("invoked", Boolean.TRUE);
 			}
 		};
@@ -782,8 +601,8 @@ public class OpenSessionInViewTests {
 		interceptor.postHandle(webRequest, null);
 		interceptor.afterCompletion(webRequest, null);
 
-		verify(sf);
+		verify(session).setFlushMode(FlushMode.MANUAL);
-		verify(session);
+		verify(session).close();
 
 		wac.close();
 	}

spring-orm/src/test/java/org/springframework/orm/ibatis/SqlMapClientTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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,6 +16,13 @@
 
 package org.springframework.orm.ibatis;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -25,24 +32,25 @@ import java.util.Map;
 
 import javax.sql.DataSource;
 
-import com.ibatis.sqlmap.client.SqlMapClient;
+import org.junit.Test;
-import com.ibatis.sqlmap.client.SqlMapExecutor;
-import com.ibatis.sqlmap.client.SqlMapSession;
-import com.ibatis.sqlmap.client.event.RowHandler;
-import junit.framework.TestCase;
-import org.easymock.MockControl;
-
 import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.JdbcUpdateAffectedIncorrectNumberOfRowsException;
 import org.springframework.orm.ibatis.support.SqlMapClientDaoSupport;
 
+import com.ibatis.sqlmap.client.SqlMapClient;
+import com.ibatis.sqlmap.client.SqlMapExecutor;
+import com.ibatis.sqlmap.client.SqlMapSession;
+import com.ibatis.sqlmap.client.event.RowHandler;
+
 /**
  * @author Juergen Hoeller
  * @author Alef Arendsen
+ * @author Phillip Webb
  * @since 09.10.2004
  */
-public class SqlMapClientTests extends TestCase {
+public class SqlMapClientTests {
 
+	@Test
 	public void testSqlMapClientFactoryBeanWithoutConfig() throws Exception {
 		SqlMapClientFactoryBean factory = new SqlMapClientFactoryBean();
 		// explicitly set to null, don't know why ;-)
@@ -56,32 +64,15 @@ public class SqlMapClientTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testSqlMapClientTemplate() throws SQLException {
-		MockControl dsControl = MockControl.createControl(DataSource.class);
+		DataSource ds = mock(DataSource.class);
-		DataSource ds = (DataSource) dsControl.getMock();
+		Connection con = mock(Connection.class);
-		MockControl conControl = MockControl.createControl(Connection.class);
+		final SqlMapSession session = mock(SqlMapSession.class);
-		Connection con = (Connection) conControl.getMock();
+		SqlMapClient client = mock(SqlMapClient.class);
-		ds.getConnection();
-		dsControl.setReturnValue(con, 1);
-		con.close();
-		conControl.setVoidCallable(1);
-		dsControl.replay();
-		conControl.replay();
 
-		MockControl sessionControl = MockControl.createControl(SqlMapSession.class);
+		given(ds.getConnection()).willReturn(con);
-		final SqlMapSession session = (SqlMapSession) sessionControl.getMock();
+		given(client.openSession()).willReturn(session);
-		MockControl clientControl = MockControl.createControl(SqlMapClient.class);
-		SqlMapClient client = (SqlMapClient) clientControl.getMock();
-		client.openSession();
-		clientControl.setReturnValue(session, 1);
-		session.getCurrentConnection();
-		sessionControl.setReturnValue(null, 1);
-		session.setUserConnection(con);
-		sessionControl.setVoidCallable(1);
-		session.close();
-		sessionControl.setVoidCallable(1);
-		sessionControl.replay();
-		clientControl.replay();
 
 		SqlMapClientTemplate template = new SqlMapClientTemplate();
 		template.setDataSource(ds);
@@ -95,30 +86,21 @@ public class SqlMapClientTests extends TestCase {
 			}
 		});
 		assertEquals("done", result);
-		dsControl.verify();
+
-		conControl.verify();
+		verify(con).close();
-		sessionControl.verify();
+		verify(session).setUserConnection(con);
-		clientControl.verify();
+		verify(session).close();
 	}
 
+	@Test
 	public void testSqlMapClientTemplateWithNestedSqlMapSession() throws SQLException {
-		MockControl dsControl = MockControl.createControl(DataSource.class);
+		DataSource ds = mock(DataSource.class);
-		DataSource ds = (DataSource) dsControl.getMock();
+		final Connection con = mock(Connection.class);
-		MockControl conControl = MockControl.createControl(Connection.class);
+		final SqlMapSession session = mock(SqlMapSession.class);
-		final Connection con = (Connection) conControl.getMock();
+		SqlMapClient client = mock(SqlMapClient.class);
-		dsControl.replay();
-		conControl.replay();
 
-		MockControl sessionControl = MockControl.createControl(SqlMapSession.class);
+		given(client.openSession()).willReturn(session);
-		final SqlMapSession session = (SqlMapSession) sessionControl.getMock();
+		given(session.getCurrentConnection()).willReturn(con);
-		MockControl clientControl = MockControl.createControl(SqlMapClient.class);
-		SqlMapClient client = (SqlMapClient) clientControl.getMock();
-		client.openSession();
-		clientControl.setReturnValue(session, 1);
-		session.getCurrentConnection();
-		sessionControl.setReturnValue(con, 1);
-		sessionControl.replay();
-		clientControl.replay();
 
 		SqlMapClientTemplate template = new SqlMapClientTemplate();
 		template.setDataSource(ds);
@@ -132,210 +114,157 @@ public class SqlMapClientTests extends TestCase {
 			}
 		});
 		assertEquals("done", result);
-		dsControl.verify();
-		conControl.verify();
-		sessionControl.verify();
-		clientControl.verify();
 	}
 
+	@Test
 	public void testQueryForObjectOnSqlMapSession() throws SQLException {
-		MockControl dsControl = MockControl.createControl(DataSource.class);
+		DataSource ds = mock(DataSource.class);
-		DataSource ds = (DataSource) dsControl.getMock();
+		Connection con = mock(Connection.class);
-		MockControl conControl = MockControl.createControl(Connection.class);
+		SqlMapClient client = mock(SqlMapClient.class);
-		Connection con = (Connection) conControl.getMock();
+		SqlMapSession session = mock(SqlMapSession.class);
-		MockControl clientControl = MockControl.createControl(SqlMapClient.class);
-		SqlMapClient client = (SqlMapClient) clientControl.getMock();
-		MockControl sessionControl = MockControl.createControl(SqlMapSession.class);
-		SqlMapSession session = (SqlMapSession) sessionControl.getMock();
 
-		ds.getConnection();
+		given(ds.getConnection()).willReturn(con);
-		dsControl.setReturnValue(con, 1);
+		given(client.getDataSource()).willReturn(ds);
-		con.close();
+		given(client.openSession()).willReturn(session);
-		conControl.setVoidCallable(1);
+		given(session.queryForObject("myStatement", "myParameter")).willReturn("myResult");
-		client.getDataSource();
-		clientControl.setReturnValue(ds, 2);
-		client.openSession();
-		clientControl.setReturnValue(session, 1);
-		session.getCurrentConnection();
-		sessionControl.setReturnValue(null, 1);
-		session.setUserConnection(con);
-		sessionControl.setVoidCallable(1);
-		session.queryForObject("myStatement", "myParameter");
-		sessionControl.setReturnValue("myResult", 1);
-		session.close();
-		sessionControl.setVoidCallable(1);
-
-		dsControl.replay();
-		conControl.replay();
-		clientControl.replay();
-		sessionControl.replay();
 
 		SqlMapClientTemplate template = new SqlMapClientTemplate();
 		template.setSqlMapClient(client);
 		template.afterPropertiesSet();
 		assertEquals("myResult", template.queryForObject("myStatement", "myParameter"));
 
-		dsControl.verify();
+		verify(con).close();
-		clientControl.verify();
+		verify(session).setUserConnection(con);
+		verify(session).close();
 	}
 
+	@Test
 	public void testQueryForObject() throws SQLException {
 		TestSqlMapClientTemplate template = new TestSqlMapClientTemplate();
-		template.executor.queryForObject("myStatement", null);
+		given(template.executor.queryForObject("myStatement", null)).willReturn("myResult");
-		template.executorControl.setReturnValue("myResult", 1);
-		template.executorControl.replay();
 		assertEquals("myResult", template.queryForObject("myStatement"));
-		template.executorControl.verify();
 	}
 
+	@Test
 	public void testQueryForObjectWithParameter() throws SQLException {
 		TestSqlMapClientTemplate template = new TestSqlMapClientTemplate();
-		template.executor.queryForObject("myStatement", "myParameter");
+		given(template.executor.queryForObject("myStatement", "myParameter")).willReturn("myResult");
-		template.executorControl.setReturnValue("myResult", 1);
-		template.executorControl.replay();
 		assertEquals("myResult", template.queryForObject("myStatement", "myParameter"));
-		template.executorControl.verify();
 	}
 
+	@Test
 	public void testQueryForObjectWithParameterAndResultObject() throws SQLException {
 		TestSqlMapClientTemplate template = new TestSqlMapClientTemplate();
-		template.executor.queryForObject("myStatement", "myParameter", "myResult");
+		given(template.executor.queryForObject("myStatement", "myParameter",
-		template.executorControl.setReturnValue("myResult", 1);
+				"myResult")).willReturn("myResult");
-		template.executorControl.replay();
 		assertEquals("myResult", template.queryForObject("myStatement", "myParameter", "myResult"));
-		template.executorControl.verify();
 	}
 
+	@Test
 	public void testQueryForList() throws SQLException {
 		List result = new ArrayList();
 		TestSqlMapClientTemplate template = new TestSqlMapClientTemplate();
-		template.executor.queryForList("myStatement", null);
+		given(template.executor.queryForList("myStatement", null)).willReturn(result);
-		template.executorControl.setReturnValue(result, 1);
-		template.executorControl.replay();
 		assertEquals(result, template.queryForList("myStatement"));
-		template.executorControl.verify();
 	}
 
+	@Test
 	public void testQueryForListWithParameter() throws SQLException {
 		List result = new ArrayList();
 		TestSqlMapClientTemplate template = new TestSqlMapClientTemplate();
-		template.executor.queryForList("myStatement", "myParameter");
+		given(template.executor.queryForList("myStatement", "myParameter")).willReturn(result);
-		template.executorControl.setReturnValue(result, 1);
-		template.executorControl.replay();
 		assertEquals(result, template.queryForList("myStatement", "myParameter"));
-		template.executorControl.verify();
 	}
 
+	@Test
 	public void testQueryForListWithResultSize() throws SQLException {
 		List result = new ArrayList();
 		TestSqlMapClientTemplate template = new TestSqlMapClientTemplate();
-		template.executor.queryForList("myStatement", null, 10, 20);
+		given(template.executor.queryForList("myStatement", null, 10, 20)).willReturn(result);
-		template.executorControl.setReturnValue(result, 1);
-		template.executorControl.replay();
 		assertEquals(result, template.queryForList("myStatement", 10, 20));
-		template.executorControl.verify();
 	}
 
+	@Test
 	public void testQueryForListParameterAndWithResultSize() throws SQLException {
 		List result = new ArrayList();
 		TestSqlMapClientTemplate template = new TestSqlMapClientTemplate();
-		template.executor.queryForList("myStatement", "myParameter", 10, 20);
+		given(template.executor.queryForList("myStatement", "myParameter", 10, 20)).willReturn(result);
-		template.executorControl.setReturnValue(result, 1);
-		template.executorControl.replay();
 		assertEquals(result, template.queryForList("myStatement", "myParameter", 10, 20));
-		template.executorControl.verify();
 	}
 
+	@Test
 	public void testQueryWithRowHandler() throws SQLException {
 		RowHandler rowHandler = new TestRowHandler();
 		TestSqlMapClientTemplate template = new TestSqlMapClientTemplate();
-		template.executor.queryWithRowHandler("myStatement", null, rowHandler);
-		template.executorControl.setVoidCallable(1);
-		template.executorControl.replay();
 		template.queryWithRowHandler("myStatement", rowHandler);
-		template.executorControl.verify();
+		verify(template.executor).queryWithRowHandler("myStatement", null, rowHandler);
 	}
 
+	@Test
 	public void testQueryWithRowHandlerWithParameter() throws SQLException {
 		RowHandler rowHandler = new TestRowHandler();
 		TestSqlMapClientTemplate template = new TestSqlMapClientTemplate();
-		template.executor.queryWithRowHandler("myStatement", "myParameter", rowHandler);
-		template.executorControl.setVoidCallable(1);
-		template.executorControl.replay();
 		template.queryWithRowHandler("myStatement", "myParameter", rowHandler);
-		template.executorControl.verify();
+		verify(template.executor).queryWithRowHandler("myStatement", "myParameter", rowHandler);
 	}
 
+	@Test
 	public void testQueryForMap() throws SQLException {
 		Map result = new HashMap();
 		TestSqlMapClientTemplate template = new TestSqlMapClientTemplate();
-		template.executor.queryForMap("myStatement", "myParameter", "myKey");
+		given(template.executor.queryForMap("myStatement", "myParameter", "myKey")).willReturn(result);
-		template.executorControl.setReturnValue(result, 1);
-		template.executorControl.replay();
 		assertEquals(result, template.queryForMap("myStatement", "myParameter", "myKey"));
-		template.executorControl.verify();
 	}
 
+	@Test
 	public void testQueryForMapWithValueProperty() throws SQLException {
 		Map result = new HashMap();
 		TestSqlMapClientTemplate template = new TestSqlMapClientTemplate();
-		template.executor.queryForMap("myStatement", "myParameter", "myKey", "myValue");
+		given(template.executor.queryForMap("myStatement", "myParameter", "myKey",
-		template.executorControl.setReturnValue(result, 1);
+				"myValue")).willReturn(result);
-		template.executorControl.replay();
 		assertEquals(result, template.queryForMap("myStatement", "myParameter", "myKey", "myValue"));
-		template.executorControl.verify();
 	}
 
+	@Test
 	public void testInsert() throws SQLException {
 		TestSqlMapClientTemplate template = new TestSqlMapClientTemplate();
-		template.executor.insert("myStatement", null);
+		given(template.executor.insert("myStatement", null)).willReturn("myResult");
-		template.executorControl.setReturnValue("myResult", 1);
-		template.executorControl.replay();
 		assertEquals("myResult", template.insert("myStatement"));
-		template.executorControl.verify();
 	}
 
+	@Test
 	public void testInsertWithParameter() throws SQLException {
 		TestSqlMapClientTemplate template = new TestSqlMapClientTemplate();
-		template.executor.insert("myStatement", "myParameter");
+		given(template.executor.insert("myStatement", "myParameter")).willReturn("myResult");
-		template.executorControl.setReturnValue("myResult", 1);
-		template.executorControl.replay();
 		assertEquals("myResult", template.insert("myStatement", "myParameter"));
-		template.executorControl.verify();
 	}
 
+	@Test
 	public void testUpdate() throws SQLException {
 		TestSqlMapClientTemplate template = new TestSqlMapClientTemplate();
-		template.executor.update("myStatement", null);
+		given(template.executor.update("myStatement", null)).willReturn(10);
-		template.executorControl.setReturnValue(10, 1);
-		template.executorControl.replay();
 		assertEquals(10, template.update("myStatement"));
-		template.executorControl.verify();
 	}
 
+	@Test
 	public void testUpdateWithParameter() throws SQLException {
 		TestSqlMapClientTemplate template = new TestSqlMapClientTemplate();
-		template.executor.update("myStatement", "myParameter");
+		given(template.executor.update("myStatement", "myParameter")).willReturn(10);
-		template.executorControl.setReturnValue(10, 1);
-		template.executorControl.replay();
 		assertEquals(10, template.update("myStatement", "myParameter"));
-		template.executorControl.verify();
 	}
 
+	@Test
 	public void testUpdateWithRequiredRowsAffected() throws SQLException {
 		TestSqlMapClientTemplate template = new TestSqlMapClientTemplate();
-		template.executor.update("myStatement", "myParameter");
+		given(template.executor.update("myStatement", "myParameter")).willReturn(10);
-		template.executorControl.setReturnValue(10, 1);
-		template.executorControl.replay();
 		template.update("myStatement", "myParameter", 10);
-		template.executorControl.verify();
+		verify(template.executor).update("myStatement", "myParameter");
 	}
 
+	@Test
 	public void testUpdateWithRequiredRowsAffectedAndInvalidRowCount() throws SQLException {
 		TestSqlMapClientTemplate template = new TestSqlMapClientTemplate();
-		template.executor.update("myStatement", "myParameter");
+		given(template.executor.update("myStatement", "myParameter")).willReturn(20);
-		template.executorControl.setReturnValue(20, 1);
-		template.executorControl.replay();
 		try {
 			template.update("myStatement", "myParameter", 10);
 			fail("Should have thrown JdbcUpdateAffectedIncorrectNumberOfRowsException");
@@ -345,41 +274,34 @@ public class SqlMapClientTests extends TestCase {
 			assertEquals(10, ex.getExpectedRowsAffected());
 			assertEquals(20, ex.getActualRowsAffected());
 		}
-		template.executorControl.verify();
 	}
 
+	@Test
 	public void testDelete() throws SQLException {
 		TestSqlMapClientTemplate template = new TestSqlMapClientTemplate();
-		template.executor.delete("myStatement", null);
+		given(template.executor.delete("myStatement", null)).willReturn(10);
-		template.executorControl.setReturnValue(10, 1);
-		template.executorControl.replay();
 		assertEquals(10, template.delete("myStatement"));
-		template.executorControl.verify();
 	}
 
+	@Test
 	public void testDeleteWithParameter() throws SQLException {
 		TestSqlMapClientTemplate template = new TestSqlMapClientTemplate();
-		template.executor.delete("myStatement", "myParameter");
+		given(template.executor.delete("myStatement", "myParameter")).willReturn(10);
-		template.executorControl.setReturnValue(10, 1);
-		template.executorControl.replay();
 		assertEquals(10, template.delete("myStatement", "myParameter"));
-		template.executorControl.verify();
 	}
 
+	@Test
 	public void testDeleteWithRequiredRowsAffected() throws SQLException {
 		TestSqlMapClientTemplate template = new TestSqlMapClientTemplate();
-		template.executor.delete("myStatement", "myParameter");
+		given(template.executor.delete("myStatement", "myParameter")).willReturn(10);
-		template.executorControl.setReturnValue(10, 1);
-		template.executorControl.replay();
 		template.delete("myStatement", "myParameter", 10);
-		template.executorControl.verify();
+		verify(template.executor).delete("myStatement", "myParameter");
 	}
 
+	@Test
 	public void testDeleteWithRequiredRowsAffectedAndInvalidRowCount() throws SQLException {
 		TestSqlMapClientTemplate template = new TestSqlMapClientTemplate();
-		template.executor.delete("myStatement", "myParameter");
+		given(template.executor.delete("myStatement", "myParameter")).willReturn(20);
-		template.executorControl.setReturnValue(20, 1);
-		template.executorControl.replay();
 		try {
 			template.delete("myStatement", "myParameter", 10);
 			fail("Should have thrown JdbcUpdateAffectedIncorrectNumberOfRowsException");
@@ -389,20 +311,17 @@ public class SqlMapClientTests extends TestCase {
 			assertEquals(10, ex.getExpectedRowsAffected());
 			assertEquals(20, ex.getActualRowsAffected());
 		}
-		template.executorControl.verify();
 	}
 
+	@Test
 	public void testSqlMapClientDaoSupport() throws Exception {
-		MockControl dsControl = MockControl.createControl(DataSource.class);
+		DataSource ds = mock(DataSource.class);
-		DataSource ds = (DataSource) dsControl.getMock();
 		SqlMapClientDaoSupport testDao = new SqlMapClientDaoSupport() {
 		};
 		testDao.setDataSource(ds);
 		assertEquals(ds, testDao.getDataSource());
 
-		MockControl clientControl = MockControl.createControl(SqlMapClient.class);
+		SqlMapClient client = mock(SqlMapClient.class);
-		SqlMapClient client = (SqlMapClient) clientControl.getMock();
-		clientControl.replay();
 
 		testDao.setSqlMapClient(client);
 		assertEquals(client, testDao.getSqlMapClient());
@@ -419,8 +338,7 @@ public class SqlMapClientTests extends TestCase {
 
 	private static class TestSqlMapClientTemplate extends SqlMapClientTemplate {
 
-		public MockControl executorControl = MockControl.createControl(SqlMapExecutor.class);
+		public SqlMapExecutor executor = mock(SqlMapExecutor.class);
-		public SqlMapExecutor executor = (SqlMapExecutor) executorControl.getMock();
 
 		@Override
 		public Object execute(SqlMapClientCallback action) throws DataAccessException {

spring-orm/src/test/java/org/springframework/orm/ibatis/support/LobTypeHandlerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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,21 +16,29 @@
 
 package org.springframework.orm.ibatis.support;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
 import java.io.ObjectOutputStream;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.List;
 
 import javax.sql.DataSource;
 
-import junit.framework.TestCase;
+import org.junit.After;
-import org.easymock.ArgumentsMatcher;
+import org.junit.Before;
-import org.easymock.MockControl;
+import org.junit.Test;
-
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
 import org.springframework.jdbc.datasource.DataSourceUtils;
 import org.springframework.jdbc.datasource.DriverManagerDataSource;
 import org.springframework.jdbc.datasource.LazyConnectionDataSourceProxy;
@@ -41,42 +49,33 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
 
 /**
  * @author Juergen Hoeller
+ * @author Phillip Webb
  * @since 27.02.2005
  */
-public class LobTypeHandlerTests extends TestCase {
+public class LobTypeHandlerTests {
 
-	private MockControl rsControl = MockControl.createControl(ResultSet.class);
+	private ResultSet rs = mock(ResultSet.class);
-	private ResultSet rs = (ResultSet) rsControl.getMock();
+	private PreparedStatement ps = mock(PreparedStatement.class);
-	private MockControl psControl = MockControl.createControl(PreparedStatement.class);
-	private PreparedStatement ps = (PreparedStatement) psControl.getMock();
 
-	private MockControl lobHandlerControl = MockControl.createControl(LobHandler.class);
+	private LobHandler lobHandler = mock(LobHandler.class);
-	private LobHandler lobHandler = (LobHandler) lobHandlerControl.getMock();
+	private LobCreator lobCreator = mock(LobCreator.class);
-	private MockControl lobCreatorControl = MockControl.createControl(LobCreator.class);
-	private LobCreator lobCreator = (LobCreator) lobCreatorControl.getMock();
 
-	@Override
+	@Before
-	protected void setUp() throws SQLException {
+	public void setUp() throws Exception {
-		rs.findColumn("column");
+		given(rs.findColumn("column")).willReturn(1);
-		rsControl.setReturnValue(1);
+		given(lobHandler.getLobCreator()).willReturn(lobCreator);
-
-		lobHandler.getLobCreator();
-		lobHandlerControl.setReturnValue(lobCreator);
-		lobCreator.close();
-		lobCreatorControl.setVoidCallable(1);
-
-		rsControl.replay();
-		psControl.replay();
 	}
 
-	public void testClobStringTypeHandler() throws Exception {
+	@After
-		lobHandler.getClobAsString(rs, 1);
+	public void tearDown() throws Exception {
-		lobHandlerControl.setReturnValue("content", 2);
+		verify(lobCreator).close();
-		lobCreator.setClobAsString(ps, 1, "content");
+		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
-		lobCreatorControl.setVoidCallable(1);
+		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
+	}
 
-		lobHandlerControl.replay();
+	@Test
-		lobCreatorControl.replay();
+	public void testClobStringTypeHandler() throws Exception {
+		given(lobHandler.getClobAsString(rs, 1)).willReturn("content");
 
 		ClobStringTypeHandler type = new ClobStringTypeHandler(lobHandler);
 		assertEquals("content", type.valueOf("content"));
@@ -95,19 +94,15 @@ public class LobTypeHandlerTests extends TestCase {
 		finally {
 			TransactionSynchronizationManager.clearSynchronization();
 		}
+		verify(lobCreator).setClobAsString(ps, 1, "content");
 	}
 
+	@Test
 	public void testClobStringTypeWithSynchronizedConnection() throws Exception {
 		DataSource dsTarget = new DriverManagerDataSource();
 		DataSource ds = new LazyConnectionDataSourceProxy(dsTarget);
 
-		lobHandler.getClobAsString(rs, 1);
+		given(lobHandler.getClobAsString(rs, 1)).willReturn("content");
-		lobHandlerControl.setReturnValue("content", 2);
-		lobCreator.setClobAsString(ps, 1, "content");
-		lobCreatorControl.setVoidCallable(1);
-
-		lobHandlerControl.replay();
-		lobCreatorControl.replay();
 
 		ClobStringTypeHandler type = new ClobStringTypeHandler(lobHandler);
 		assertEquals("content", type.valueOf("content"));
@@ -129,17 +124,13 @@ public class LobTypeHandlerTests extends TestCase {
 		finally {
 			TransactionSynchronizationManager.clearSynchronization();
 		}
+		verify(lobCreator).setClobAsString(ps, 1, "content");
 	}
 
+	@Test
 	public void testBlobByteArrayType() throws Exception {
 		byte[] content = "content".getBytes();
-		lobHandler.getBlobAsBytes(rs, 1);
+		given(lobHandler.getBlobAsBytes(rs, 1)).willReturn(content);
-		lobHandlerControl.setReturnValue(content, 2);
-		lobCreator.setBlobAsBytes(ps, 1, content);
-		lobCreatorControl.setVoidCallable(1);
-
-		lobHandlerControl.replay();
-		lobCreatorControl.replay();
 
 		BlobByteArrayTypeHandler type = new BlobByteArrayTypeHandler(lobHandler);
 		assertTrue(Arrays.equals(content, (byte[]) type.valueOf("content")));
@@ -157,33 +148,24 @@ public class LobTypeHandlerTests extends TestCase {
 		finally {
 			TransactionSynchronizationManager.clearSynchronization();
 		}
+		verify(lobCreator).setBlobAsBytes(ps, 1, content);
 	}
 
+	@Test
 	public void testBlobSerializableType() throws Exception {
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
+		final ByteArrayOutputStream baos = new ByteArrayOutputStream();
 		ObjectOutputStream oos = new ObjectOutputStream(baos);
 		oos.writeObject("content");
 		oos.close();
 
-		lobHandler.getBlobAsBinaryStream(rs, 1);
+		given(lobHandler.getBlobAsBinaryStream(rs, 1)).willAnswer(new Answer<InputStream>() {
-		lobHandlerControl.setReturnValue(new ByteArrayInputStream(baos.toByteArray()), 1);
-		lobHandler.getBlobAsBinaryStream(rs, 1);
-		lobHandlerControl.setReturnValue(new ByteArrayInputStream(baos.toByteArray()), 1);
-		lobCreator.setBlobAsBytes(ps, 1, baos.toByteArray());
-		lobCreatorControl.setMatcher(new ArgumentsMatcher() {
 			@Override
-			public boolean matches(Object[] o1, Object[] o2) {
+			public InputStream answer(InvocationOnMock invocation)
-				return Arrays.equals((byte[]) o1[2], (byte[]) o2[2]);
+					throws Throwable {
-			}
+				return new ByteArrayInputStream(baos.toByteArray());
-			@Override
-			public String toString(Object[] objects) {
-				return null;
 			}
 		});
 
-		lobHandlerControl.replay();
-		lobCreatorControl.replay();
-
 		BlobSerializableTypeHandler type = new BlobSerializableTypeHandler(lobHandler);
 		assertEquals("content", type.valueOf("content"));
 		assertEquals("content", type.getResult(rs, "column"));
@@ -200,15 +182,12 @@ public class LobTypeHandlerTests extends TestCase {
 		finally {
 			TransactionSynchronizationManager.clearSynchronization();
 		}
+		verify(lobCreator).setBlobAsBytes(ps, 1, baos.toByteArray());
 	}
 
+	@Test
 	public void testBlobSerializableTypeWithNull() throws Exception {
-		lobHandler.getBlobAsBinaryStream(rs, 1);
+		given(lobHandler.getBlobAsBinaryStream(rs, 1)).willReturn(null);
-		lobHandlerControl.setReturnValue(null, 2);
-		lobCreator.setBlobAsBytes(ps, 1, null);
-
-		lobHandlerControl.replay();
-		lobCreatorControl.replay();
 
 		BlobSerializableTypeHandler type = new BlobSerializableTypeHandler(lobHandler);
 		assertEquals(null, type.valueOf(null));
@@ -225,21 +204,6 @@ public class LobTypeHandlerTests extends TestCase {
 		finally {
 			TransactionSynchronizationManager.clearSynchronization();
 		}
+		verify(lobCreator).setBlobAsBytes(ps, 1, null);
 	}
-
-	@Override
-	protected void tearDown() {
-		try {
-			rsControl.verify();
-			psControl.verify();
-			lobHandlerControl.verify();
-			lobCreatorControl.verify();
-		}
-		catch (IllegalStateException ex) {
-			// ignore: test method didn't call replay
-		}
-		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
-		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
-	}
-
 }

spring-orm/src/test/java/org/springframework/orm/jdo/JdoInterceptorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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,36 +16,34 @@
 
 package org.springframework.orm.jdo;
 
+import static org.junit.Assert.fail;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Method;
 
 import javax.jdo.PersistenceManager;
 import javax.jdo.PersistenceManagerFactory;
 
-import junit.framework.TestCase;
-
 import org.aopalliance.intercept.Interceptor;
 import org.aopalliance.intercept.Invocation;
 import org.aopalliance.intercept.MethodInvocation;
-import org.easymock.MockControl;
+import org.junit.Test;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 /**
  * @author Juergen Hoeller
+ * @author Phillip Webb
  */
-public class JdoInterceptorTests extends TestCase {
+public class JdoInterceptorTests {
 
+	@Test
 	public void testInterceptor() {
-		MockControl pmfControl = MockControl.createControl(PersistenceManagerFactory.class);
+		PersistenceManagerFactory pmf = mock(PersistenceManagerFactory.class);
-		PersistenceManagerFactory pmf = (PersistenceManagerFactory) pmfControl.getMock();
+		PersistenceManager pm = mock(PersistenceManager.class);
-		MockControl pmControl = MockControl.createControl(PersistenceManager.class);
+		given(pmf.getPersistenceManager()).willReturn(pm);
-		PersistenceManager pm = (PersistenceManager) pmControl.getMock();
-		pmf.getPersistenceManager();
-		pmfControl.setReturnValue(pm, 1);
-		pm.close();
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
 
 		JdoInterceptor interceptor = new JdoInterceptor();
 		interceptor.setPersistenceManagerFactory(pmf);
@@ -56,17 +54,13 @@ public class JdoInterceptorTests extends TestCase {
 			fail("Should not have thrown Throwable: " + t.getMessage());
 		}
 
-		pmfControl.verify();
+		verify(pm).close();
-		pmControl.verify();
 	}
 
+	@Test
 	public void testInterceptorWithPrebound() {
-		MockControl pmfControl = MockControl.createControl(PersistenceManagerFactory.class);
+		PersistenceManagerFactory pmf = mock(PersistenceManagerFactory.class);
-		PersistenceManagerFactory pmf = (PersistenceManagerFactory) pmfControl.getMock();
+		PersistenceManager pm = mock(PersistenceManager.class);
-		MockControl pmControl = MockControl.createControl(PersistenceManager.class);
-		PersistenceManager pm = (PersistenceManager) pmControl.getMock();
-		pmfControl.replay();
-		pmControl.replay();
 
 		TransactionSynchronizationManager.bindResource(pmf, new PersistenceManagerHolder(pm));
 		JdoInterceptor interceptor = new JdoInterceptor();
@@ -80,9 +74,6 @@ public class JdoInterceptorTests extends TestCase {
 		finally {
 			TransactionSynchronizationManager.unbindResource(pmf);
 		}
-
-		pmfControl.verify();
-		pmControl.verify();
 	}
 
 

spring-orm/src/test/java/org/springframework/orm/jdo/JdoTemplateTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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,12 +16,20 @@
 
 package org.springframework.orm.jdo;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+
 import javax.jdo.JDODataStoreException;
 import javax.jdo.JDOException;
 import javax.jdo.JDOFatalDataStoreException;
@@ -33,44 +41,29 @@ import javax.jdo.PersistenceManager;
 import javax.jdo.PersistenceManagerFactory;
 import javax.jdo.Query;
 
-import junit.framework.TestCase;
+import org.junit.After;
-import org.easymock.MockControl;
+import org.junit.Before;
-
+import org.junit.Test;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 /**
  * @author Juergen Hoeller
+ * @author Phillip Webb
  * @since 03.06.2003
  */
-public class JdoTemplateTests extends TestCase {
+public class JdoTemplateTests {
 
-	private MockControl pmfControl;
 	private PersistenceManagerFactory pmf;
-	private MockControl pmControl;
 	private PersistenceManager pm;
 
-	@Override
+	@Before
-	protected void setUp() {
+	public void setUp() {
-		pmfControl = MockControl.createControl(PersistenceManagerFactory.class);
+		pmf = mock(PersistenceManagerFactory.class);
-		pmf = (PersistenceManagerFactory) pmfControl.getMock();
+		pm = mock(PersistenceManager.class);
-		pmControl = MockControl.createControl(PersistenceManager.class);
-		pm = (PersistenceManager) pmControl.getMock();
-		pmf.getConnectionFactory();
-		pmfControl.setReturnValue(null, 1);
-	}
-
-	@Override
-	protected void tearDown() {
-		try {
-			pmfControl.verify();
-			pmControl.verify();
-		}
-		catch (IllegalStateException ex) {
-			// ignore: test method didn't call replay
-		}
 	}
 
+	@Test
 	public void testTemplateExecuteWithNotAllowCreate() {
 		JdoTemplate jt = new JdoTemplate();
 		jt.setPersistenceManagerFactory(pmf);
@@ -89,10 +82,8 @@ public class JdoTemplateTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testTemplateExecuteWithNotAllowCreateAndThreadBound() {
-		pmfControl.replay();
-		pmControl.replay();
-
 		JdoTemplate jt = new JdoTemplate(pmf);
 		jt.setAllowCreate(false);
 		TransactionSynchronizationManager.bindResource(pmf, new PersistenceManagerHolder(pm));
@@ -108,13 +99,9 @@ public class JdoTemplateTests extends TestCase {
 		TransactionSynchronizationManager.unbindResource(pmf);
 	}
 
+	@Test
 	public void testTemplateExecuteWithNewPersistenceManager() {
-		pmf.getPersistenceManager();
+		given(pmf.getPersistenceManager()).willReturn(pm);
-		pmfControl.setReturnValue(pm, 1);
-		pm.close();
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
 
 		JdoTemplate jt = new JdoTemplate(pmf);
 		final List l = new ArrayList();
@@ -126,14 +113,11 @@ public class JdoTemplateTests extends TestCase {
 			}
 		});
 		assertTrue("Correct result list", result == l);
+		verify(pm).close();
 	}
 
+	@Test
 	public void testTemplateExecuteWithThreadBoundAndFlushEager() {
-		pm.flush();
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
-
 		JdoTemplate jt = new JdoTemplate(pmf);
 		jt.setFlushEager(true);
 		jt.setAllowCreate(false);
@@ -148,481 +132,291 @@ public class JdoTemplateTests extends TestCase {
 		});
 		assertTrue("Correct result list", result == l);
 		TransactionSynchronizationManager.unbindResource(pmf);
+		verify(pm).flush();
 	}
 
+	@Test
 	public void testGetObjectById() {
-		pmf.getPersistenceManager();
+		given(pmf.getPersistenceManager()).willReturn(pm);
-		pmfControl.setReturnValue(pm);
+		given(pm.getObjectById("0", true)).willReturn("A");
-		pm.getObjectById("0", true);
-		pmControl.setReturnValue("A");
-		pm.close();
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
-
 		JdoTemplate jt = new JdoTemplate(pmf);
 		assertEquals("A", jt.getObjectById("0"));
+		verify(pm).close();
 	}
 
+	@Test
 	public void testGetObjectByIdWithClassAndValue() {
-		pmf.getPersistenceManager();
+		given(pmf.getPersistenceManager()).willReturn(pm);
-		pmfControl.setReturnValue(pm);
+		given(pm.getObjectById(String.class, "0")).willReturn("A");
-		pm.getObjectById(String.class, "0");
-		pmControl.setReturnValue("A");
-		pm.close();
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
-
 		JdoTemplate jt = new JdoTemplate(pmf);
 		assertEquals("A", jt.getObjectById(String.class, "0"));
+		verify(pm).close();
 	}
 
+	@Test
 	public void testEvict() {
-		pmf.getPersistenceManager();
+		given(pmf.getPersistenceManager()).willReturn(pm);
-		pmfControl.setReturnValue(pm);
-		pm.evict("0");
-		pmControl.setVoidCallable(1);
-		pm.close();
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
-
 		JdoTemplate jt = new JdoTemplate(pmf);
 		jt.evict("0");
+		verify(pm).evict("0");
+		verify(pm).close();
 	}
 
+	@Test
 	public void testEvictAllWithCollection() {
 		Collection coll = new HashSet();
-
+		given(pmf.getPersistenceManager()).willReturn(pm);
-		pmf.getPersistenceManager();
-		pmfControl.setReturnValue(pm);
-		pm.evictAll(coll);
-		pmControl.setVoidCallable(1);
-		pm.close();
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
-
 		JdoTemplate jt = new JdoTemplate(pmf);
 		jt.evictAll(coll);
+		verify(pm).evictAll(coll);
+		verify(pm).close();
 	}
 
+	@Test
 	public void testEvictAll() {
-		pmf.getPersistenceManager();
+		given(pmf.getPersistenceManager()).willReturn(pm);
-		pmfControl.setReturnValue(pm);
-		pm.evictAll();
-		pmControl.setVoidCallable(1);
-		pm.close();
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
-
 		JdoTemplate jt = new JdoTemplate(pmf);
 		jt.evictAll();
+		verify(pm).evictAll();
+		verify(pm).close();
 	}
 
+	@Test
 	public void testRefresh() {
-		pmf.getPersistenceManager();
+		given(pmf.getPersistenceManager()).willReturn(pm);
-		pmfControl.setReturnValue(pm);
-		pm.refresh("0");
-		pmControl.setVoidCallable(1);
-		pm.close();
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
-
 		JdoTemplate jt = new JdoTemplate(pmf);
 		jt.refresh("0");
+		verify(pm).refresh("0");
+		verify(pm).close();
 	}
 
+	@Test
 	public void testRefreshAllWithCollection() {
 		Collection coll = new HashSet();
-
+		given(pmf.getPersistenceManager()).willReturn(pm);
-		pmf.getPersistenceManager();
-		pmfControl.setReturnValue(pm);
-		pm.refreshAll(coll);
-		pmControl.setVoidCallable(1);
-		pm.close();
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
-
 		JdoTemplate jt = new JdoTemplate(pmf);
 		jt.refreshAll(coll);
+		verify(pm).refreshAll(coll);
+		verify(pm).close();
 	}
 
+	@Test
 	public void testRefreshAll() {
-		pmf.getPersistenceManager();
+		given(pmf.getPersistenceManager()).willReturn(pm);
-		pmfControl.setReturnValue(pm);
-		pm.refreshAll();
-		pmControl.setVoidCallable(1);
-		pm.close();
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
-
 		JdoTemplate jt = new JdoTemplate(pmf);
 		jt.refreshAll();
+		verify(pm).refreshAll();
+		verify(pm).close();
 	}
 
+	@Test
 	public void testMakePersistent() {
-		pmf.getPersistenceManager();
+		given(pmf.getPersistenceManager()).willReturn(pm);
-		pmfControl.setReturnValue(pm);
-		pm.makePersistent("0");
-		pmControl.setReturnValue(null, 1);
-		pm.close();
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
-
 		JdoTemplate jt = new JdoTemplate(pmf);
 		jt.makePersistent("0");
+		verify(pm).makePersistent("0");
+		verify(pm).close();
 	}
 
+	@Test
 	public void testMakePersistentAll() {
 		Collection coll = new HashSet();
-
+		given(pmf.getPersistenceManager()).willReturn(pm);
-		pmf.getPersistenceManager();
-		pmfControl.setReturnValue(pm);
-		pm.makePersistentAll(coll);
-		pmControl.setReturnValue(null, 1);
-		pm.close();
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
-
 		JdoTemplate jt = new JdoTemplate(pmf);
 		jt.makePersistentAll(coll);
+		verify(pm).makePersistentAll(coll);
+		verify(pm).close();
 	}
 
+	@Test
 	public void testDeletePersistent() {
-		pmf.getPersistenceManager();
+		given(pmf.getPersistenceManager()).willReturn(pm);
-		pmfControl.setReturnValue(pm);
-		pm.deletePersistent("0");
-		pmControl.setVoidCallable(1);
-		pm.close();
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
-
 		JdoTemplate jt = new JdoTemplate(pmf);
 		jt.deletePersistent("0");
+		verify(pm).deletePersistent("0");
+		verify(pm).close();
 	}
 
+	@Test
 	public void testDeletePersistentAll() {
 		Collection coll = new HashSet();
-
+		given(pmf.getPersistenceManager()).willReturn(pm);
-		pmf.getPersistenceManager();
-		pmfControl.setReturnValue(pm);
-		pm.deletePersistentAll(coll);
-		pmControl.setVoidCallable(1);
-		pm.close();
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
-
 		JdoTemplate jt = new JdoTemplate(pmf);
 		jt.deletePersistentAll(coll);
+		verify(pm).deletePersistentAll(coll);
+		verify(pm).close();
 	}
 
+	@Test
 	public void testDetachCopy() {
-		pmf.getPersistenceManager();
+		given(pmf.getPersistenceManager()).willReturn(pm);
-		pmfControl.setReturnValue(pm);
+		given(pm.detachCopy("0")).willReturn("0x");
-		pm.detachCopy("0");
-		pmControl.setReturnValue("0x", 1);
-		pm.close();
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
-
 		JdoTemplate jt = new JdoTemplate(pmf);
 		assertEquals("0x", jt.detachCopy("0"));
+		verify(pm).close();
 	}
 
+	@Test
 	public void testDetachCopyAll() {
 		Collection attached = new HashSet();
 		Collection detached = new HashSet();
-
+		given(pmf.getPersistenceManager()).willReturn(pm);
-		pmf.getPersistenceManager();
+		given(pm.detachCopyAll(attached)).willReturn(detached);
-		pmfControl.setReturnValue(pm);
-		pm.detachCopyAll(attached);
-		pmControl.setReturnValue(detached, 1);
-		pm.close();
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
-
 		JdoTemplate jt = new JdoTemplate(pmf);
 		assertEquals(detached, jt.detachCopyAll(attached));
+		verify(pm).close();
 	}
 
+	@Test
 	public void testFlush() {
-		pmf.getPersistenceManager();
+		given(pmf.getPersistenceManager()).willReturn(pm);
-		pmfControl.setReturnValue(pm);
-		pm.flush();
-		pmControl.setVoidCallable(1);
-		pm.close();
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
-
 		JdoTemplate jt = new JdoTemplate(pmf);
 		jt.flush();
+		verify(pm).flush();
+		verify(pm).close();
 	}
 
+	@Test
 	public void testFlushWithDialect() {
-		pmf.getPersistenceManager();
+		given(pmf.getPersistenceManager()).willReturn(pm);
-		pmfControl.setReturnValue(pm);
-		pm.flush();
-		pmControl.setVoidCallable(1);
-		pm.close();
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
-
 		JdoTemplate jt = new JdoTemplate(pmf);
 		jt.flush();
+		verify(pm).flush();
+		verify(pm).close();
 	}
 
+	@Test
 	public void testFind() {
-		MockControl queryControl = MockControl.createControl(Query.class);
+		Query query = mock(Query.class);
-		Query query = (Query) queryControl.getMock();
+		given(pmf.getPersistenceManager()).willReturn(pm);
-
+		given(pm.newQuery(String.class)).willReturn(query);
-		pmf.getPersistenceManager();
-		pmfControl.setReturnValue(pm);
-		pm.newQuery(String.class);
-		pmControl.setReturnValue(query);
 		Collection coll = new HashSet();
-		query.execute();
+		given(query.execute()).willReturn(coll);
-		queryControl.setReturnValue(coll);
-		pm.close();
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
-		queryControl.replay();
-
 		JdoTemplate jt = new JdoTemplate(pmf);
 		assertEquals(coll, jt.find(String.class));
-		queryControl.verify();
+		verify(pm).close();
 	}
 
+	@Test
 	public void testFindWithFilter() {
-		MockControl queryControl = MockControl.createControl(Query.class);
+		Query query = mock(Query.class);
-		Query query = (Query) queryControl.getMock();
+		given(pmf.getPersistenceManager()).willReturn(pm);
-
+		given(pm.newQuery(String.class, "a == b")).willReturn(query);
-		pmf.getPersistenceManager();
-		pmfControl.setReturnValue(pm);
-		pm.newQuery(String.class, "a == b");
-		pmControl.setReturnValue(query);
 		Collection coll = new HashSet();
-		query.execute();
+		given(query.execute()).willReturn(coll);
-		queryControl.setReturnValue(coll);
-		pm.close();
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
-		queryControl.replay();
-
 		JdoTemplate jt = new JdoTemplate(pmf);
 		assertEquals(coll, jt.find(String.class, "a == b"));
-		queryControl.verify();
+		verify(pm).close();
 	}
 
+	@Test
 	public void testFindWithFilterAndOrdering() {
-		MockControl queryControl = MockControl.createControl(Query.class);
+		Query query = mock(Query.class);
-		Query query = (Query) queryControl.getMock();
+		given(pmf.getPersistenceManager()).willReturn(pm);
-
+		given(pm.newQuery(String.class, "a == b")).willReturn(query);
-		pmf.getPersistenceManager();
-		pmfControl.setReturnValue(pm);
-		pm.newQuery(String.class, "a == b");
-		pmControl.setReturnValue(query);
-		query.setOrdering("c asc");
-		queryControl.setVoidCallable(1);
 		Collection coll = new HashSet();
-		query.execute();
+		given(query.execute()).willReturn(coll);
-		queryControl.setReturnValue(coll);
-		pm.close();
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
-		queryControl.replay();
-
 		JdoTemplate jt = new JdoTemplate(pmf);
 		assertEquals(coll, jt.find(String.class, "a == b", "c asc"));
-		queryControl.verify();
+		verify(query).setOrdering("c asc");
+		verify(pm).close();
 	}
 
+	@Test
 	public void testFindWithParameterArray() {
-		MockControl queryControl = MockControl.createControl(Query.class);
+		Query query = mock(Query.class);
-		Query query = (Query) queryControl.getMock();
+		given(pmf.getPersistenceManager()).willReturn(pm);
-
+		given(pm.newQuery(String.class, "a == b")).willReturn(query);
-		pmf.getPersistenceManager();
-		pmfControl.setReturnValue(pm);
-		pm.newQuery(String.class, "a == b");
-		pmControl.setReturnValue(query);
-		query.declareParameters("params");
-		queryControl.setVoidCallable(1);
 		Object[] values = new Object[0];
 		Collection coll = new HashSet();
-		query.executeWithArray(values);
+		given(query.executeWithArray(values)).willReturn(coll);
-		queryControl.setReturnValue(coll);
-		pm.close();
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
-		queryControl.replay();
-
 		JdoTemplate jt = new JdoTemplate(pmf);
 		assertEquals(coll, jt.find(String.class, "a == b", "params", values));
-		queryControl.verify();
+		verify(query).declareParameters("params");
+		verify(pm).close();
 	}
 
+	@Test
 	public void testFindWithParameterArrayAndOrdering() {
-		MockControl queryControl = MockControl.createControl(Query.class);
+		Query query = mock(Query.class);
-		Query query = (Query) queryControl.getMock();
+		given(pmf.getPersistenceManager()).willReturn(pm);
-
+		given(pm.newQuery(String.class, "a == b")).willReturn(query);
-		pmf.getPersistenceManager();
-		pmfControl.setReturnValue(pm);
-		pm.newQuery(String.class, "a == b");
-		pmControl.setReturnValue(query);
-		query.declareParameters("params");
-		queryControl.setVoidCallable(1);
-		query.setOrdering("c asc");
-		queryControl.setVoidCallable(1);
 		Object[] values = new Object[0];
 		Collection coll = new HashSet();
-		query.executeWithArray(values);
+		given(query.executeWithArray(values)).willReturn(coll);
-		queryControl.setReturnValue(coll);
-		pm.close();
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
-		queryControl.replay();
-
 		JdoTemplate jt = new JdoTemplate(pmf);
 		assertEquals(coll, jt.find(String.class, "a == b", "params", values, "c asc"));
-		queryControl.verify();
+		verify(query).declareParameters("params");
+		verify(query).setOrdering("c asc");
+		verify(pm).close();
 	}
 
+	@Test
 	public void testFindWithParameterMap() {
-		MockControl queryControl = MockControl.createControl(Query.class);
+		Query query = mock(Query.class);
-		Query query = (Query) queryControl.getMock();
+		given(pmf.getPersistenceManager()).willReturn(pm);
-
+		given(pm.newQuery(String.class, "a == b")).willReturn(query);
-		pmf.getPersistenceManager();
-		pmfControl.setReturnValue(pm);
-		pm.newQuery(String.class, "a == b");
-		pmControl.setReturnValue(query);
-		query.declareParameters("params");
-		queryControl.setVoidCallable(1);
 		Map values = new HashMap();
 		Collection coll = new HashSet();
-		query.executeWithMap(values);
+		given(query.executeWithMap(values)).willReturn(coll);
-		queryControl.setReturnValue(coll);
-		pm.close();
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
-		queryControl.replay();
-
 		JdoTemplate jt = new JdoTemplate(pmf);
 		assertEquals(coll, jt.find(String.class, "a == b", "params", values));
-		queryControl.verify();
+		verify(query).declareParameters("params");
+		verify(pm).close();
 	}
 
+	@Test
 	public void testFindWithParameterMapAndOrdering() {
-		MockControl queryControl = MockControl.createControl(Query.class);
+		Query query = mock(Query.class);
-		Query query = (Query) queryControl.getMock();
+		given(pmf.getPersistenceManager()).willReturn(pm);
-
+		given(pm.newQuery(String.class, "a == b")).willReturn(query);
-		pmf.getPersistenceManager();
-		pmfControl.setReturnValue(pm);
-		pm.newQuery(String.class, "a == b");
-		pmControl.setReturnValue(query);
-		query.declareParameters("params");
-		queryControl.setVoidCallable(1);
-		query.setOrdering("c asc");
-		queryControl.setVoidCallable(1);
 		Map values = new HashMap();
 		Collection coll = new HashSet();
-		query.executeWithMap(values);
+		given(query.executeWithMap(values)).willReturn(coll);
-		queryControl.setReturnValue(coll);
-		pm.close();
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
-		queryControl.replay();
-
 		JdoTemplate jt = new JdoTemplate(pmf);
 		assertEquals(coll, jt.find(String.class, "a == b", "params", values, "c asc"));
-		queryControl.verify();
+		verify(query).declareParameters("params");
+		verify(query).setOrdering("c asc");
+		verify(pm).close();
 	}
 
+	@Test
 	public void testFindWithLanguageAndQueryObject() {
-		MockControl queryControl = MockControl.createControl(Query.class);
+		Query query = mock(Query.class);
-		Query query = (Query) queryControl.getMock();
+		given(pmf.getPersistenceManager()).willReturn(pm);
-
+		given(pm.newQuery(Query.SQL, "some SQL")).willReturn(query);
-		pmf.getPersistenceManager();
-		pmfControl.setReturnValue(pm);
-		pm.newQuery(Query.SQL, "some SQL");
-		pmControl.setReturnValue(query);
 		Collection coll = new HashSet();
-		query.execute();
+		given(query.execute()).willReturn(coll);
-		queryControl.setReturnValue(coll);
-		pm.close();
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
-		queryControl.replay();
-
 		JdoTemplate jt = new JdoTemplate(pmf);
 		assertEquals(coll, jt.find(Query.SQL, "some SQL"));
-		queryControl.verify();
+		verify(pm).close();
 	}
 
+	@Test
 	public void testFindWithQueryString() {
-		MockControl queryControl = MockControl.createControl(Query.class);
+		Query query = mock(Query.class);
-		Query query = (Query) queryControl.getMock();
+		given(pmf.getPersistenceManager()).willReturn(pm);
-
+		given(pm.newQuery("single string query")).willReturn(query);
-		pmf.getPersistenceManager();
-		pmfControl.setReturnValue(pm);
-		pm.newQuery("single string query");
-		pmControl.setReturnValue(query);
 		Collection coll = new HashSet();
-		query.execute();
+		given(query.execute()).willReturn(coll);
-		queryControl.setReturnValue(coll);
-		pm.close();
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
-		queryControl.replay();
-
 		JdoTemplate jt = new JdoTemplate(pmf);
 		assertEquals(coll, jt.find("single string query"));
-		queryControl.verify();
+		verify(pm).close();
 	}
 
+	@Test
 	public void testFindByNamedQuery() {
-		MockControl queryControl = MockControl.createControl(Query.class);
+		Query query = mock(Query.class);
-		Query query = (Query) queryControl.getMock();
+		given(pmf.getPersistenceManager()).willReturn(pm);
-
+		given(pm.newNamedQuery(String.class, "some query name")).willReturn(query);
-		pmf.getPersistenceManager();
-		pmfControl.setReturnValue(pm);
-		pm.newNamedQuery(String.class, "some query name");
-		pmControl.setReturnValue(query);
 		Collection coll = new HashSet();
-		query.execute();
+		given(query.execute()).willReturn(coll);
-		queryControl.setReturnValue(coll);
-		pm.close();
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
-		queryControl.replay();
-
 		JdoTemplate jt = new JdoTemplate(pmf);
 		assertEquals(coll, jt.findByNamedQuery(String.class, "some query name"));
-		queryControl.verify();
+		verify(pm).close();
 	}
 
+	@Test
 	public void testTemplateExceptions() {
 		try {
 			createTemplate().execute(new JdoCallback() {
@@ -716,13 +510,11 @@ public class JdoTemplateTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testTranslateException() {
-		MockControl dialectControl = MockControl.createControl(JdoDialect.class);
+		JdoDialect dialect = mock(JdoDialect.class);
-		JdoDialect dialect = (JdoDialect) dialectControl.getMock();
 		final JDOException ex = new JDOException();
-		dialect.translateException(ex);
+		given(dialect.translateException(ex)).willReturn(new DataIntegrityViolationException("test", ex));
-		dialectControl.setReturnValue(new DataIntegrityViolationException("test", ex));
-		dialectControl.replay();
 		try {
 			JdoTemplate template = createTemplate();
 			template.setJdoDialect(dialect);
@@ -737,20 +529,10 @@ public class JdoTemplateTests extends TestCase {
 		catch (DataIntegrityViolationException dive) {
 			// expected
 		}
-		dialectControl.verify();
 	}
 
 	private JdoTemplate createTemplate() {
-		pmfControl.reset();
+		given(pmf.getPersistenceManager()).willReturn(pm);
-		pmControl.reset();
-		pmf.getConnectionFactory();
-		pmfControl.setReturnValue(null, 1);
-		pmf.getPersistenceManager();
-		pmfControl.setReturnValue(pm, 1);
-		pm.close();
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
 		return new JdoTemplate(pmf);
 	}
 

spring-orm/src/test/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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,6 +16,11 @@
 
 package org.springframework.orm.jdo;
 
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+
 import java.io.IOException;
 import java.util.Map;
 import java.util.Properties;
@@ -23,19 +28,18 @@ import java.util.Properties;
 import javax.jdo.JDOFatalUserException;
 import javax.jdo.PersistenceManagerFactory;
 
-import junit.framework.TestCase;
+import org.junit.Test;
-import org.easymock.MockControl;
-
 import org.springframework.core.io.ClassPathResource;
 
 /**
  * @author Juergen Hoeller
+ * @author Phillip Webb
  */
-public class LocalPersistenceManagerFactoryTests extends TestCase {
+public class LocalPersistenceManagerFactoryTests {
 
+	@Test
 	public void testLocalPersistenceManagerFactoryBean() throws IOException {
-		MockControl pmfControl = MockControl.createControl(PersistenceManagerFactory.class);
+		final PersistenceManagerFactory pmf = mock(PersistenceManagerFactory.class);
-		final PersistenceManagerFactory pmf = (PersistenceManagerFactory) pmfControl.getMock();
 		LocalPersistenceManagerFactoryBean pmfb = new LocalPersistenceManagerFactoryBean() {
 			@Override
 			protected PersistenceManagerFactory newPersistenceManagerFactory(Map props) {
@@ -47,6 +51,7 @@ public class LocalPersistenceManagerFactoryTests extends TestCase {
 		assertSame(pmf, pmfb.getObject());
 	}
 
+	@Test
 	public void testLocalPersistenceManagerFactoryBeanWithInvalidSettings() throws IOException {
 		LocalPersistenceManagerFactoryBean pmfb = new LocalPersistenceManagerFactoryBean();
 		try {
@@ -58,6 +63,7 @@ public class LocalPersistenceManagerFactoryTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testLocalPersistenceManagerFactoryBeanWithIncompleteProperties() throws IOException {
 		LocalPersistenceManagerFactoryBean pmfb = new LocalPersistenceManagerFactoryBean();
 		Properties props = new Properties();
@@ -72,6 +78,7 @@ public class LocalPersistenceManagerFactoryTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testLocalPersistenceManagerFactoryBeanWithInvalidProperty() throws IOException {
 		LocalPersistenceManagerFactoryBean pmfb = new LocalPersistenceManagerFactoryBean() {
 			@Override
@@ -92,6 +99,7 @@ public class LocalPersistenceManagerFactoryTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testLocalPersistenceManagerFactoryBeanWithFile() throws IOException {
 		LocalPersistenceManagerFactoryBean pmfb = new LocalPersistenceManagerFactoryBean() {
 			@Override
@@ -110,6 +118,7 @@ public class LocalPersistenceManagerFactoryTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testLocalPersistenceManagerFactoryBeanWithName() throws IOException {
 		LocalPersistenceManagerFactoryBean pmfb = new LocalPersistenceManagerFactoryBean() {
 			@Override
@@ -128,6 +137,7 @@ public class LocalPersistenceManagerFactoryTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testLocalPersistenceManagerFactoryBeanWithNameAndProperties() throws IOException {
 		LocalPersistenceManagerFactoryBean pmfb = new LocalPersistenceManagerFactoryBean() {
 			@Override

spring-orm/src/test/java/org/springframework/orm/jdo/support/JdoDaoSupportTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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,28 +16,28 @@
 
 package org.springframework.orm.jdo.support;
 
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.jdo.PersistenceManagerFactory;
 
-import junit.framework.TestCase;
+import org.junit.Test;
-import org.easymock.MockControl;
-
 import org.springframework.orm.jdo.JdoTemplate;
 
 /**
  * @author Juergen Hoeller
+ * @author Phillip Webb
  * @since 30.07.2003
  */
-public class JdoDaoSupportTests extends TestCase {
+public class JdoDaoSupportTests {
 
+	@Test
 	public void testJdoDaoSupportWithPersistenceManagerFactory() throws Exception {
-		MockControl pmfControl = MockControl.createControl(PersistenceManagerFactory.class);
+		PersistenceManagerFactory pmf = mock(PersistenceManagerFactory.class);
-		PersistenceManagerFactory pmf = (PersistenceManagerFactory) pmfControl.getMock();
 		pmf.getConnectionFactory();
-		pmfControl.setReturnValue(null, 1);
-		pmfControl.replay();
 		final List test = new ArrayList();
 		JdoDaoSupport dao = new JdoDaoSupport() {
 			@Override
@@ -50,9 +50,9 @@ public class JdoDaoSupportTests extends TestCase {
 		assertEquals("Correct PersistenceManagerFactory", pmf, dao.getPersistenceManagerFactory());
 		assertEquals("Correct JdoTemplate", pmf, dao.getJdoTemplate().getPersistenceManagerFactory());
 		assertEquals("initDao called", test.size(), 1);
-		pmfControl.verify();
 	}
 
+	@Test
 	public void testJdoDaoSupportWithJdoTemplate() throws Exception {
 		JdoTemplate template = new JdoTemplate();
 		final List test = new ArrayList();

spring-orm/src/test/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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,7 +16,15 @@
 
 package org.springframework.orm.jdo.support;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 import java.io.IOException;
+
 import javax.jdo.PersistenceManager;
 import javax.jdo.PersistenceManagerFactory;
 import javax.servlet.FilterChain;
@@ -24,9 +32,7 @@ import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
-import junit.framework.TestCase;
+import org.junit.Test;
-import org.easymock.MockControl;
-
 import org.springframework.mock.web.test.MockFilterConfig;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
@@ -40,15 +46,15 @@ import org.springframework.web.context.support.StaticWebApplicationContext;
 /**
  * @author Juergen Hoeller
  * @author Chris Beams
+ * @author Phillip Webb
  * @since 15.06.2004
  */
-public class OpenPersistenceManagerInViewTests extends TestCase {
+public class OpenPersistenceManagerInViewTests {
 
+	@Test
 	public void testOpenPersistenceManagerInViewInterceptor() throws Exception {
-		MockControl pmfControl = MockControl.createControl(PersistenceManagerFactory.class);
+		PersistenceManagerFactory pmf = mock(PersistenceManagerFactory.class);
-		PersistenceManagerFactory pmf = (PersistenceManagerFactory) pmfControl.getMock();
+		PersistenceManager pm = mock(PersistenceManager.class);
-		MockControl pmControl = MockControl.createControl(PersistenceManager.class);
-		PersistenceManager pm = (PersistenceManager) pmControl.getMock();
 
 		OpenPersistenceManagerInViewInterceptor interceptor = new OpenPersistenceManagerInViewInterceptor();
 		interceptor.setPersistenceManagerFactory(pmf);
@@ -56,10 +62,7 @@ public class OpenPersistenceManagerInViewTests extends TestCase {
 		MockServletContext sc = new MockServletContext();
 		MockHttpServletRequest request = new MockHttpServletRequest(sc);
 
-		pmf.getPersistenceManager();
+		given(pmf.getPersistenceManager()).willReturn(pm);
-		pmfControl.setReturnValue(pm, 1);
-		pmfControl.replay();
-		pmControl.replay();
 		interceptor.preHandle(new ServletWebRequest(request));
 		assertTrue(TransactionSynchronizationManager.hasResource(pmf));
 
@@ -77,54 +80,23 @@ public class OpenPersistenceManagerInViewTests extends TestCase {
 		interceptor.postHandle(new ServletWebRequest(request), null);
 		interceptor.afterCompletion(new ServletWebRequest(request), null);
 
-		pmfControl.verify();
-		pmControl.verify();
-
-		pmfControl.reset();
-		pmControl.reset();
-		pmfControl.replay();
-		pmControl.replay();
 		interceptor.postHandle(new ServletWebRequest(request), null);
 		assertTrue(TransactionSynchronizationManager.hasResource(pmf));
-		pmfControl.verify();
-		pmControl.verify();
 
-		pmfControl.reset();
-		pmControl.reset();
-		pm.close();
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
 		interceptor.afterCompletion(new ServletWebRequest(request), null);
 		assertFalse(TransactionSynchronizationManager.hasResource(pmf));
-		pmfControl.verify();
-		pmControl.verify();
 	}
 
+	@Test
 	public void testOpenPersistenceManagerInViewFilter() throws Exception {
-		MockControl pmfControl = MockControl.createControl(PersistenceManagerFactory.class);
+		final PersistenceManagerFactory pmf = mock(PersistenceManagerFactory.class);
-		final PersistenceManagerFactory pmf = (PersistenceManagerFactory) pmfControl.getMock();
+		PersistenceManager pm = mock(PersistenceManager.class);
-		MockControl pmControl = MockControl.createControl(PersistenceManager.class);
-		PersistenceManager pm = (PersistenceManager) pmControl.getMock();
 
-		pmf.getPersistenceManager();
+		given(pmf.getPersistenceManager()).willReturn(pm);
-		pmfControl.setReturnValue(pm, 1);
+		final PersistenceManagerFactory pmf2 = mock(PersistenceManagerFactory.class);
-		pm.close();
+		PersistenceManager pm2 = mock(PersistenceManager.class);
-		pmControl.setVoidCallable(1);
-		pmfControl.replay();
-		pmControl.replay();
 
-		MockControl pmf2Control = MockControl.createControl(PersistenceManagerFactory.class);
+		given(pmf2.getPersistenceManager()).willReturn(pm2);
-		final PersistenceManagerFactory pmf2 = (PersistenceManagerFactory) pmf2Control.getMock();
-		MockControl pm2Control = MockControl.createControl(PersistenceManager.class);
-		PersistenceManager pm2 = (PersistenceManager) pm2Control.getMock();
-
-		pmf2.getPersistenceManager();
-		pmf2Control.setReturnValue(pm2, 1);
-		pm2.close();
-		pm2Control.setVoidCallable(1);
-		pmf2Control.replay();
-		pm2Control.replay();
 
 		MockServletContext sc = new MockServletContext();
 		StaticWebApplicationContext wac = new StaticWebApplicationContext();
@@ -171,10 +143,8 @@ public class OpenPersistenceManagerInViewTests extends TestCase {
 		assertFalse(TransactionSynchronizationManager.hasResource(pmf2));
 		assertNotNull(request.getAttribute("invoked"));
 
-		pmfControl.verify();
+		verify(pm).close();
-		pmControl.verify();
+		verify(pm2).close();
-		pmf2Control.verify();
-		pm2Control.verify();
 
 		wac.close();
 	}

spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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,13 +16,17 @@
 
 package org.springframework.orm.jpa;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.PersistenceException;
 import javax.persistence.spi.PersistenceUnitInfo;
 
-import junit.framework.TestCase;
+import org.junit.After;
-import org.easymock.MockControl;
+import org.junit.Before;
-
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 /**
@@ -31,18 +35,23 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
+ * @author Phillip Webb
  */
-public abstract class AbstractEntityManagerFactoryBeanTests extends TestCase {
+public abstract class AbstractEntityManagerFactoryBeanTests {
-
-	protected static MockControl emfMc;
 
 	protected static EntityManagerFactory mockEmf;
 
+	@Before
+	public void setUp() throws Exception {
+		mockEmf = mock(EntityManagerFactory.class);
+	}
 
-	@Override
+	@After
-	protected void setUp() throws Exception {
+	public void tearDown() throws Exception {
-		emfMc = MockControl.createControl(EntityManagerFactory.class);
+		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
-		mockEmf = (EntityManagerFactory) emfMc.getMock();
+		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
+		assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
+		assertFalse(TransactionSynchronizationManager.isActualTransactionActive());
 	}
 
 	protected void checkInvariants(AbstractEntityManagerFactoryBean demf) {
@@ -56,14 +65,6 @@ public abstract class AbstractEntityManagerFactoryBeanTests extends TestCase {
 		assertSame(emfi.getNativeEntityManagerFactory(), mockEmf);
 	}
 
-	@Override
-	protected void tearDown() throws Exception {
-		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
-		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
-		assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
-		assertFalse(TransactionSynchronizationManager.isActualTransactionActive());
-	}
-
 
 	protected static class DummyEntityManagerFactoryBean extends AbstractEntityManagerFactoryBean {
 

spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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,35 +16,29 @@
 
 package org.springframework.orm.jpa;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+
 import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
 import javax.persistence.OptimisticLockException;
 
-import junit.framework.TestCase;
+import org.junit.Test;
-
-import org.easymock.MockControl;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionException;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
 
 /**
- *
  * @author Costin Leau
- *
+ * @author Phillip Webb
  */
-public class DefaultJpaDialectTests extends TestCase {
+public class DefaultJpaDialectTests {
-	JpaDialect dialect;
 
-	@Override
+	private JpaDialect dialect = new DefaultJpaDialect();
-	protected void setUp() throws Exception {
-		dialect = new DefaultJpaDialect();
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		dialect = null;
-	}
 
+	@Test
 	public void testDefaultTransactionDefinition() throws Exception {
 		DefaultTransactionDefinition definition = new DefaultTransactionDefinition();
 		definition.setIsolationLevel(TransactionDefinition.ISOLATION_REPEATABLE_READ);
@@ -58,26 +52,18 @@ public class DefaultJpaDialectTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testDefaultBeginTransaction() throws Exception {
 		TransactionDefinition definition = new DefaultTransactionDefinition();
-		MockControl entityControl = MockControl.createControl(EntityManager.class);
+		EntityManager entityManager = mock(EntityManager.class);
-		EntityManager entityManager = (EntityManager) entityControl.getMock();
+		EntityTransaction entityTx = mock(EntityTransaction.class);
 
-		MockControl txControl = MockControl.createControl(EntityTransaction.class);
+		given(entityManager.getTransaction()).willReturn(entityTx);
-		EntityTransaction entityTx = (EntityTransaction) txControl.getMock();
-
-		entityControl.expectAndReturn(entityManager.getTransaction(), entityTx);
-		entityTx.begin();
-
-		entityControl.replay();
-		txControl.replay();
 
 		dialect.beginTransaction(entityManager, definition);
-
-		entityControl.verify();
-		txControl.verify();
 	}
 
+	@Test
 	public void testTranslateException() {
 		OptimisticLockException ex = new OptimisticLockException();
 		assertEquals(

spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryBeanSupportTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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,19 +16,17 @@
 
 package org.springframework.orm.jpa;
 
+import static org.mockito.Mockito.verify;
+
+import org.junit.Test;
+
 /**
  * @author Rod Johnson
+ * @author Phillip Webb
  */
 public class EntityManagerFactoryBeanSupportTests extends AbstractEntityManagerFactoryBeanTests {
 
-	@Override
+	@Test
-	protected void setUp() throws Exception {
-		super.setUp();
-		mockEmf.close();
-		emfMc.setVoidCallable();
-		emfMc.replay();
-	}
-
 	public void testHookIsCalled() throws Exception {
 		DummyEntityManagerFactoryBean demf = new DummyEntityManagerFactoryBean(mockEmf);
 
@@ -39,7 +37,7 @@ public class EntityManagerFactoryBeanSupportTests extends AbstractEntityManagerF
 		// Should trigger close method expected by EntityManagerFactory mock
 		demf.destroy();
 
-		emfMc.verify();
+		verify(mockEmf).close();
 	}
 
 }

spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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,6 +16,13 @@
 
 package org.springframework.orm.jpa;
 
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+
 import javax.persistence.EntityExistsException;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
@@ -26,9 +33,7 @@ import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceException;
 import javax.persistence.TransactionRequiredException;
 
-import junit.framework.TestCase;
+import org.junit.Test;
-import org.easymock.MockControl;
-
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.dao.EmptyResultDataAccessException;
@@ -40,13 +45,15 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
  * @author Costin Leau
  * @author Rod Johnson
  * @author Juergen Hoeller
+ * @author Phillip Webb
  */
-public class EntityManagerFactoryUtilsTests extends TestCase {
+public class EntityManagerFactoryUtilsTests {
 
 	/*
 	 * Test method for
 	 * 'org.springframework.orm.jpa.EntityManagerFactoryUtils.doGetEntityManager(EntityManagerFactory)'
 	 */
+	@Test
 	public void testDoGetEntityManager() {
 		// test null assertion
 		try {
@@ -56,34 +63,25 @@ public class EntityManagerFactoryUtilsTests extends TestCase {
 		catch (IllegalArgumentException ex) {
 			// it's okay
 		}
-		MockControl mockControl = MockControl.createControl(EntityManagerFactory.class);
+		EntityManagerFactory factory = mock(EntityManagerFactory.class);
-		EntityManagerFactory factory = (EntityManagerFactory) mockControl.getMock();
 
-		mockControl.replay();
 		// no tx active
 		assertNull(EntityManagerFactoryUtils.doGetTransactionalEntityManager(factory, null));
-		mockControl.verify();
-
 		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
 	}
 
+	@Test
 	public void testDoGetEntityManagerWithTx() throws Exception {
 		try {
-			MockControl mockControl = MockControl.createControl(EntityManagerFactory.class);
+			EntityManagerFactory factory = mock(EntityManagerFactory.class);
-			EntityManagerFactory factory = (EntityManagerFactory) mockControl.getMock();
+			EntityManager manager = mock(EntityManager.class);
-
-			MockControl managerControl = MockControl.createControl(EntityManager.class);
-			EntityManager manager = (EntityManager) managerControl.getMock();
 
 			TransactionSynchronizationManager.initSynchronization();
-			mockControl.expectAndReturn(factory.createEntityManager(), manager);
+			given(factory.createEntityManager()).willReturn(manager);
 
-			mockControl.replay();
 			// no tx active
 			assertSame(manager, EntityManagerFactoryUtils.doGetTransactionalEntityManager(factory, null));
 			assertSame(manager, ((EntityManagerHolder)TransactionSynchronizationManager.unbindResource(factory)).getEntityManager());
-
-			mockControl.verify();
 		}
 		finally {
 			TransactionSynchronizationManager.clearSynchronization();
@@ -92,6 +90,7 @@ public class EntityManagerFactoryUtilsTests extends TestCase {
 		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
 	}
 
+	@Test
 	public void testTranslatesIllegalStateException() {
 		IllegalStateException ise = new IllegalStateException();
 		DataAccessException dex = EntityManagerFactoryUtils.convertJpaAccessExceptionIfPossible(ise);
@@ -99,6 +98,7 @@ public class EntityManagerFactoryUtilsTests extends TestCase {
 		assertTrue(dex instanceof InvalidDataAccessApiUsageException);
 	}
 
+	@Test
 	public void testTranslatesIllegalArgumentException() {
 		IllegalArgumentException iae = new IllegalArgumentException();
 		DataAccessException dex = EntityManagerFactoryUtils.convertJpaAccessExceptionIfPossible(iae);
@@ -109,6 +109,7 @@ public class EntityManagerFactoryUtilsTests extends TestCase {
 	/**
 	 * We do not convert unknown exceptions. They may result from user code.
 	 */
+	@Test
 	public void testDoesNotTranslateUnfamiliarException() {
 		UnsupportedOperationException userRuntimeException = new UnsupportedOperationException();
 		assertNull(
@@ -120,6 +121,7 @@ public class EntityManagerFactoryUtilsTests extends TestCase {
 	 * Test method for
 	 * 'org.springframework.orm.jpa.EntityManagerFactoryUtils.convertJpaAccessException(PersistenceException)'
 	 */
+	@Test
 	@SuppressWarnings("serial")
 	public void testConvertJpaPersistenceException() {
 		EntityNotFoundException entityNotFound = new EntityNotFoundException();

spring-orm/src/test/java/org/springframework/orm/jpa/JpaInterceptorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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,59 +16,57 @@
 
 package org.springframework.orm.jpa;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.BDDMockito.willThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Method;
+
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.PersistenceException;
 
-import junit.framework.TestCase;
 import org.aopalliance.intercept.Interceptor;
 import org.aopalliance.intercept.Invocation;
 import org.aopalliance.intercept.MethodInvocation;
-import org.easymock.MockControl;
+import org.junit.After;
-
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 /**
  * @author Costin Leau
+ * @author Phillip Webb
  */
-public class JpaInterceptorTests extends TestCase {
+public class JpaInterceptorTests {
-
-	private MockControl factoryControl, managerControl;
 
 	private EntityManagerFactory factory;
 
 	private EntityManager entityManager;
 
 
-	@Override
+	@Before
-	protected void setUp() throws Exception {
+	public void setUp() throws Exception {
-		factoryControl = MockControl.createControl(EntityManagerFactory.class);
+		factory = mock(EntityManagerFactory.class);
-		factory = (EntityManagerFactory) factoryControl.getMock();
+		entityManager = mock(EntityManager.class);
-		managerControl = MockControl.createControl(EntityManager.class);
-		entityManager = (EntityManager) managerControl.getMock();
 	}
 
-	@Override
+	@After
-	protected void tearDown() throws Exception {
+	public void tearDown() throws Exception {
 		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
-
-		factoryControl = null;
-		factory = null;
-		managerControl = null;
-		entityManager = null;
-
 	}
 
+	@Test
 	public void testInterceptorWithNewEntityManager() throws PersistenceException {
-		factoryControl.expectAndReturn(factory.createEntityManager(), entityManager);
+		given(factory.createEntityManager()).willReturn(entityManager);
-		managerControl.expectAndReturn(entityManager.isOpen(), true);
+		given(entityManager.isOpen()).willReturn(true);
-		entityManager.close();
-
-		factoryControl.replay();
-		managerControl.replay();
 
 		JpaInterceptor interceptor = new JpaInterceptor();
 		interceptor.setEntityManagerFactory(factory);
@@ -79,17 +77,13 @@ public class JpaInterceptorTests extends TestCase {
 			fail("Should not have thrown Throwable: " + t.getMessage());
 		}
 
-		factoryControl.verify();
+		verify(entityManager).close();
-		managerControl.verify();
 	}
 
+	@Test
 	public void testInterceptorWithNewEntityManagerAndLazyFlush() throws PersistenceException {
-		factoryControl.expectAndReturn(factory.createEntityManager(), entityManager);
+		given(factory.createEntityManager()).willReturn(entityManager);
-		managerControl.expectAndReturn(entityManager.isOpen(), true);
+		given(entityManager.isOpen()).willReturn(true);
-		entityManager.close();
-
-		factoryControl.replay();
-		managerControl.replay();
 
 		JpaInterceptor interceptor = new JpaInterceptor();
 		interceptor.setFlushEager(false);
@@ -101,14 +95,11 @@ public class JpaInterceptorTests extends TestCase {
 			fail("Should not have thrown Throwable: " + t.getMessage());
 		}
 
-		factoryControl.verify();
+		verify(entityManager).close();
-		managerControl.verify();
 	}
 
+	@Test
 	public void testInterceptorWithThreadBound() {
-		factoryControl.replay();
-		managerControl.replay();
-
 		TransactionSynchronizationManager.bindResource(factory, new EntityManagerHolder(entityManager));
 		JpaInterceptor interceptor = new JpaInterceptor();
 		interceptor.setEntityManagerFactory(factory);
@@ -121,18 +112,10 @@ public class JpaInterceptorTests extends TestCase {
 		finally {
 			TransactionSynchronizationManager.unbindResource(factory);
 		}
-
-		factoryControl.verify();
-		managerControl.verify();
 	}
 
+	@Test
 	public void testInterceptorWithThreadBoundAndFlushEager() throws PersistenceException {
-		//entityManager.setFlushMode(FlushModeType.AUTO);
-		entityManager.flush();
-
-		factoryControl.replay();
-		managerControl.replay();
-
 		TransactionSynchronizationManager.bindResource(factory, new EntityManagerHolder(entityManager));
 		JpaInterceptor interceptor = new JpaInterceptor();
 		interceptor.setFlushEager(true);
@@ -147,17 +130,11 @@ public class JpaInterceptorTests extends TestCase {
 			TransactionSynchronizationManager.unbindResource(factory);
 		}
 
-		factoryControl.verify();
+		verify(entityManager).flush();
-		managerControl.verify();
 	}
 
+	@Test
 	public void testInterceptorWithThreadBoundAndFlushCommit() {
-		//entityManager.setFlushMode(FlushModeType.COMMIT);
-		//entityManager.flush();
-
-		factoryControl.replay();
-		managerControl.replay();
-
 		TransactionSynchronizationManager.bindResource(factory, new EntityManagerHolder(entityManager));
 		JpaInterceptor interceptor = new JpaInterceptor();
 		interceptor.setFlushEager(false);
@@ -171,22 +148,15 @@ public class JpaInterceptorTests extends TestCase {
 		finally {
 			TransactionSynchronizationManager.unbindResource(factory);
 		}
-
-		factoryControl.verify();
-		managerControl.verify();
 	}
 
+	@Test
 	public void testInterceptorWithFlushFailure() throws Throwable {
-		factoryControl.expectAndReturn(factory.createEntityManager(), entityManager);
+		given(factory.createEntityManager()).willReturn(entityManager);
-		entityManager.flush();
 
 		PersistenceException exception = new PersistenceException();
-		managerControl.setThrowable(exception, 1);
+		willThrow(exception).given(entityManager).flush();
-		managerControl.expectAndReturn(entityManager.isOpen(), true);
+		given(entityManager.isOpen()).willReturn(true);
-		entityManager.close();
-
-		factoryControl.replay();
-		managerControl.replay();
 
 		JpaInterceptor interceptor = new JpaInterceptor();
 		interceptor.setFlushEager(true);
@@ -200,21 +170,16 @@ public class JpaInterceptorTests extends TestCase {
 			assertEquals(exception, ex.getCause());
 		}
 
-		factoryControl.verify();
+		verify(entityManager).close();
-		managerControl.verify();
 	}
 
+	@Test
 	public void testInterceptorWithFlushFailureWithoutConversion() throws Throwable {
-		factoryControl.expectAndReturn(factory.createEntityManager(), entityManager);
+		given(factory.createEntityManager()).willReturn(entityManager);
-		entityManager.flush();
 
 		PersistenceException exception = new PersistenceException();
-		managerControl.setThrowable(exception, 1);
+		willThrow(exception).given(entityManager).flush();
-		managerControl.expectAndReturn(entityManager.isOpen(), true);
+		given(entityManager.isOpen()).willReturn(true);
-		entityManager.close();
-
-		factoryControl.replay();
-		managerControl.replay();
 
 		JpaInterceptor interceptor = new JpaInterceptor();
 		interceptor.setFlushEager(true);
@@ -229,8 +194,7 @@ public class JpaInterceptorTests extends TestCase {
 			assertEquals(exception, ex);
 		}
 
-		factoryControl.verify();
+		verify(entityManager).close();
-		managerControl.verify();
 	}
 
 

spring-orm/src/test/java/org/springframework/orm/jpa/JpaTemplateTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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,61 +16,58 @@
 
 package org.springframework.orm.jpa;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.PersistenceException;
 import javax.persistence.Query;
 
-import junit.framework.TestCase;
+import org.junit.Before;
-import org.easymock.MockControl;
+import org.junit.Test;
-
 import org.springframework.dao.DataAccessException;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 /**
  * @author Costin Leau
+ * @author Phillip Webb
  */
-public class JpaTemplateTests extends TestCase {
+public class JpaTemplateTests {
 
 	private JpaTemplate template;
 
-	private MockControl factoryControl, managerControl;
-
 	private EntityManager manager;
 
 	private EntityManagerFactory factory;
 
-	@Override
+	@Before
-	protected void setUp() throws Exception {
+	public void setUp() throws Exception {
 		template = new JpaTemplate();
 
-		factoryControl = MockControl.createControl(EntityManagerFactory.class);
+		factory = mock(EntityManagerFactory.class);
-		factory = (EntityManagerFactory) factoryControl.getMock();
+		manager = mock(EntityManager.class);
-		managerControl = MockControl.createControl(EntityManager.class);
-		manager = (EntityManager) managerControl.getMock();
 
 		template.setEntityManager(manager);
 		template.afterPropertiesSet();
 
 	}
 
-	@Override
-	protected void tearDown() throws Exception {
-		template = null;
-		factoryControl = null;
-		managerControl = null;
-		manager = null;
-		factory = null;
-	}
-
 	/*
 	 * Test method for
 	 * 'org.springframework.orm.jpa.JpaTemplate.JpaTemplate(EntityManagerFactory)'
 	 */
+	@Test
 	public void testJpaTemplateEntityManagerFactory() {
 
 	}
@@ -79,6 +76,7 @@ public class JpaTemplateTests extends TestCase {
 	 * Test method for
 	 * 'org.springframework.orm.jpa.JpaTemplate.JpaTemplate(EntityManager)'
 	 */
+	@Test
 	public void testJpaTemplateEntityManager() {
 
 	}
@@ -87,14 +85,12 @@ public class JpaTemplateTests extends TestCase {
 	 * Test method for
 	 * 'org.springframework.orm.jpa.JpaTemplate.execute(JpaCallback)'
 	 */
+	@Test
 	public void testExecuteJpaCallback() {
 		template.setExposeNativeEntityManager(true);
 		template.setEntityManager(manager);
 		template.afterPropertiesSet();
 
-		managerControl.replay();
-		factoryControl.replay();
-
 		template.execute(new JpaCallback() {
 
 			@Override
@@ -113,22 +109,18 @@ public class JpaTemplateTests extends TestCase {
 				return null;
 			}
 		});
-		managerControl.verify();
-		factoryControl.verify();
 	}
 
 	/*
 	 * Test method for
 	 * 'org.springframework.orm.jpa.JpaTemplate.executeFind(JpaCallback)'
 	 */
+	@Test
 	public void testExecuteFind() {
 		template.setEntityManager(manager);
 		template.setExposeNativeEntityManager(true);
 		template.afterPropertiesSet();
 
-		managerControl.replay();
-		factoryControl.replay();
-
 		try {
 			template.executeFind(new JpaCallback() {
 
@@ -143,28 +135,23 @@ public class JpaTemplateTests extends TestCase {
 		catch (DataAccessException e) {
 			// expected
 		}
-
-		managerControl.verify();
-		factoryControl.verify();
 	}
 
 	/*
 	 * Test method for
 	 * 'org.springframework.orm.jpa.JpaTemplate.execute(JpaCallback, boolean)'
 	 */
+	@Test
 	public void testExecuteJpaCallbackBoolean() {
 		template = new JpaTemplate();
 		template.setExposeNativeEntityManager(false);
 		template.setEntityManagerFactory(factory);
 		template.afterPropertiesSet();
 
-		factoryControl.expectAndReturn(factory.createEntityManager(), manager);
+		given(factory.createEntityManager()).willReturn(manager);
-		managerControl.expectAndReturn(manager.isOpen(), true);
+		given(manager.isOpen()).willReturn(true);
 		manager.close();
 
-		managerControl.replay();
-		factoryControl.replay();
-
 		template.execute(new JpaCallback() {
 			@Override
 			public Object doInJpa(EntityManager em) throws PersistenceException {
@@ -172,19 +159,15 @@ public class JpaTemplateTests extends TestCase {
 				return null;
 			}
 		}, true);
-
-		managerControl.verify();
-		factoryControl.verify();
 	}
 
+	@Test
 	public void testExecuteJpaCallbackBooleanWithPrebound() {
 		template.setExposeNativeEntityManager(false);
 		template.setEntityManagerFactory(factory);
 		template.afterPropertiesSet();
 
 		TransactionSynchronizationManager.bindResource(factory, new EntityManagerHolder(manager));
-		managerControl.replay();
-		factoryControl.replay();
 
 		try {
 			template.execute(new JpaCallback() {
@@ -195,9 +178,6 @@ public class JpaTemplateTests extends TestCase {
 					return null;
 				}
 			}, true);
-
-			managerControl.verify();
-			factoryControl.verify();
 		}
 		finally {
 			TransactionSynchronizationManager.unbindResource(factory);
@@ -208,9 +188,8 @@ public class JpaTemplateTests extends TestCase {
 	 * Test method for
 	 * 'org.springframework.orm.jpa.JpaTemplate.createSharedEntityManager(EntityManager)'
 	 */
+	@Test
 	public void testCreateEntityManagerProxy() {
-		manager.clear();
-		managerControl.replay();
 
 		EntityManager proxy = template.createEntityManagerProxy(manager);
 		assertNotSame(manager, proxy);
@@ -220,24 +199,20 @@ public class JpaTemplateTests extends TestCase {
 		proxy.close();
 		proxy.clear();
 
-		managerControl.verify();
+		verify(manager).clear();
 	}
 
 	/*
 	 * Test method for 'org.springframework.orm.jpa.JpaTemplate.find(Class<T>,
 	 * Object) <T>'
 	 */
+	@Test
 	public void testFindClassOfTObject() {
 		Integer result = new Integer(1);
 		Object id = new Object();
-		managerControl.expectAndReturn(manager.find(Number.class, id), result);
+		given(manager.find(Number.class, id)).willReturn(result);
-		managerControl.replay();
-		factoryControl.replay();
 
 		assertSame(result, template.find(Number.class, id));
-
-		managerControl.verify();
-		factoryControl.verify();
 	}
 
 	/*
@@ -245,172 +220,122 @@ public class JpaTemplateTests extends TestCase {
 	 * 'org.springframework.orm.jpa.JpaTemplate.getReference(Class<T>, Object)
 	 * <T>'
 	 */
+	@Test
 	public void testGetReference() {
 		Integer reference = new Integer(1);
 		Object id = new Object();
-		managerControl.expectAndReturn(manager.getReference(Number.class, id), reference);
+		given(manager.getReference(Number.class, id)).willReturn(reference);
-		managerControl.replay();
-		factoryControl.replay();
 
 		assertSame(reference, template.getReference(Number.class, id));
-
-		managerControl.verify();
-		factoryControl.verify();
 	}
 
 	/*
 	 * Test method for
 	 * 'org.springframework.orm.jpa.JpaTemplate.contains(Object)'
 	 */
+	@Test
 	public void testContains() {
 		boolean result = true;
 		Object entity = new Object();
-		managerControl.expectAndReturn(manager.contains(entity), result);
+		given(manager.contains(entity)).willReturn(result);
-		managerControl.replay();
-		factoryControl.replay();
 
 		assertSame(result, template.contains(entity));
-
-		managerControl.verify();
-		factoryControl.verify();
 	}
 
 	/*
 	 * Test method for 'org.springframework.orm.jpa.JpaTemplate.refresh(Object)'
 	 */
+	@Test
 	public void testRefresh() {
 		Object entity = new Object();
-		manager.refresh(entity);
-		managerControl.replay();
-		factoryControl.replay();
-
 		template.refresh(entity);
-
+		verify(manager).refresh(entity);
-		managerControl.verify();
-		factoryControl.verify();
 	}
 
 	/*
 	 * Test method for 'org.springframework.orm.jpa.JpaTemplate.persist(Object)'
 	 */
+	@Test
 	public void testPersist() {
 		Object entity = new Object();
-		manager.persist(entity);
-		managerControl.replay();
-		factoryControl.replay();
-
 		template.persist(entity);
-
+		verify(manager).persist(entity);
-		managerControl.verify();
-		factoryControl.verify();
 	}
 
 	/*
 	 * Test method for 'org.springframework.orm.jpa.JpaTemplate.merge(T) <T>'
 	 */
+	@Test
 	public void testMerge() {
 		Object result = new Object();
 		Object entity = new Object();
-		managerControl.expectAndReturn(manager.merge(entity), result);
+		given(manager.merge(entity)).willReturn(result);
-		managerControl.replay();
-		factoryControl.replay();
-
 		assertSame(result, template.merge(entity));
-
-		managerControl.verify();
-		factoryControl.verify();
 	}
 
 	/*
 	 * Test method for 'org.springframework.orm.jpa.JpaTemplate.remove(Object)'
 	 */
+	@Test
 	public void testRemove() {
 		Object entity = new Object();
-		manager.remove(entity);
-		managerControl.replay();
-		factoryControl.replay();
-
 		template.remove(entity);
-
+		verify(manager).remove(entity);
-		managerControl.verify();
-		factoryControl.verify();
 	}
 
 	/*
 	 * Test method for 'org.springframework.orm.jpa.JpaTemplate.flush()'
 	 */
+	@Test
 	public void testFlush() {
-		manager.flush();
-		managerControl.replay();
-		factoryControl.replay();
-
 		template.flush();
-
+		verify(manager).flush();
-		managerControl.verify();
-		factoryControl.verify();
 	}
 
 	/*
 	 * Test method for 'org.springframework.orm.jpa.JpaTemplate.find(String)'
 	 */
+	@Test
 	public void testFindString() {
 		String queryString = "some query";
-		MockControl queryControl = MockControl.createControl(Query.class);
+		Query query = mock(Query.class);
-		Query query = (Query) queryControl.getMock();
 		List result = new ArrayList();
 
-		managerControl.expectAndReturn(manager.createQuery(queryString), query);
+		given(manager.createQuery(queryString)).willReturn(query);
-		queryControl.expectAndReturn(query.getResultList(), result);
+		given(query.getResultList()).willReturn(result);
-
-		managerControl.replay();
-		factoryControl.replay();
-		queryControl.replay();
-
 		assertSame(result, template.find(queryString));
-
-		managerControl.verify();
-		factoryControl.verify();
-		queryControl.verify();
 	}
 
 	/*
 	 * Test method for 'org.springframework.orm.jpa.JpaTemplate.find(String,
 	 * Object...)'
 	 */
+	@Test
 	public void testFindStringObjectArray() {
 		String queryString = "some query";
-		MockControl queryControl = MockControl.createControl(Query.class);
+		Query query = mock(Query.class);
-		Query query = (Query) queryControl.getMock();
 		List result = new ArrayList();
 		Object param1 = new Object();
 		Object param2 = new Object();
 		Object[] params = new Object[] { param1, param2 };
 
-		managerControl.expectAndReturn(manager.createQuery(queryString), query);
+		given(manager.createQuery(queryString)).willReturn(query);
-		queryControl.expectAndReturn(query.setParameter(1, param1), null);
+		given(query.getResultList()).willReturn(result);
-		queryControl.expectAndReturn(query.setParameter(2, param2), null);
-
-		queryControl.expectAndReturn(query.getResultList(), result);
-
-		managerControl.replay();
-		factoryControl.replay();
-		queryControl.replay();
 
 		assertSame(result, template.find(queryString, params));
 
-		managerControl.verify();
+		verify(query).setParameter(1, param1);
-		factoryControl.verify();
+		verify(query).setParameter(2, param2);
-		queryControl.verify();
 	}
 
 	/*
 	 * Test method for 'org.springframework.orm.jpa.JpaTemplate.find(String, Map<String,
 	 * Object>)'
 	 */
+	@Test
 	public void testFindStringMapOfStringObject() {
 		String queryString = "some query";
-		MockControl queryControl = MockControl.createControl(Query.class);
+		Query query = mock(Query.class);
-		Query query = (Query) queryControl.getMock();
 		List result = new ArrayList();
 		Object param1 = new Object();
 		Object param2 = new Object();
@@ -418,46 +343,29 @@ public class JpaTemplateTests extends TestCase {
 		params.put("param1", param1);
 		params.put("param2", param2);
 
-		managerControl.expectAndReturn(manager.createQuery(queryString), query);
+		given(manager.createQuery(queryString)).willReturn(query);
-		queryControl.expectAndReturn(query.setParameter("param1", param1), null);
+		given(query.getResultList()).willReturn(result);
-		queryControl.expectAndReturn(query.setParameter("param2", param2), null);
-
-		queryControl.expectAndReturn(query.getResultList(), result);
-
-		managerControl.replay();
-		factoryControl.replay();
-		queryControl.replay();
 
 		assertSame(result, template.findByNamedParams(queryString, params));
 
-		managerControl.verify();
+		verify(query).setParameter("param1", param1);
-		factoryControl.verify();
+		verify(query).setParameter("param2", param2);
-		queryControl.verify();
 	}
 
 	/*
 	 * Test method for
 	 * 'org.springframework.orm.jpa.JpaTemplate.findByNamedQuery(String)'
 	 */
+	@Test
 	public void testFindByNamedQueryString() {
 		String queryName = "some query name";
-		MockControl queryControl = MockControl.createControl(Query.class);
+		Query query = mock(Query.class);
-		Query query = (Query) queryControl.getMock();
 		List result = new ArrayList();
 
-		managerControl.expectAndReturn(manager.createNamedQuery(queryName), query);
+		given(manager.createNamedQuery(queryName)).willReturn(query);
-
+		given(query.getResultList()).willReturn(result);
-		queryControl.expectAndReturn(query.getResultList(), result);
-
-		managerControl.replay();
-		factoryControl.replay();
-		queryControl.replay();
 
 		assertSame(result, template.findByNamedQuery(queryName));
-
-		managerControl.verify();
-		factoryControl.verify();
-		queryControl.verify();
 	}
 
 	/*
@@ -465,30 +373,22 @@ public class JpaTemplateTests extends TestCase {
 	 * 'org.springframework.orm.jpa.JpaTemplate.findByNamedQuery(String,
 	 * Object...)'
 	 */
+	@Test
 	public void testFindByNamedQueryStringObjectArray() {
 		String queryName = "some query name";
-		MockControl queryControl = MockControl.createControl(Query.class);
+		Query query = mock(Query.class);
-		Query query = (Query) queryControl.getMock();
 		List result = new ArrayList();
 		Object param1 = new Object();
 		Object param2 = new Object();
 		Object[] params = new Object[] { param1, param2 };
 
-		managerControl.expectAndReturn(manager.createNamedQuery(queryName), query);
+		given(manager.createNamedQuery(queryName)).willReturn(query);
-		queryControl.expectAndReturn(query.setParameter(1, param1), null);
+		given(query.getResultList()).willReturn(result);
-		queryControl.expectAndReturn(query.setParameter(2, param2), null);
-
-		queryControl.expectAndReturn(query.getResultList(), result);
-
-		managerControl.replay();
-		factoryControl.replay();
-		queryControl.replay();
 
 		assertSame(result, template.findByNamedQuery(queryName, params));
 
-		managerControl.verify();
+		verify(query).setParameter(1, param1);
-		factoryControl.verify();
+		verify(query).setParameter(2, param2);
-		queryControl.verify();
 	}
 
 	/*
@@ -496,10 +396,10 @@ public class JpaTemplateTests extends TestCase {
 	 * 'org.springframework.orm.jpa.JpaTemplate.findByNamedQuery(String, Map<String,
 	 * Object>)'
 	 */
+	@Test
 	public void testFindByNamedQueryStringMapOfStringObject() {
 		String queryName = "some query name";
-		MockControl queryControl = MockControl.createControl(Query.class);
+		Query query = mock(Query.class);
-		Query query = (Query) queryControl.getMock();
 		List result = new ArrayList();
 		Object param1 = new Object();
 		Object param2 = new Object();
@@ -507,21 +407,11 @@ public class JpaTemplateTests extends TestCase {
 		params.put("param1", param1);
 		params.put("param2", param2);
 
-		managerControl.expectAndReturn(manager.createNamedQuery(queryName), query);
+		given(manager.createNamedQuery(queryName)).willReturn(query);
-		queryControl.expectAndReturn(query.setParameter("param1", param1), null);
+		given(query.getResultList()).willReturn(result);
-		queryControl.expectAndReturn(query.setParameter("param2", param2), null);
-
-		queryControl.expectAndReturn(query.getResultList(), result);
-
-		managerControl.replay();
-		factoryControl.replay();
-		queryControl.replay();
 
 		assertSame(result, template.findByNamedQueryAndNamedParams(queryName, params));
-
+		verify(query).setParameter("param1", param1);
-		managerControl.verify();
+		verify(query).setParameter("param2", param2);
-		factoryControl.verify();
-		queryControl.verify();
 	}
-
 }

spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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,9 +16,21 @@
 
 package org.springframework.orm.jpa;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.BDDMockito.willThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
@@ -26,9 +38,9 @@ import javax.persistence.PersistenceException;
 import javax.persistence.RollbackException;
 import javax.sql.DataSource;
 
-import junit.framework.TestCase;
+import org.junit.After;
-import org.easymock.MockControl;
+import org.junit.Before;
-
+import org.junit.Test;
 import org.springframework.transaction.InvalidIsolationLevelException;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionStatus;
@@ -42,10 +54,9 @@ import org.springframework.transaction.support.TransactionTemplate;
 /**
  * @author Costin Leau
  * @author Juergen Hoeller
+ * @author Phillip Webb
  */
-public class JpaTransactionManagerTests extends TestCase {
+public class JpaTransactionManagerTests {
-
-	private MockControl factoryControl, managerControl, txControl;
 
 	private EntityManager manager;
 
@@ -60,46 +71,33 @@ public class JpaTransactionManagerTests extends TestCase {
 	private TransactionTemplate tt;
 
 
-	@Override
+	@Before
-	protected void setUp() throws Exception {
+	public void setUp() throws Exception {
-		factoryControl = MockControl.createControl(EntityManagerFactory.class);
+		factory = mock(EntityManagerFactory.class);
-		factory = (EntityManagerFactory) factoryControl.getMock();
+		manager = mock(EntityManager.class);
-		managerControl = MockControl.createControl(EntityManager.class);
+		tx = mock(EntityTransaction.class);
-		manager = (EntityManager) managerControl.getMock();
-		txControl = MockControl.createControl(EntityTransaction.class);
-		tx = (EntityTransaction) txControl.getMock();
 
 		transactionManager = new JpaTransactionManager(factory);
 		template = new JpaTemplate(factory);
 		template.afterPropertiesSet();
 		tt = new TransactionTemplate(transactionManager);
 
-		factoryControl.expectAndReturn(factory.createEntityManager(), manager);
+		given(factory.createEntityManager()).willReturn(manager);
-		managerControl.expectAndReturn(manager.getTransaction(), tx);
+		given(manager.getTransaction()).willReturn(tx);
-		tx.begin();
+		given(manager.isOpen()).willReturn(true);
-		managerControl.expectAndReturn(manager.isOpen(), true);
-		manager.close();
 	}
 
-	@Override
+	@After
-	protected void tearDown() throws Exception {
+	public void tearDown() throws Exception {
 		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 		assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 		assertFalse(TransactionSynchronizationManager.isActualTransactionActive());
 	}
 
-
+	@Test
 	public void testTransactionCommit() {
-		managerControl.expectAndReturn(manager.getTransaction(), tx);
+		given(manager.getTransaction()).willReturn(tx);
-		txControl.expectAndReturn(tx.getRollbackOnly(), false);
-		managerControl.expectAndReturn(manager.getTransaction(), tx);
-		tx.commit();
-		manager.flush();
-
-		factoryControl.replay();
-		managerControl.replay();
-		txControl.replay();
 
 		final List<String> l = new ArrayList<String>();
 		l.add("test");
@@ -125,22 +123,16 @@ public class JpaTransactionManagerTests extends TestCase {
 		assertTrue(!TransactionSynchronizationManager.hasResource(factory));
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
 
-		factoryControl.verify();
+		verify(tx).commit();
-		managerControl.verify();
+		verify(manager).flush();
-		txControl.verify();
+		verify(manager).close();
 	}
 
+	@Test
 	public void testTransactionCommitWithRollbackException() {
-		managerControl.expectAndReturn(manager.getTransaction(), tx);
+		given(manager.getTransaction()).willReturn(tx);
-		txControl.expectAndReturn(tx.getRollbackOnly(), true);
+		given(tx.getRollbackOnly()).willReturn(true);
-		managerControl.expectAndReturn(manager.getTransaction(), tx);
+		willThrow(new RollbackException()).given(tx).commit();
-		tx.commit();
-		txControl.setThrowable(new RollbackException());
-		manager.flush();
-
-		factoryControl.replay();
-		managerControl.replay();
-		txControl.replay();
 
 		final List<String> l = new ArrayList<String>();
 		l.add("test");
@@ -172,19 +164,14 @@ public class JpaTransactionManagerTests extends TestCase {
 		assertTrue(!TransactionSynchronizationManager.hasResource(factory));
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
 
-		factoryControl.verify();
+		verify(manager).flush();
-		managerControl.verify();
+		verify(manager).close();
-		txControl.verify();
 	}
 
+	@Test
 	public void testTransactionRollback() {
-		managerControl.expectAndReturn(manager.getTransaction(), tx);
+		given(manager.getTransaction()).willReturn(tx);
-		txControl.expectAndReturn(tx.isActive(), true);
+		given(tx.isActive()).willReturn(true);
-		tx.rollback();
-
-		factoryControl.replay();
-		managerControl.replay();
-		txControl.replay();
 
 		final List<String> l = new ArrayList<String>();
 		l.add("test");
@@ -215,19 +202,13 @@ public class JpaTransactionManagerTests extends TestCase {
 		assertTrue(!TransactionSynchronizationManager.hasResource(factory));
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
 
-		factoryControl.verify();
+		verify(tx).rollback();
-		managerControl.verify();
+		verify(manager).close();
-		txControl.verify();
 	}
 
+	@Test
 	public void testTransactionRollbackWithAlreadyRolledBack() {
-		managerControl.expectAndReturn(manager.getTransaction(), tx);
+		given(manager.getTransaction()).willReturn(tx);
-		txControl.expectAndReturn(tx.isActive(), false);
-		// tx.rollback();
-
-		factoryControl.replay();
-		managerControl.replay();
-		txControl.replay();
 
 		final List<String> l = new ArrayList<String>();
 		l.add("test");
@@ -257,20 +238,13 @@ public class JpaTransactionManagerTests extends TestCase {
 		assertTrue(!TransactionSynchronizationManager.hasResource(factory));
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
 
-		factoryControl.verify();
+		verify(manager).close();
-		managerControl.verify();
-		txControl.verify();
 	}
 
+	@Test
 	public void testTransactionRollbackOnly() {
-		managerControl.expectAndReturn(manager.getTransaction(), tx);
+		given(manager.getTransaction()).willReturn(tx);
-		txControl.expectAndReturn(tx.isActive(), true);
+		given(tx.isActive()).willReturn(true);
-		manager.flush();
-		tx.rollback();
-
-		factoryControl.replay();
-		managerControl.replay();
-		txControl.replay();
 
 		final List<String> l = new ArrayList<String>();
 		l.add("test");
@@ -299,18 +273,14 @@ public class JpaTransactionManagerTests extends TestCase {
 		assertTrue(!TransactionSynchronizationManager.hasResource(factory));
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
 
-		factoryControl.verify();
+		verify(manager).flush();
-		managerControl.verify();
+		verify(tx).rollback();
-		txControl.verify();
+		verify(manager).close();
 	}
 
+	@Test
 	public void testParticipatingTransactionWithCommit() {
-		managerControl.expectAndReturn(manager.getTransaction(), tx, 2);
+		given(manager.getTransaction()).willReturn(tx);
-		manager.flush();
-
-		factoryControl.replay();
-		managerControl.replay();
-		txControl.replay();
 
 		final List<String> l = new ArrayList<String>();
 		l.add("test");
@@ -321,11 +291,6 @@ public class JpaTransactionManagerTests extends TestCase {
 		tt.execute(new TransactionCallback() {
 			@Override
 			public Object doInTransaction(TransactionStatus status) {
-				txControl.reset();
-				txControl.expectAndReturn(tx.getRollbackOnly(), false);
-				tx.commit();
-				txControl.replay();
-
 				assertTrue(TransactionSynchronizationManager.hasResource(factory));
 
 				return tt.execute(new TransactionCallback() {
@@ -347,16 +312,15 @@ public class JpaTransactionManagerTests extends TestCase {
 		assertTrue(!TransactionSynchronizationManager.hasResource(factory));
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
 
-		factoryControl.verify();
+		verify(manager).flush();
-		managerControl.verify();
+		verify(tx).commit();
-		txControl.verify();
+		verify(manager).close();
 	}
 
+	@Test
 	public void testParticipatingTransactionWithRollback() {
-		managerControl.expectAndReturn(manager.getTransaction(), tx, 2);
+		given(manager.getTransaction()).willReturn(tx);
-		factoryControl.replay();
+		given(tx.isActive()).willReturn(true);
-		managerControl.replay();
-		txControl.replay();
 
 		final List<String> l = new ArrayList<String>();
 		l.add("test");
@@ -368,12 +332,6 @@ public class JpaTransactionManagerTests extends TestCase {
 			tt.execute(new TransactionCallback() {
 				@Override
 				public Object doInTransaction(TransactionStatus status) {
-					txControl.reset();
-					txControl.expectAndReturn(tx.isActive(), true, 2);
-					tx.setRollbackOnly();
-					tx.rollback();
-					txControl.replay();
-
 					assertTrue(TransactionSynchronizationManager.hasResource(factory));
 					return tt.execute(new TransactionCallback() {
 						@Override
@@ -397,18 +355,17 @@ public class JpaTransactionManagerTests extends TestCase {
 		assertTrue(!TransactionSynchronizationManager.hasResource(factory));
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
 
-		factoryControl.verify();
+		verify(tx).setRollbackOnly();
-		managerControl.verify();
+		verify(tx).rollback();
-		txControl.verify();
+		verify(manager).close();
 	}
 
+	@Test
 	public void testParticipatingTransactionWithRollbackOnly() {
-		managerControl.expectAndReturn(manager.getTransaction(), tx, 3);
+		given(manager.getTransaction()).willReturn(tx);
-		manager.flush();
+		given(tx.isActive()).willReturn(true);
-
+		given(tx.getRollbackOnly()).willReturn(true);
-		factoryControl.replay();
+		willThrow(new RollbackException()).given(tx).commit();
-		managerControl.replay();
-		txControl.replay();
 
 		final List<String> l = new ArrayList<String>();
 		l.add("test");
@@ -420,14 +377,6 @@ public class JpaTransactionManagerTests extends TestCase {
 			tt.execute(new TransactionCallback() {
 				@Override
 				public Object doInTransaction(TransactionStatus status) {
-					txControl.reset();
-					txControl.expectAndReturn(tx.isActive(), true);
-					tx.setRollbackOnly();
-					txControl.expectAndReturn(tx.getRollbackOnly(), true);
-					tx.commit();
-					txControl.setThrowable(new RollbackException());
-					txControl.replay();
-
 					assertTrue(TransactionSynchronizationManager.hasResource(factory));
 
 					return tt.execute(new TransactionCallback() {
@@ -458,23 +407,18 @@ public class JpaTransactionManagerTests extends TestCase {
 		assertTrue(!TransactionSynchronizationManager.hasResource(factory));
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
 
-		factoryControl.verify();
+		verify(manager).flush();
-		managerControl.verify();
+		verify(tx).setRollbackOnly();
-		txControl.verify();
+		verify(manager).close();
 	}
 
+	@Test
 	public void testParticipatingTransactionWithRequiresNew() {
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
 
-		factoryControl.expectAndReturn(factory.createEntityManager(), manager);
+		given(factory.createEntityManager()).willReturn(manager);
-		managerControl.expectAndReturn(manager.getTransaction(), tx, 5);
+		given(manager.getTransaction()).willReturn(tx);
-		manager.flush();
+		given(manager.isOpen()).willReturn(true);
-		managerControl.expectAndReturn(manager.isOpen(), true);
-		manager.close();
-
-		factoryControl.replay();
-		managerControl.replay();
-		txControl.replay();
 
 		final List<String> l = new ArrayList<String>();
 		l.add("test");
@@ -485,17 +429,6 @@ public class JpaTransactionManagerTests extends TestCase {
 		Object result = tt.execute(new TransactionCallback() {
 			@Override
 			public Object doInTransaction(TransactionStatus status) {
-				txControl.verify();
-				txControl.reset();
-
-				tx.begin();
-				txControl.expectAndReturn(tx.getRollbackOnly(), false);
-				tx.commit();
-				txControl.expectAndReturn(tx.getRollbackOnly(), false);
-				tx.commit();
-
-				txControl.replay();
-
 				assertTrue(TransactionSynchronizationManager.hasResource(factory));
 				return tt.execute(new TransactionCallback() {
 					@Override
@@ -516,20 +449,16 @@ public class JpaTransactionManagerTests extends TestCase {
 		assertTrue(!TransactionSynchronizationManager.hasResource(factory));
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
 
-		factoryControl.verify();
+		verify(manager).flush();
-		managerControl.verify();
+		verify(manager, times(2)).close();
-		txControl.verify();
+		verify(tx, times(2)).begin();
 	}
 
+	@Test
 	public void testParticipatingTransactionWithRequiresNewAndPrebound() {
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
 
-		managerControl.expectAndReturn(manager.getTransaction(), tx, 5);
+		given(manager.getTransaction()).willReturn(tx);
-		manager.flush();
-
-		factoryControl.replay();
-		managerControl.replay();
-		txControl.replay();
 
 		final List<String> l = new ArrayList<String>();
 		l.add("test");
@@ -543,17 +472,6 @@ public class JpaTransactionManagerTests extends TestCase {
 			Object result = tt.execute(new TransactionCallback() {
 				@Override
 				public Object doInTransaction(TransactionStatus status) {
-					txControl.verify();
-					txControl.reset();
-
-					tx.begin();
-					txControl.expectAndReturn(tx.getRollbackOnly(), false);
-					tx.commit();
-					txControl.expectAndReturn(tx.getRollbackOnly(), false);
-					tx.commit();
-
-					txControl.replay();
-
 					JpaTemplate template2 = new JpaTemplate(factory);
 					template2.execute(new JpaCallback() {
 						@Override
@@ -586,22 +504,17 @@ public class JpaTransactionManagerTests extends TestCase {
 		assertTrue(!TransactionSynchronizationManager.hasResource(factory));
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
 
-		factoryControl.verify();
+		verify(tx, times(2)).begin();
-		managerControl.verify();
+		verify(tx, times(2)).commit();
-		txControl.verify();
+		verify(manager).flush();
+		verify(manager).close();
 	}
 
+	@Test
 	public void testPropagationSupportsAndRequiresNew() {
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS);
 
-		manager.flush();
+		given(manager.getTransaction()).willReturn(tx);
-		managerControl.expectAndReturn(manager.getTransaction(), tx, 2);
-		txControl.expectAndReturn(tx.getRollbackOnly(), false);
-		tx.commit();
-
-		factoryControl.replay();
-		managerControl.replay();
-		txControl.replay();
 
 		final List<String> l = new ArrayList<String>();
 		l.add("test");
@@ -634,25 +547,18 @@ public class JpaTransactionManagerTests extends TestCase {
 		assertTrue(!TransactionSynchronizationManager.hasResource(factory));
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
 
-		factoryControl.verify();
+		verify(tx).commit();
-		managerControl.verify();
+		verify(manager).flush();
-		txControl.verify();
+		verify(manager).close();
 	}
 
+	@Test
 	public void testPropagationSupportsAndRequiresNewAndEarlyAccess() {
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS);
 
-		factoryControl.expectAndReturn(factory.createEntityManager(), manager);
+		given(factory.createEntityManager()).willReturn(manager);
-		managerControl.expectAndReturn(manager.getTransaction(), tx, 2);
+		given(manager.getTransaction()).willReturn(tx);
-		manager.flush();
+		given(manager.isOpen()).willReturn(true);
-		managerControl.expectAndReturn(manager.isOpen(), true);
-		manager.close();
-		txControl.expectAndReturn(tx.getRollbackOnly(), false);
-		tx.commit();
-
-		factoryControl.replay();
-		managerControl.replay();
-		txControl.replay();
 
 		final List<String> l = new ArrayList<String>();
 		l.add("test");
@@ -693,37 +599,22 @@ public class JpaTransactionManagerTests extends TestCase {
 		assertTrue(!TransactionSynchronizationManager.hasResource(factory));
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
 
-		factoryControl.verify();
+		verify(tx).commit();
-		managerControl.verify();
+		verify(manager).flush();
-		txControl.verify();
+		verify(manager, times(2)).close();
 	}
 
+	@Test
 	public void testTransactionWithRequiresNewInAfterCompletion() {
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
 
-		MockControl managerControl2 = MockControl.createControl(EntityManager.class);
+		EntityManager manager2 = mock(EntityManager.class);
-		EntityManager manager2 = (EntityManager) managerControl2.getMock();
+		EntityTransaction tx2 = mock(EntityTransaction.class);
-		MockControl txControl2 = MockControl.createControl(EntityTransaction.class);
-		EntityTransaction tx2 = (EntityTransaction) txControl2.getMock();
 
-		managerControl.expectAndReturn(manager.getTransaction(), tx, 2);
+		given(manager.getTransaction()).willReturn(tx);
-		factoryControl.expectAndReturn(factory.createEntityManager(), manager2);
+		given(factory.createEntityManager()).willReturn(manager, manager2);
-		managerControl2.expectAndReturn(manager2.getTransaction(), tx2, 3);
+		given(manager2.getTransaction()).willReturn(tx2);
-		txControl.expectAndReturn(tx.getRollbackOnly(), false);
+		given(manager2.isOpen()).willReturn(true);
-		txControl2.expectAndReturn(tx2.getRollbackOnly(), false);
-		manager.flush();
-		tx.commit();
-		tx2.begin();
-		tx2.commit();
-		manager2.flush();
-		managerControl2.expectAndReturn(manager2.isOpen(), true);
-		manager2.close();
-
-		factoryControl.replay();
-		managerControl.replay();
-		txControl.replay();
-		managerControl2.replay();
-		txControl2.replay();
 
 		assertTrue(!TransactionSynchronizationManager.hasResource(factory));
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
@@ -762,24 +653,18 @@ public class JpaTransactionManagerTests extends TestCase {
 		assertTrue(!TransactionSynchronizationManager.hasResource(factory));
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
 
-		factoryControl.verify();
+		verify(tx).commit();
-		managerControl.verify();
+		verify(tx2).begin();
-		txControl.verify();
+		verify(tx2).commit();
-		managerControl2.verify();
+		verify(manager).flush();
-		txControl2.verify();
+		verify(manager).close();
+		verify(manager2).flush();
+		verify(manager2).close();
 	}
 
+	@Test
 	public void testTransactionCommitWithPropagationSupports() {
-		managerControl.reset();
+		given(manager.isOpen()).willReturn(true);
-		txControl.reset();
-
-		manager.flush();
-		managerControl.expectAndReturn(manager.isOpen(), true);
-		manager.close();
-
-		factoryControl.replay();
-		managerControl.replay();
-		txControl.replay();
 
 		final List<String> l = new ArrayList<String>();
 		l.add("test");
@@ -809,22 +694,13 @@ public class JpaTransactionManagerTests extends TestCase {
 		assertTrue(!TransactionSynchronizationManager.hasResource(factory));
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
 
-		factoryControl.verify();
+		verify(manager).flush();
-		managerControl.verify();
+		verify(manager).close();
-		txControl.verify();
 	}
 
+	@Test
 	public void testTransactionRollbackWithPropagationSupports() {
-		managerControl.reset();
+		given(manager.isOpen()).willReturn(true);
-		txControl.reset();
-
-		manager.flush();
-		managerControl.expectAndReturn(manager.isOpen(), true);
-		manager.close();
-
-		factoryControl.replay();
-		managerControl.replay();
-		txControl.replay();
 
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS);
 
@@ -852,24 +728,13 @@ public class JpaTransactionManagerTests extends TestCase {
 		assertTrue(!TransactionSynchronizationManager.hasResource(factory));
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
 
-		factoryControl.verify();
+		verify(manager).flush();
-		managerControl.verify();
+		verify(manager).close();
-		txControl.verify();
 	}
 
+	@Test
 	public void testTransactionCommitWithPrebound() {
-		factoryControl.reset();
+		given(manager.getTransaction()).willReturn(tx);
-		managerControl.reset();
-		txControl.reset();
-
-		managerControl.expectAndReturn(manager.getTransaction(), tx, 3);
-		tx.begin();
-		txControl.expectAndReturn(tx.getRollbackOnly(), false);
-		tx.commit();
-
-		factoryControl.replay();
-		managerControl.replay();
-		txControl.replay();
 
 		final List<String> l = new ArrayList<String>();
 		l.add("test");
@@ -901,25 +766,15 @@ public class JpaTransactionManagerTests extends TestCase {
 			TransactionSynchronizationManager.unbindResource(factory);
 		}
 
-		factoryControl.verify();
+		verify(tx).begin();
-		managerControl.verify();
+		verify(tx).commit();
-		txControl.verify();
 	}
 
+	@Test
 	public void testTransactionRollbackWithPrebound() {
-		factoryControl.reset();
-		managerControl.reset();
-		txControl.reset();
 
-		managerControl.expectAndReturn(manager.getTransaction(), tx, 2);
+		given(manager.getTransaction()).willReturn(tx);
-		tx.begin();
+		given(tx.isActive()).willReturn(true);
-		txControl.expectAndReturn(tx.isActive(), true);
-		tx.rollback();
-		manager.clear();
-
-		factoryControl.replay();
-		managerControl.replay();
-		txControl.replay();
 
 		assertTrue(!TransactionSynchronizationManager.hasResource(factory));
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
@@ -949,22 +804,13 @@ public class JpaTransactionManagerTests extends TestCase {
 			TransactionSynchronizationManager.unbindResource(factory);
 		}
 
-		factoryControl.verify();
+		verify(tx).begin();
-		managerControl.verify();
+		verify(tx).rollback();
-		txControl.verify();
+		verify(manager).clear();
 	}
 
+	@Test
 	public void testTransactionCommitWithPreboundAndPropagationSupports() {
-		factoryControl.reset();
-		managerControl.reset();
-		txControl.reset();
-
-		manager.joinTransaction();
-		manager.flush();
-
-		factoryControl.replay();
-		managerControl.replay();
-		txControl.replay();
 
 		final List<String> l = new ArrayList<String>();
 		l.add("test");
@@ -1000,23 +846,12 @@ public class JpaTransactionManagerTests extends TestCase {
 			TransactionSynchronizationManager.unbindResource(factory);
 		}
 
-		factoryControl.verify();
+		verify(manager).joinTransaction();
-		managerControl.verify();
+		verify(manager).flush();
-		txControl.verify();
 	}
 
+	@Test
 	public void testTransactionRollbackWithPreboundAndPropagationSupports() {
-		factoryControl.reset();
-		managerControl.reset();
-		txControl.reset();
-
-		manager.joinTransaction();
-		manager.flush();
-		manager.clear();
-
-		factoryControl.replay();
-		managerControl.replay();
-		txControl.replay();
 
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS);
 
@@ -1050,26 +885,17 @@ public class JpaTransactionManagerTests extends TestCase {
 			TransactionSynchronizationManager.unbindResource(factory);
 		}
 
-		factoryControl.verify();
+		verify(manager).joinTransaction();
-		managerControl.verify();
+		verify(manager).flush();
-		txControl.verify();
+		verify(manager).clear();
 	}
 
+	@Test
 	public void testTransactionCommitWithDataSource() throws SQLException {
-		MockControl dsControl = MockControl.createControl(DataSource.class);
+		DataSource ds = mock(DataSource.class);
-		DataSource ds = (DataSource) dsControl.getMock();
 		transactionManager.setDataSource(ds);
 
-		managerControl.expectAndReturn(manager.getTransaction(), tx);
+		given(manager.getTransaction()).willReturn(tx);
-		managerControl.expectAndReturn(manager.getTransaction(), tx);
-		txControl.expectAndReturn(tx.getRollbackOnly(), false);
-		tx.commit();
-		manager.flush();
-
-		factoryControl.replay();
-		managerControl.replay();
-		txControl.replay();
-		dsControl.replay();
 
 		final List<String> l = new ArrayList<String>();
 		l.add("test");
@@ -1097,23 +923,16 @@ public class JpaTransactionManagerTests extends TestCase {
 		assertTrue(!TransactionSynchronizationManager.hasResource(factory));
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
 
-		factoryControl.verify();
+		verify(tx).commit();
-		managerControl.verify();
+		verify(manager).flush();
-		txControl.verify();
+		verify(manager).close();
-		dsControl.verify();
 	}
 
+	@Test
 	public void testInvalidIsolation() {
 		tt.setIsolationLevel(TransactionDefinition.ISOLATION_SERIALIZABLE);
-		txControl.reset();
-		managerControl.reset();
 
-		managerControl.expectAndReturn(manager.isOpen(), true);
+		given(manager.isOpen()).willReturn(true);
-		manager.close();
-
-		factoryControl.replay();
-		managerControl.replay();
-		txControl.replay();
 
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
@@ -1127,21 +946,12 @@ public class JpaTransactionManagerTests extends TestCase {
 			// expected
 		}
 
-		factoryControl.verify();
+		verify(manager).close();
-		managerControl.verify();
-		txControl.verify();
 	}
 
+	@Test
 	public void testTransactionFlush() {
-		managerControl.expectAndReturn(manager.getTransaction(), tx);
+		given(manager.getTransaction()).willReturn(tx);
-		txControl.expectAndReturn(tx.getRollbackOnly(), false);
-		managerControl.expectAndReturn(manager.getTransaction(), tx);
-		tx.commit();
-		manager.flush();
-
-		factoryControl.replay();
-		managerControl.replay();
-		txControl.replay();
 
 		assertTrue(!TransactionSynchronizationManager.hasResource(factory));
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
@@ -1157,9 +967,9 @@ public class JpaTransactionManagerTests extends TestCase {
 		assertTrue(!TransactionSynchronizationManager.hasResource(factory));
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
 
-		factoryControl.verify();
+		verify(tx).commit();
-		managerControl.verify();
+		verify(manager).flush();
-		txControl.verify();
+		verify(manager).close();
 	}
 
 }

spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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,8 +16,22 @@
 
 package org.springframework.orm.jpa;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.BDDMockito.willThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 import java.util.Map;
 import java.util.Properties;
+
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
@@ -27,8 +41,7 @@ import javax.persistence.spi.PersistenceProvider;
 import javax.persistence.spi.PersistenceUnitInfo;
 import javax.persistence.spi.PersistenceUnitTransactionType;
 
-import org.easymock.MockControl;
+import org.junit.Test;
-
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.OptimisticLockingFailureException;
@@ -41,6 +54,7 @@ import org.springframework.util.SerializationTestUtils;
 /**
  * @author Rod Johnson
  * @author Juergen Hoeller
+ * @author Phillip Webb
  */
 public class LocalContainerEntityManagerFactoryBeanTests extends AbstractEntityManagerFactoryBeanTests {
 
@@ -51,13 +65,15 @@ public class LocalContainerEntityManagerFactoryBeanTests extends AbstractEntityM
 	private static PersistenceUnitInfo actualPui;
 
 
+	@Test
 	public void testValidPersistenceUnit() throws Exception {
 		parseValidPersistenceUnit();
 	}
 
+	@Test
 	public void testExceptionTranslationWithNoDialect() throws Exception {
 		LocalContainerEntityManagerFactoryBean cefb = parseValidPersistenceUnit();
-		EntityManagerFactory emf = cefb.getObject();
+		cefb.getObject();
 		assertNull("No dialect set", cefb.getJpaDialect());
 
 		RuntimeException in1 = new RuntimeException("in1");
@@ -68,6 +84,7 @@ public class LocalContainerEntityManagerFactoryBeanTests extends AbstractEntityM
 		assertSame(in2, dex.getCause());
 	}
 
+	@Test
 	public void testEntityManagerFactoryIsProxied() throws Exception {
 		LocalContainerEntityManagerFactoryBean cefb = parseValidPersistenceUnit();
 		EntityManagerFactory emf = cefb.getObject();
@@ -84,21 +101,12 @@ public class LocalContainerEntityManagerFactoryBeanTests extends AbstractEntityM
 		assertNotNull(SerializationTestUtils.serializeAndDeserialize(emf));
 	}
 
+	@Test
 	public void testApplicationManagedEntityManagerWithoutTransaction() throws Exception {
 		Object testEntity = new Object();
+		EntityManager mockEm = mock(EntityManager.class);
 
-		MockControl emMc = MockControl.createControl(EntityManager.class);
+		given(mockEmf.createEntityManager()).willReturn(mockEm);
-		EntityManager mockEm = (EntityManager) emMc.getMock();
-		mockEm.contains(testEntity);
-		emMc.setReturnValue(false);
-		emMc.replay();
-
-		// finish recording mock calls
-		mockEmf.createEntityManager();
-		emfMc.setReturnValue(mockEm);
-		mockEmf.close();
-		emfMc.setVoidCallable();
-		emfMc.replay();
 
 		LocalContainerEntityManagerFactoryBean cefb = parseValidPersistenceUnit();
 		EntityManagerFactory emf = cefb.getObject();
@@ -110,48 +118,24 @@ public class LocalContainerEntityManagerFactoryBeanTests extends AbstractEntityM
 
 		cefb.destroy();
 
-		emfMc.verify();
+		verify(mockEmf).close();
-		emMc.verify();
 	}
 
+	@Test
 	public void testApplicationManagedEntityManagerWithTransaction() throws Exception {
 		Object testEntity = new Object();
 
-		MockControl tmMc = MockControl.createControl(EntityTransaction.class);
+		EntityTransaction mockTx = mock(EntityTransaction.class);
-		EntityTransaction mockTx = (EntityTransaction) tmMc.getMock();
-		mockTx.isActive();
-		tmMc.setReturnValue(false);
-		mockTx.begin();
-		tmMc.setVoidCallable();
-		mockTx.commit();
-		tmMc.setVoidCallable();
-		tmMc.replay();
 
 		// This one's for the tx (shared)
-		MockControl sharedEmMc = MockControl.createControl(EntityManager.class);
+		EntityManager sharedEm = mock(EntityManager.class);
-		EntityManager sharedEm = (EntityManager) sharedEmMc.getMock();
+		given(sharedEm.getTransaction()).willReturn(new NoOpEntityTransaction());
-		sharedEm.getTransaction();
-		sharedEmMc.setReturnValue(new NoOpEntityTransaction(), 3);
-		sharedEm.close();
-		sharedEmMc.setVoidCallable();
-		sharedEmMc.replay();
-		mockEmf.createEntityManager();
-		emfMc.setReturnValue(sharedEm);
 
 		// This is the application-specific one
-		MockControl emMc = MockControl.createControl(EntityManager.class);
+		EntityManager mockEm = mock(EntityManager.class);
-		EntityManager mockEm = (EntityManager) emMc.getMock();
+		given(mockEm.getTransaction()).willReturn(mockTx);
-		mockEm.getTransaction();
-		emMc.setReturnValue(mockTx, 3);
-		mockEm.contains(testEntity);
-		emMc.setReturnValue(false);
-		emMc.replay();
 
-		mockEmf.createEntityManager();
+		given(mockEmf.createEntityManager()).willReturn(sharedEm, mockEm);
-		emfMc.setReturnValue(mockEm);
-		mockEmf.close();
-		emfMc.setVoidCallable();
-		emfMc.replay();
 
 		LocalContainerEntityManagerFactoryBean cefb = parseValidPersistenceUnit();
 
@@ -172,49 +156,28 @@ public class LocalContainerEntityManagerFactoryBeanTests extends AbstractEntityM
 
 		cefb.destroy();
 
-		emfMc.verify();
+		verify(mockTx).begin();
-		emMc.verify();
+		verify(mockTx).commit();
-		tmMc.verify();
+		verify(mockEm).contains(testEntity);
+		verify(mockEmf).close();
 	}
 
+	@Test
 	public void testApplicationManagedEntityManagerWithTransactionAndCommitException() throws Exception {
 		Object testEntity = new Object();
 
-		MockControl tmMc = MockControl.createControl(EntityTransaction.class);
+		EntityTransaction mockTx = mock(EntityTransaction.class);
-		EntityTransaction mockTx = (EntityTransaction) tmMc.getMock();
+		willThrow(new OptimisticLockException()).given(mockTx).commit();
-		mockTx.isActive();
-		tmMc.setReturnValue(false);
-		mockTx.begin();
-		tmMc.setVoidCallable();
-		mockTx.commit();
-		tmMc.setThrowable(new OptimisticLockException());
-		tmMc.replay();
 
 		// This one's for the tx (shared)
-		MockControl sharedEmMc = MockControl.createControl(EntityManager.class);
+		EntityManager sharedEm = mock(EntityManager.class);
-		EntityManager sharedEm = (EntityManager) sharedEmMc.getMock();
+		given(sharedEm.getTransaction()).willReturn(new NoOpEntityTransaction());
-		sharedEm.getTransaction();
-		sharedEmMc.setReturnValue(new NoOpEntityTransaction(), 3);
-		sharedEm.close();
-		sharedEmMc.setVoidCallable();
-		sharedEmMc.replay();
-		mockEmf.createEntityManager();
-		emfMc.setReturnValue(sharedEm);
 
 		// This is the application-specific one
-		MockControl emMc = MockControl.createControl(EntityManager.class);
+		EntityManager mockEm = mock(EntityManager.class);
-		EntityManager mockEm = (EntityManager) emMc.getMock();
+		given(mockEm.getTransaction()).willReturn(mockTx);
-		mockEm.getTransaction();
-		emMc.setReturnValue(mockTx, 3);
-		mockEm.contains(testEntity);
-		emMc.setReturnValue(false);
-		emMc.replay();
 
-		mockEmf.createEntityManager();
+		given(mockEmf.createEntityManager()).willReturn(sharedEm, mockEm);
-		emfMc.setReturnValue(mockEm);
-		mockEmf.close();
-		emfMc.setVoidCallable();
-		emfMc.replay();
 
 		LocalContainerEntityManagerFactoryBean cefb = parseValidPersistenceUnit();
 
@@ -241,39 +204,23 @@ public class LocalContainerEntityManagerFactoryBeanTests extends AbstractEntityM
 
 		cefb.destroy();
 
-		emfMc.verify();
+		verify(mockTx).begin();
-		emMc.verify();
+		verify(mockEm).contains(testEntity);
-		tmMc.verify();
+		verify(mockEmf).close();
 	}
 
+	@Test
 	public void testApplicationManagedEntityManagerWithJtaTransaction() throws Exception {
 		Object testEntity = new Object();
 
 		// This one's for the tx (shared)
-		MockControl sharedEmMc = MockControl.createControl(EntityManager.class);
+		EntityManager sharedEm = mock(EntityManager.class);
-		EntityManager sharedEm = (EntityManager) sharedEmMc.getMock();
+		given(sharedEm.getTransaction()).willReturn(new NoOpEntityTransaction());
-		sharedEm.getTransaction();
-		sharedEmMc.setReturnValue(new NoOpEntityTransaction(), 3);
-		sharedEm.close();
-		sharedEmMc.setVoidCallable(1);
-		sharedEmMc.replay();
-		mockEmf.createEntityManager();
-		emfMc.setReturnValue(sharedEm);
 
 		// This is the application-specific one
-		MockControl emMc = MockControl.createControl(EntityManager.class);
+		EntityManager mockEm = mock(EntityManager.class);
-		EntityManager mockEm = (EntityManager) emMc.getMock();
-		mockEm.joinTransaction();
-		emMc.setVoidCallable(1);
-		mockEm.contains(testEntity);
-		emMc.setReturnValue(false);
-		emMc.replay();
 
-		mockEmf.createEntityManager();
+		given(mockEmf.createEntityManager()).willReturn(sharedEm, mockEm);
-		emfMc.setReturnValue(mockEm);
-		mockEmf.close();
-		emfMc.setVoidCallable();
-		emfMc.replay();
 
 		LocalContainerEntityManagerFactoryBean cefb = parseValidPersistenceUnit();
 		MutablePersistenceUnitInfo pui = ((MutablePersistenceUnitInfo) cefb.getPersistenceUnitInfo());
@@ -296,8 +243,9 @@ public class LocalContainerEntityManagerFactoryBeanTests extends AbstractEntityM
 
 		cefb.destroy();
 
-		emfMc.verify();
+		verify(mockEm).joinTransaction();
-		emMc.verify();
+		verify(mockEm).contains(testEntity);
+		verify(mockEmf).close();
 	}
 
 	public LocalContainerEntityManagerFactoryBean parseValidPersistenceUnit() throws Exception {
@@ -307,6 +255,7 @@ public class LocalContainerEntityManagerFactoryBeanTests extends AbstractEntityM
 		return emfb;
 	}
 
+	@Test
 	public void testInvalidPersistenceUnitName() throws Exception {
 		try {
 			createEntityManagerFactoryBean("org/springframework/orm/jpa/domain/persistence.xml", null, "call me Bob");
@@ -347,6 +296,7 @@ public class LocalContainerEntityManagerFactoryBeanTests extends AbstractEntityM
 		//emfMc.verify();
 	}
 
+	@Test
 	public void testRejectsMissingPersistenceUnitInfo() throws Exception {
 		LocalContainerEntityManagerFactoryBean containerEmfb = new LocalContainerEntityManagerFactoryBean();
 		String entityManagerName = "call me Bob";

spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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,6 +16,10 @@
 
 package org.springframework.orm.jpa;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.mockito.Mockito.verify;
+
 import java.util.Map;
 import java.util.Properties;
 
@@ -23,8 +27,12 @@ import javax.persistence.EntityManagerFactory;
 import javax.persistence.spi.PersistenceProvider;
 import javax.persistence.spi.PersistenceUnitInfo;
 
+import org.junit.After;
+import org.junit.Test;
+
 /**
  * @author Rod Johnson
+ * @author Phillip Webb
  */
 public class LocalEntityManagerFactoryBeanTests extends AbstractEntityManagerFactoryBeanTests {
 
@@ -34,19 +42,17 @@ public class LocalEntityManagerFactoryBeanTests extends AbstractEntityManagerFac
 
 	private static Map actualProps;
 
-
+	@After
-	@Override
+	public void verifyClosed() throws Exception {
-	protected void setUp() throws Exception {
+		verify(mockEmf).close();
-		super.setUp();
-		mockEmf.close();
-		emfMc.setVoidCallable();
-		emfMc.replay();
 	}
 
+	@Test
 	public void testValidUsageWithDefaultProperties() throws Exception {
 		testValidUsage(null);
 	}
 
+	@Test
 	public void testValidUsageWithExplicitProperties() throws Exception {
 		testValidUsage(new Properties());
 	}
@@ -73,8 +79,6 @@ public class LocalEntityManagerFactoryBeanTests extends AbstractEntityManagerFac
 		checkInvariants(lemfb);
 
 		lemfb.destroy();
-
-		emfMc.verify();
 	}
 
 

spring-orm/src/test/java/org/springframework/orm/jpa/support/JpaDaoSupportTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -13,29 +13,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.orm.jpa.support;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 
-import junit.framework.TestCase;
+import org.junit.Test;
-
-import org.easymock.MockControl;
 import org.springframework.orm.jpa.JpaTemplate;
 
 /**
  * @author Costin Leau
- *
+ * @author Phillip Webb
  */
-public class JpaDaoSupportTests extends TestCase {
+public class JpaDaoSupportTests {
 
+	@Test
 	public void testJpaDaoSupportWithEntityManager() throws Exception {
-		MockControl mockControl = MockControl.createControl(EntityManager.class);
+		EntityManager entityManager = mock(EntityManager.class);
-		EntityManager entityManager = (EntityManager) mockControl.getMock();
-		mockControl.replay();
 		final List test = new ArrayList();
 		JpaDaoSupport dao = new JpaDaoSupport() {
 			@Override
@@ -48,13 +51,11 @@ public class JpaDaoSupportTests extends TestCase {
 		assertNotNull("jpa template not created", dao.getJpaTemplate());
 		assertEquals("incorrect entity manager", entityManager, dao.getJpaTemplate().getEntityManager());
 		assertEquals("initDao not called", test.size(), 1);
-		mockControl.verify();
 	}
 
+	@Test
 	public void testJpaDaoSupportWithEntityManagerFactory() throws Exception {
-		MockControl mockControl = MockControl.createControl(EntityManagerFactory.class);
+		EntityManagerFactory entityManagerFactory = mock(EntityManagerFactory.class);
-		EntityManagerFactory entityManagerFactory = (EntityManagerFactory) mockControl.getMock();
-		mockControl.replay();
 		final List test = new ArrayList();
 		JpaDaoSupport dao = new JpaDaoSupport() {
 			@Override
@@ -68,9 +69,9 @@ public class JpaDaoSupportTests extends TestCase {
 		assertEquals("incorrect entity manager factory", entityManagerFactory,
 				dao.getJpaTemplate().getEntityManagerFactory());
 		assertEquals("initDao not called", test.size(), 1);
-		mockControl.verify();
 	}
 
+	@Test
 	public void testJpaDaoSupportWithJpaTemplate() throws Exception {
 		JpaTemplate template = new JpaTemplate();
 		final List test = new ArrayList();
@@ -87,6 +88,7 @@ public class JpaDaoSupportTests extends TestCase {
 		assertEquals("initDao not called", test.size(), 1);
 	}
 
+	@Test
 	public void testInvalidJpaTemplate() throws Exception {
 		JpaDaoSupport dao = new JpaDaoSupport() {
 		};

spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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,13 +16,16 @@
 
 package org.springframework.orm.jpa.support;
 
-import static org.easymock.EasyMock.anyObject;
+import static org.junit.Assert.assertEquals;
-import static org.easymock.EasyMock.createMock;
+import static org.junit.Assert.assertFalse;
-import static org.easymock.EasyMock.createStrictMock;
+import static org.junit.Assert.assertNotNull;
-import static org.easymock.EasyMock.expect;
+import static org.junit.Assert.assertTrue;
-import static org.easymock.EasyMock.replay;
+import static org.mockito.BDDMockito.given;
-import static org.easymock.EasyMock.reset;
+import static org.mockito.Matchers.any;
-import static org.easymock.EasyMock.verify;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 import java.io.IOException;
 import java.util.concurrent.Callable;
@@ -35,8 +38,9 @@ import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
-import junit.framework.TestCase;
+import org.junit.After;
-
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.core.task.SimpleAsyncTaskExecutor;
 import org.springframework.mock.web.test.MockFilterConfig;
 import org.springframework.mock.web.test.MockHttpServletRequest;
@@ -56,8 +60,9 @@ import org.springframework.web.context.support.StaticWebApplicationContext;
  * @author Costin Leau
  * @author Juergen Hoeller
  * @author Chris Beams
+ * @author Phillip Webb
  */
-public class OpenEntityManagerInViewTests extends TestCase {
+public class OpenEntityManagerInViewTests {
 
 	private EntityManager manager;
 
@@ -66,25 +71,26 @@ public class OpenEntityManagerInViewTests extends TestCase {
 	private JpaTemplate template;
 
 
-	@Override
+	@Before
-	protected void setUp() throws Exception {
+	public void setUp() throws Exception {
-		factory = createMock(EntityManagerFactory.class);
+		factory = mock(EntityManagerFactory.class);
-		manager = createMock(EntityManager.class);
+		manager = mock(EntityManager.class);
 
 		template = new JpaTemplate(factory);
 		template.afterPropertiesSet();
 
-		expect(factory.createEntityManager()).andReturn(manager);
+		given(factory.createEntityManager()).willReturn(manager);
 	}
 
-	@Override
+	@After
-	protected void tearDown() throws Exception {
+	public void tearDown() throws Exception {
 		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 		assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 		assertFalse(TransactionSynchronizationManager.isActualTransactionActive());
 	}
 
+	@Test
 	public void testOpenEntityManagerInViewInterceptor() throws Exception {
 		OpenEntityManagerInViewInterceptor interceptor = new OpenEntityManagerInViewInterceptor();
 		interceptor.setEntityManagerFactory(factory);
@@ -92,8 +98,6 @@ public class OpenEntityManagerInViewTests extends TestCase {
 		MockServletContext sc = new MockServletContext();
 		MockHttpServletRequest request = new MockHttpServletRequest(sc);
 
-		replay(manager, factory);
-
 		interceptor.preHandle(new ServletWebRequest(request));
 		assertTrue(TransactionSynchronizationManager.hasResource(factory));
 
@@ -111,29 +115,18 @@ public class OpenEntityManagerInViewTests extends TestCase {
 		interceptor.postHandle(new ServletWebRequest(request), null);
 		interceptor.afterCompletion(new ServletWebRequest(request), null);
 
-		verify(manager, factory);
-
-		reset(manager, factory);
-		replay(manager, factory);
-
 		interceptor.postHandle(new ServletWebRequest(request), null);
 		assertTrue(TransactionSynchronizationManager.hasResource(factory));
 
-		verify(manager, factory);
+		given(manager.isOpen()).willReturn(true);
-
-		reset(manager, factory);
-
-		expect(manager.isOpen()).andReturn(true);
-		manager.close();
-
-		replay(manager, factory);
 
 		interceptor.afterCompletion(new ServletWebRequest(request), null);
 		assertFalse(TransactionSynchronizationManager.hasResource(factory));
 
-		verify(manager, factory);
+		verify(manager).close();
 	}
 
+	@Test
 	public void testOpenEntityManagerInViewInterceptorAsyncScenario() throws Exception {
 
 		// Initial request thread
@@ -145,19 +138,10 @@ public class OpenEntityManagerInViewTests extends TestCase {
 		MockHttpServletRequest request = new MockHttpServletRequest(sc);
 		ServletWebRequest webRequest = new ServletWebRequest(request);
 
-		replay(manager, factory);
-
 		interceptor.preHandle(webRequest);
 		assertTrue(TransactionSynchronizationManager.hasResource(factory));
 
-		verify(manager, factory);
+		AsyncWebRequest asyncWebRequest = mock(AsyncWebRequest.class);
-
-		AsyncWebRequest asyncWebRequest = createStrictMock(AsyncWebRequest.class);
-		asyncWebRequest.addCompletionHandler((Runnable) anyObject());
-		asyncWebRequest.addTimeoutHandler((Runnable) anyObject());
-		asyncWebRequest.addCompletionHandler((Runnable) anyObject());
-		asyncWebRequest.startAsync();
-		replay(asyncWebRequest);
 
 		WebAsyncManager asyncManager = WebAsyncUtils.getAsyncManager(webRequest);
 		asyncManager.setTaskExecutor(new SyncTaskExecutor());
@@ -169,23 +153,19 @@ public class OpenEntityManagerInViewTests extends TestCase {
 			}
 		});
 
-		verify(asyncWebRequest);
+		verify(asyncWebRequest, times(2)).addCompletionHandler(any(Runnable.class));
+		verify(asyncWebRequest).addTimeoutHandler(any(Runnable.class));
+		verify(asyncWebRequest, times(2)).addCompletionHandler(any(Runnable.class));
+		verify(asyncWebRequest).startAsync();
 
 		interceptor.afterConcurrentHandlingStarted(webRequest);
 		assertFalse(TransactionSynchronizationManager.hasResource(factory));
 
 		// Async dispatch thread
 
-		reset(manager, factory);
-		replay(manager, factory);
-
 		interceptor.preHandle(webRequest);
 		assertTrue(TransactionSynchronizationManager.hasResource(factory));
 
-		verify(manager, factory);
-		reset(manager, factory);
-		replay(manager, factory);
-
 		asyncManager.clearConcurrentResult();
 
 		// check that further invocations simply participate
@@ -202,41 +182,26 @@ public class OpenEntityManagerInViewTests extends TestCase {
 		interceptor.postHandle(new ServletWebRequest(request), null);
 		interceptor.afterCompletion(new ServletWebRequest(request), null);
 
-		verify(manager, factory);
-		reset(manager, factory);
-		replay(manager, factory);
-
 		interceptor.postHandle(webRequest, null);
 		assertTrue(TransactionSynchronizationManager.hasResource(factory));
 
-		verify(manager, factory);
+		given(manager.isOpen()).willReturn(true);
-		reset(manager, factory);
-
-		expect(manager.isOpen()).andReturn(true);
-		manager.close();
-
-		replay(manager, factory);
 
 		interceptor.afterCompletion(webRequest, null);
 		assertFalse(TransactionSynchronizationManager.hasResource(factory));
 
-		verify(manager, factory);
+		verify(manager).close();
 	}
 
+	@Test
 	public void testOpenEntityManagerInViewFilter() throws Exception {
-		expect(manager.isOpen()).andReturn(true);
+		given(manager.isOpen()).willReturn(true);
-		manager.close();
 
-		replay(manager, factory);
+		final EntityManagerFactory factory2 = mock(EntityManagerFactory.class);
+		final EntityManager manager2 = mock(EntityManager.class);
 
-		final EntityManagerFactory factory2 = createMock(EntityManagerFactory.class);
+		given(factory2.createEntityManager()).willReturn(manager2);
-		final EntityManager manager2 = createMock(EntityManager.class);
+		given(manager2.isOpen()).willReturn(true);
-
-		expect(factory2.createEntityManager()).andReturn(manager2);
-		expect(manager2.isOpen()).andReturn(true);
-		manager2.close();
-
-		replay(factory2, manager2);
 
 		MockServletContext sc = new MockServletContext();
 		StaticWebApplicationContext wac = new StaticWebApplicationContext();
@@ -283,26 +248,21 @@ public class OpenEntityManagerInViewTests extends TestCase {
 		assertFalse(TransactionSynchronizationManager.hasResource(factory2));
 		assertNotNull(request.getAttribute("invoked"));
 
-		verify(manager, factory);
+		verify(manager).close();
-		verify(factory2, manager2);
+		verify(manager2).close();
 
 		wac.close();
 	}
 
+	@Test
 	public void testOpenEntityManagerInViewFilterAsyncScenario() throws Exception {
-		expect(manager.isOpen()).andReturn(true);
+		given(manager.isOpen()).willReturn(true);
-		manager.close();
 
-		replay(manager, factory);
+		final EntityManagerFactory factory2 = mock(EntityManagerFactory.class);
+		final EntityManager manager2 = mock(EntityManager.class);
 
-		final EntityManagerFactory factory2 = createMock(EntityManagerFactory.class);
+		given(factory2.createEntityManager()).willReturn(manager2);
-		final EntityManager manager2 = createMock(EntityManager.class);
+		given(manager2.isOpen()).willReturn(true);
-
-		expect(factory2.createEntityManager()).andReturn(manager2);
-		expect(manager2.isOpen()).andReturn(true);
-		manager2.close();
-
-		replay(factory2, manager2);
 
 		MockServletContext sc = new MockServletContext();
 		StaticWebApplicationContext wac = new StaticWebApplicationContext();
@@ -348,13 +308,8 @@ public class OpenEntityManagerInViewTests extends TestCase {
 
 		FilterChain filterChain3 = new PassThroughFilterChain(filter2, filterChain2);
 
-		AsyncWebRequest asyncWebRequest = createMock(AsyncWebRequest.class);
+		AsyncWebRequest asyncWebRequest = mock(AsyncWebRequest.class);
-		asyncWebRequest.addCompletionHandler((Runnable) anyObject());
+		given(asyncWebRequest.isAsyncStarted()).willReturn(true);
-		asyncWebRequest.addTimeoutHandler((Runnable) anyObject());
-		asyncWebRequest.addCompletionHandler((Runnable) anyObject());
-		asyncWebRequest.startAsync();
-		expect(asyncWebRequest.isAsyncStarted()).andReturn(true).anyTimes();
-		replay(asyncWebRequest);
 
 		WebAsyncManager asyncManager = WebAsyncUtils.getAsyncManager(request);
 		asyncManager.setTaskExecutor(new SyncTaskExecutor());
@@ -375,11 +330,15 @@ public class OpenEntityManagerInViewTests extends TestCase {
 		assertEquals(1, count2.get());
 		assertNotNull(request.getAttribute("invoked"));
 
+		verify(asyncWebRequest, times(2)).addCompletionHandler(any(Runnable.class));
+		verify(asyncWebRequest).addTimeoutHandler(any(Runnable.class));
+		verify(asyncWebRequest, times(2)).addCompletionHandler(any(Runnable.class));
+		verify(asyncWebRequest).startAsync();
+
 		// Async dispatch after concurrent handling produces result ...
 
 		reset(asyncWebRequest);
-		expect(asyncWebRequest.isAsyncStarted()).andReturn(false).anyTimes();
+		given(asyncWebRequest.isAsyncStarted()).willReturn(false);
-		replay(asyncWebRequest);
 
 		assertFalse(TransactionSynchronizationManager.hasResource(factory));
 		assertFalse(TransactionSynchronizationManager.hasResource(factory2));
@@ -389,8 +348,8 @@ public class OpenEntityManagerInViewTests extends TestCase {
 		assertEquals(2, count.get());
 		assertEquals(2, count2.get());
 
-		verify(manager, factory);
+		verify(manager).close();
-		verify(factory2, manager2);
+		verify(manager2).close();
 
 		wac.close();
 	}

spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java

@@ -16,6 +16,15 @@
 
 package org.springframework.orm.jpa.support;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.withSettings;
+
 import java.io.Serializable;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
@@ -23,6 +32,7 @@ import java.lang.reflect.Proxy;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
+
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.PersistenceContext;
@@ -30,10 +40,9 @@ import javax.persistence.PersistenceContextType;
 import javax.persistence.PersistenceProperty;
 import javax.persistence.PersistenceUnit;
 
-import org.easymock.MockControl;
 import org.hibernate.ejb.HibernateEntityManager;
 import org.junit.Ignore;
-
+import org.junit.Test;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
@@ -53,10 +62,13 @@ import org.springframework.util.SerializationTestUtils;
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
+ * @author Phillip Webb
  */
 public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanTests {
 
+	@Test
 	public void testPrivatePersistenceContextField() throws Exception {
+		mockEmf = mock(EntityManagerFactory.class, withSettings().serializable());
 		GenericApplicationContext gac = new GenericApplicationContext();
 		gac.getDefaultListableBeanFactory().registerSingleton("entityManagerFactory", mockEmf);
 		gac.registerBeanDefinition("annotationProcessor",
@@ -78,6 +90,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 		assertNotNull(SerializationTestUtils.serializeAndDeserialize(bean2.em));
 	}
 
+	@Test
 	public void testPrivateVendorSpecificPersistenceContextField() {
 		GenericApplicationContext gac = new GenericApplicationContext();
 		gac.getDefaultListableBeanFactory().registerSingleton("entityManagerFactory", mockEmf);
@@ -92,11 +105,10 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 		assertNotNull(bean.em);
 	}
 
+	@Test
 	public void testPublicExtendedPersistenceContextSetter() throws Exception {
-		EntityManager mockEm = MockControl.createControl(EntityManager.class).getMock();
+		EntityManager mockEm = mock(EntityManager.class);
-		mockEmf.createEntityManager();
+		given(mockEmf.createEntityManager()).willReturn(mockEm);
-		emfMc.setReturnValue(mockEm, 1);
-		emfMc.replay();
 
 		GenericApplicationContext gac = new GenericApplicationContext();
 		gac.getDefaultListableBeanFactory().registerSingleton("entityManagerFactory", mockEmf);
@@ -109,24 +121,13 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 		DefaultPublicPersistenceContextSetter bean = (DefaultPublicPersistenceContextSetter) gac.getBean(
 				DefaultPublicPersistenceContextSetter.class.getName());
 		assertNotNull(bean.em);
-		emfMc.verify();
 	}
 
+	@Test
 	public void testPublicSpecificExtendedPersistenceContextSetter() throws Exception {
-		emfMc.replay();
+		EntityManagerFactory mockEmf2 = mock(EntityManagerFactory.class);
-
+		EntityManager mockEm2 = mock(EntityManager.class);
-		MockControl<EntityManagerFactory> emfMc2 = MockControl.createControl(EntityManagerFactory.class);
+		given(mockEmf2.createEntityManager()).willReturn(mockEm2);
-		EntityManagerFactory mockEmf2 = emfMc2.getMock();
-		MockControl<EntityManager> emMc2 = MockControl.createControl(EntityManager.class);
-		EntityManager mockEm2 = emMc2.getMock();
-		mockEm2.getTransaction();
-		emMc2.setReturnValue(null, 1);
-		mockEm2.flush();
-		emMc2.setVoidCallable(1);
-		emMc2.replay();
-		mockEmf2.createEntityManager();
-		emfMc2.setReturnValue(mockEm2, 1);
-		emfMc2.replay();
 
 		GenericApplicationContext gac = new GenericApplicationContext();
 		gac.getDefaultListableBeanFactory().registerSingleton("entityManagerFactory", mockEmf);
@@ -141,16 +142,15 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 				SpecificPublicPersistenceContextSetter.class.getName());
 		assertNotNull(bean.getEntityManager());
 		bean.getEntityManager().flush();
-		emfMc.verify();
+		verify(mockEm2).getTransaction();
-		emfMc2.verify();
+		verify(mockEm2).flush();
 	}
 
+	@Test
 	public void testPublicExtendedPersistenceContextSetterWithSerialization() throws Exception {
 		DummyInvocationHandler ih = new DummyInvocationHandler();
 		Object mockEm = Proxy.newProxyInstance(getClass().getClassLoader(), new Class[] {EntityManager.class}, ih);
-		mockEmf.createEntityManager();
+		given(mockEmf.createEntityManager()).willReturn((EntityManager) mockEm);
-		emfMc.setReturnValue(mockEm, 1);
-		emfMc.replay();
 
 		GenericApplicationContext gac = new GenericApplicationContext();
 		SimpleMapScope myScope = new SimpleMapScope();
@@ -172,27 +172,19 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 		serialized.close();
 		assertTrue(DummyInvocationHandler.closed);
 		DummyInvocationHandler.closed = false;
-		emfMc.verify();
 	}
 
+	@Test
+	@SuppressWarnings("unchecked")
 	public void testPublicExtendedPersistenceContextSetterWithEntityManagerInfoAndSerialization() throws Exception {
-		Object mockEm = Proxy.newProxyInstance(
+		EntityManager mockEm = mock(EntityManager.class, withSettings().serializable());
-				getClass().getClassLoader(), new Class[] {EntityManager.class}, new DummyInvocationHandler());
+		given(mockEm.isOpen()).willReturn(true);
-		MockControl emfMc = MockControl.createControl(EntityManagerFactoryWithInfo.class);
+		EntityManagerFactoryWithInfo mockEmf = mock(EntityManagerFactoryWithInfo.class);
-		EntityManagerFactoryWithInfo mockEmf = (EntityManagerFactoryWithInfo) emfMc.getMock();
+		given(mockEmf.getNativeEntityManagerFactory()).willReturn(mockEmf);
-		mockEmf.getNativeEntityManagerFactory();
+		given(mockEmf.getJpaDialect()).willReturn(new DefaultJpaDialect());
-		emfMc.setReturnValue(mockEmf);
+		given(mockEmf.getEntityManagerInterface()).willReturn((Class)EntityManager.class);
-		mockEmf.getPersistenceUnitInfo();
+		given(mockEmf.getBeanClassLoader()).willReturn(getClass().getClassLoader());
-		emfMc.setReturnValue(null);
+		given(mockEmf.createEntityManager()).willReturn(mockEm);
-		mockEmf.getJpaDialect();
-		emfMc.setReturnValue(new DefaultJpaDialect());
-		mockEmf.getEntityManagerInterface();
-		emfMc.setReturnValue(EntityManager.class);
-		mockEmf.getBeanClassLoader();
-		emfMc.setReturnValue(getClass().getClassLoader());
-		mockEmf.createEntityManager();
-		emfMc.setReturnValue(mockEm);
-		emfMc.replay();
 
 		GenericApplicationContext gac = new GenericApplicationContext();
 		gac.getDefaultListableBeanFactory().registerSingleton("entityManagerFactory", mockEmf);
@@ -206,11 +198,11 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 				DefaultPublicPersistenceContextSetter.class.getName());
 		assertNotNull(bean.em);
 		assertNotNull(SerializationTestUtils.serializeAndDeserialize(bean.em));
-		emfMc.verify();
 	}
 
+	@Test
 	public void testPublicExtendedPersistenceContextSetterWithOverriding() {
-		EntityManager mockEm2 = MockControl.createControl(EntityManager.class).getMock();
+		EntityManager mockEm2 = mock(EntityManager.class);
 
 		GenericApplicationContext gac = new GenericApplicationContext();
 		gac.getDefaultListableBeanFactory().registerSingleton("entityManagerFactory", mockEmf);
@@ -226,6 +218,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 		assertSame(mockEm2, bean.em);
 	}
 
+	@Test
 	public void testPrivatePersistenceUnitField() {
 		GenericApplicationContext gac = new GenericApplicationContext();
 		gac.getDefaultListableBeanFactory().registerSingleton("entityManagerFactory", mockEmf);
@@ -240,6 +233,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 		assertSame(mockEmf, bean.emf);
 	}
 
+	@Test
 	public void testPublicPersistenceUnitSetter() {
 		GenericApplicationContext gac = new GenericApplicationContext();
 		gac.getDefaultListableBeanFactory().registerSingleton("entityManagerFactory", mockEmf);
@@ -254,9 +248,9 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 		assertSame(mockEmf, bean.emf);
 	}
 
+	@Test
 	public void testPublicPersistenceUnitSetterWithOverriding() {
-		EntityManagerFactory mockEmf2 =
+		EntityManagerFactory mockEmf2 = mock(EntityManagerFactory.class);
-				MockControl.createControl(EntityManagerFactory.class).getMock();
 
 		GenericApplicationContext gac = new GenericApplicationContext();
 		gac.getDefaultListableBeanFactory().registerSingleton("entityManagerFactory", mockEmf);
@@ -272,9 +266,9 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 		assertSame(mockEmf2, bean.emf);
 	}
 
+	@Test
 	public void testPublicPersistenceUnitSetterWithUnitIdentifiedThroughBeanName() {
-		EntityManagerFactory mockEmf2 =
+		EntityManagerFactory mockEmf2 = mock(EntityManagerFactory.class);
-				MockControl.createControl(EntityManagerFactory.class).getMock();
 
 		GenericApplicationContext gac = new GenericApplicationContext();
 		gac.getDefaultListableBeanFactory().registerSingleton("entityManagerFactory", mockEmf);
@@ -297,12 +291,10 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 		assertSame(mockEmf2, bean2.emf);
 	}
 
+	@Test
 	public void testPublicPersistenceUnitSetterWithMultipleUnitsIdentifiedThroughUnitName() {
-		MockControl emf2Mc = MockControl.createControl(EntityManagerFactoryWithInfo.class);
+		EntityManagerFactoryWithInfo mockEmf2 = mock(EntityManagerFactoryWithInfo.class);
-		EntityManagerFactoryWithInfo mockEmf2 = (EntityManagerFactoryWithInfo) emf2Mc.getMock();
+		given(mockEmf2.getPersistenceUnitName()).willReturn("Person");
-		mockEmf2.getPersistenceUnitName();
-		emf2Mc.setReturnValue("Person", 2);
-		emf2Mc.replay();
 
 		GenericApplicationContext gac = new GenericApplicationContext();
 		gac.getDefaultListableBeanFactory().registerSingleton("entityManagerFactory", mockEmf);
@@ -322,19 +314,14 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 				gac.getBean(DefaultPublicPersistenceUnitSetterNamedPerson.class.getName());
 		assertSame(mockEmf, bean.emf);
 		assertSame(mockEmf2, bean2.emf);
-
-		emf2Mc.verify();
 	}
 
 	@Ignore
 	public void ignoreTestPersistenceUnitsFromJndi() {
-		mockEmf.createEntityManager();
+		EntityManager mockEm = mock(EntityManager.class);
-		Object mockEm = MockControl.createControl(EntityManager.class).getMock();
+		given(mockEmf.createEntityManager()).willReturn(mockEm);
-		emfMc.setReturnValue(mockEm, 1);
-		emfMc.replay();
 
-		MockControl emf2Mc = MockControl.createControl(EntityManagerFactoryWithInfo.class);
+		EntityManagerFactoryWithInfo mockEmf2 = mock(EntityManagerFactoryWithInfo.class);
-		EntityManagerFactoryWithInfo mockEmf2 = (EntityManagerFactoryWithInfo) emf2Mc.getMock();
 
 		Map<String, String> persistenceUnits = new HashMap<String, String>();
 		persistenceUnits.put("", "pu1");
@@ -369,13 +356,11 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 		assertSame(mockEmf2, bean2.emf);
 		assertNotNull(bean3.em);
 		assertNotNull(bean4.em);
-
-		emfMc.verify();
 	}
 
+	@Test
 	public void testPersistenceUnitsFromJndiWithDefaultUnit() {
-		MockControl emf2Mc = MockControl.createControl(EntityManagerFactoryWithInfo.class);
+		EntityManagerFactoryWithInfo mockEmf2 = mock(EntityManagerFactoryWithInfo.class);
-		EntityManagerFactoryWithInfo mockEmf2 = (EntityManagerFactoryWithInfo) emf2Mc.getMock();
 
 		Map<String, String> persistenceUnits = new HashMap<String, String>();
 		persistenceUnits.put("System", "pu1");
@@ -403,6 +388,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 		assertSame(mockEmf2, bean2.emf);
 	}
 
+	@Test
 	public void testSinglePersistenceUnitFromJndi() {
 		Map<String, String> persistenceUnits = new HashMap<String, String>();
 		persistenceUnits.put("Person", "pu1");
@@ -427,10 +413,11 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 		assertSame(mockEmf, bean2.emf);
 	}
 
+	@Test
 	public void testPersistenceContextsFromJndi() {
-		Object mockEm = MockControl.createControl(EntityManager.class).getMock();
+		EntityManager mockEm = mock(EntityManager.class);
-		Object mockEm2 = MockControl.createControl(EntityManager.class).getMock();
+		EntityManager mockEm2 = mock(EntityManager.class);
-		Object mockEm3 = MockControl.createControl(EntityManager.class).getMock();
+		EntityManager mockEm3 = mock(EntityManager.class);
 
 		Map<String, String> persistenceContexts = new HashMap<String, String>();
 		persistenceContexts.put("", "pc1");
@@ -466,10 +453,11 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 		assertSame(mockEm3, bean3.em);
 	}
 
+	@Test
 	public void testPersistenceContextsFromJndiWithDefaultUnit() {
-		Object mockEm = MockControl.createControl(EntityManager.class).getMock();
+		EntityManager mockEm = mock(EntityManager.class);
-		Object mockEm2 = MockControl.createControl(EntityManager.class).getMock();
+		EntityManager mockEm2 = mock(EntityManager.class);
-		Object mockEm3 = MockControl.createControl(EntityManager.class).getMock();
+		EntityManager mockEm3 = mock(EntityManager.class);
 
 		Map<String, String> persistenceContexts = new HashMap<String, String>();
 		persistenceContexts.put("System", "pc1");
@@ -506,9 +494,10 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 		assertSame(mockEm3, bean3.em);
 	}
 
+	@Test
 	public void testSinglePersistenceContextFromJndi() {
-		Object mockEm = MockControl.createControl(EntityManager.class).getMock();
+		EntityManager mockEm = mock(EntityManager.class);
-		Object mockEm2 = MockControl.createControl(EntityManager.class).getMock();
+		EntityManager mockEm2 = mock(EntityManager.class);
 
 		Map<String, String> persistenceContexts = new HashMap<String, String>();
 		persistenceContexts.put("System", "pc1");
@@ -537,6 +526,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 		assertSame(mockEm2, bean2.em);
 	}
 
+	@Test
 	public void testFieldOfWrongTypeAnnotatedWithPersistenceUnit() {
 		PersistenceAnnotationBeanPostProcessor babpp = new PersistenceAnnotationBeanPostProcessor();
 		try {
@@ -548,6 +538,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 		}
 	}
 
+	@Test
 	public void testSetterOfWrongTypeAnnotatedWithPersistenceUnit() {
 		PersistenceAnnotationBeanPostProcessor babpp = new PersistenceAnnotationBeanPostProcessor();
 		try {
@@ -559,6 +550,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 		}
 	}
 
+	@Test
 	public void testSetterWithNoArgs() {
 		PersistenceAnnotationBeanPostProcessor babpp = new PersistenceAnnotationBeanPostProcessor();
 		try {
@@ -572,45 +564,37 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 
 	@Ignore
 	public void ignoreTestNoPropertiesPassedIn() {
-		mockEmf.createEntityManager();
+		EntityManager mockEm = mock(EntityManager.class);
-		emfMc.setReturnValue(MockControl.createControl(EntityManager.class).getMock(), 1);
+		given(mockEmf.createEntityManager()).willReturn(mockEm);
-		emfMc.replay();
 
 		PersistenceAnnotationBeanPostProcessor babpp = new MockPersistenceAnnotationBeanPostProcessor();
 		DefaultPrivatePersistenceContextFieldExtended dppcf = new DefaultPrivatePersistenceContextFieldExtended();
 		babpp.postProcessAfterInstantiation(dppcf, "bean name does not matter");
 		assertNotNull(dppcf.em);
-		emfMc.verify();
 	}
 
 	@Ignore
 	public void ignoreTestPropertiesPassedIn() {
 		Properties props = new Properties();
 		props.put("foo", "bar");
-		mockEmf.createEntityManager(props);
+		EntityManager mockEm = mock(EntityManager.class);
-		emfMc.setReturnValue(MockControl.createControl(EntityManager.class).getMock(), 1);
+		given(mockEmf.createEntityManager(props)).willReturn(mockEm);
-		emfMc.replay();
 
 		PersistenceAnnotationBeanPostProcessor babpp = new MockPersistenceAnnotationBeanPostProcessor();
 		DefaultPrivatePersistenceContextFieldExtendedWithProps dppcf =
 				new DefaultPrivatePersistenceContextFieldExtendedWithProps();
 		babpp.postProcessAfterInstantiation(dppcf, "bean name does not matter");
 		assertNotNull(dppcf.em);
-		emfMc.verify();
 	}
 
+	@Test
 	public void testPropertiesForTransactionalEntityManager() {
 		Properties props = new Properties();
 		props.put("foo", "bar");
-		MockControl emC = MockControl.createControl(EntityManager.class);
+		EntityManager em = mock(EntityManager.class);
-		EntityManager em = (EntityManager) emC.getMock();
+		given(mockEmf.createEntityManager(props)).willReturn(em);
-		emfMc.expectAndReturn(mockEmf.createEntityManager(props), em);
+		given(em.getDelegate()).willReturn(new Object());
-		emC.expectAndReturn(em.getDelegate(), new Object());
+		given(em.isOpen()).willReturn(true);
-		emC.expectAndReturn(em.isOpen(), true);
-		em.close();
-
-		emfMc.replay();
-		emC.replay();
 
 		PersistenceAnnotationBeanPostProcessor babpp = new MockPersistenceAnnotationBeanPostProcessor();
 		DefaultPrivatePersistenceContextFieldWithProperties transactionalField =
@@ -620,27 +604,22 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 		assertNotNull(transactionalField.em);
 		assertNotNull(transactionalField.em.getDelegate());
 
-		emfMc.verify();
+		verify(em).close();
-		emC.verify();
 	}
 
 	/**
 	 * Binds an EMF to the thread and tests if EM with different properties
 	 * generate new EMs or not.
 	 */
+	@Test
 	public void testPropertiesForSharedEntityManager1() {
 		Properties props = new Properties();
 		props.put("foo", "bar");
-		MockControl emC = MockControl.createControl(EntityManager.class);
+		EntityManager em = mock(EntityManager.class);
-		EntityManager em = (EntityManager) emC.getMock();
 		// only one call made  - the first EM definition wins (in this case the one w/ the properties)
-		emfMc.expectAndReturn(mockEmf.createEntityManager(props), em);
+		given(mockEmf.createEntityManager(props)).willReturn(em);
-		emC.expectAndReturn(em.getDelegate(), new Object(), 2);
+		given(em.getDelegate()).willReturn(new Object());
-		emC.expectAndReturn(em.isOpen(), true);
+		given(em.isOpen()).willReturn(true);
-		em.close();
-
-		emfMc.replay();
-		emC.replay();
 
 		PersistenceAnnotationBeanPostProcessor babpp = new MockPersistenceAnnotationBeanPostProcessor();
 		DefaultPrivatePersistenceContextFieldWithProperties transactionalFieldWithProperties =
@@ -658,27 +637,22 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 		try {
 			TransactionSynchronizationManager.bindResource(mockEmf, new EntityManagerHolder(em));
 			assertNotNull(transactionalField.em.getDelegate());
-			emfMc.verify();
+			verify(em).close();
-			emC.verify();
 		}
 		finally {
 			TransactionSynchronizationManager.unbindResource(mockEmf);
 		}
 	}
 
+	@Test
 	public void testPropertiesForSharedEntityManager2() {
 		Properties props = new Properties();
 		props.put("foo", "bar");
-		MockControl emC = MockControl.createControl(EntityManager.class);
+		EntityManager em = mock(EntityManager.class);
-		EntityManager em = (EntityManager) emC.getMock();
 		// only one call made  - the first EM definition wins (in this case the one w/o the properties)
-		emfMc.expectAndReturn(mockEmf.createEntityManager(), em);
+		given(mockEmf.createEntityManager()).willReturn(em);
-		emC.expectAndReturn(em.getDelegate(), new Object(), 2);
+		given(em.getDelegate()).willReturn(new Object(), 2);
-		emC.expectAndReturn(em.isOpen(), true);
+		given(em.isOpen()).willReturn(true);
-		em.close();
-
-		emfMc.replay();
-		emC.replay();
 
 		PersistenceAnnotationBeanPostProcessor babpp = new MockPersistenceAnnotationBeanPostProcessor();
 		DefaultPrivatePersistenceContextFieldWithProperties transactionalFieldWithProperties =
@@ -696,8 +670,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 		try {
 			TransactionSynchronizationManager.bindResource(mockEmf, new EntityManagerHolder(em));
 			assertNotNull(transactionalFieldWithProperties.em.getDelegate());
-			emfMc.verify();
+			verify(em).close();
-			emC.verify();
 		}
 		finally {
 			TransactionSynchronizationManager.unbindResource(mockEmf);
@@ -899,5 +872,4 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 			throw new IllegalStateException();
 		}
 	}
-
 }

spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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,13 +16,18 @@
 
 package org.springframework.orm.jpa.support;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 
-import org.easymock.MockControl;
-import static org.junit.Assert.*;
 import org.junit.Test;
-
 import org.springframework.orm.jpa.EntityManagerHolder;
 import org.springframework.orm.jpa.EntityManagerProxy;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
@@ -30,6 +35,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
 /**
  * @author Rod Johnson
  * @author Juergen Hoeller
+ * @author Phillip Webb
  */
 public class SharedEntityManagerFactoryTests {
 
@@ -37,22 +43,11 @@ public class SharedEntityManagerFactoryTests {
 	public void testValidUsage() {
 		Object o = new Object();
 
-		MockControl emMc = MockControl.createControl(EntityManager.class);
+		EntityManager mockEm = mock(EntityManager.class);
-		EntityManager mockEm = (EntityManager) emMc.getMock();
+		given(mockEm.isOpen()).willReturn(true);
 
-		mockEm.contains(o);
+		EntityManagerFactory mockEmf = mock(EntityManagerFactory.class);
-		emMc.setReturnValue(false, 1);
+		given(mockEmf.createEntityManager()).willReturn(mockEm);
-
-		emMc.expectAndReturn(mockEm.isOpen(), true);
-		mockEm.close();
-		emMc.setVoidCallable(1);
-		emMc.replay();
-
-		MockControl emfMc = MockControl.createControl(EntityManagerFactory.class);
-		EntityManagerFactory mockEmf = (EntityManagerFactory) emfMc.getMock();
-		mockEmf.createEntityManager();
-		emfMc.setReturnValue(mockEm, 1);
-		emfMc.replay();
 
 		SharedEntityManagerBean proxyFactoryBean = new SharedEntityManagerBean();
 		proxyFactoryBean.setEntityManagerFactory(mockEmf);
@@ -83,10 +78,9 @@ public class SharedEntityManagerFactoryTests {
 			TransactionSynchronizationManager.unbindResource(mockEmf);
 		}
 
-		emfMc.verify();
-		emMc.verify();
-
 		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
+		verify(mockEm).contains(o);
+		verify(mockEm).close();
 	}
 
 }