Delete test annotations in spring-orm

This commit deletes all test annotations from the spring-orm module in
order to reduce unnecessary confusion between these "copies" and the
real, current versions of such classes in the spring-test module.

Furthermore, the legacy abstract JUnit 3.8 base classes and test cases
have been refactored accordingly.

Author: sbrannen

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

@@ -28,10 +28,8 @@
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.orm.jpa.domain.DriversLicense;
 import org.springframework.orm.jpa.domain.Person;
-import org.springframework.test.annotation.ExpectedException;
-import org.springframework.test.annotation.NotTransactional;
-import org.springframework.test.annotation.Repeat;
-import org.springframework.test.annotation.Timed;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.SerializationTestUtils;
 
 /**
@@ -42,39 +40,40 @@
  * @author Juergen Hoeller
  */
 @SuppressWarnings("deprecation")
-public abstract class AbstractContainerEntityManagerFactoryIntegrationTests
-		extends AbstractEntityManagerFactoryIntegrationTests {
+public abstract class AbstractContainerEntityManagerFactoryIntegrationTests extends
+		AbstractEntityManagerFactoryIntegrationTests {
 
-	@NotTransactional
+	@Transactional(propagation = Propagation.NOT_SUPPORTED)
 	public void testEntityManagerFactoryImplementsEntityManagerFactoryInfo() {
 		assertTrue(Proxy.isProxyClass(entityManagerFactory.getClass()));
-		assertTrue("Must have introduced config interface",
-				entityManagerFactory instanceof EntityManagerFactoryInfo);
+		assertTrue("Must have introduced config interface", entityManagerFactory instanceof EntityManagerFactoryInfo);
 		EntityManagerFactoryInfo emfi = (EntityManagerFactoryInfo) entityManagerFactory;
-		//assertEquals("Person", emfi.getPersistenceUnitName());
+		// assertEquals("Person", emfi.getPersistenceUnitName());
 		assertNotNull("PersistenceUnitInfo must be available", emfi.getPersistenceUnitInfo());
 		assertNotNull("Raw EntityManagerFactory must be available", emfi.getNativeEntityManagerFactory());
 	}
 
 	public void testStateClean() {
-		assertEquals("Should be no people from previous transactions",
-				0, countRowsInTable("person"));
+		assertEquals("Should be no people from previous transactions", 0, countRowsInTable("person"));
+	}
+
+	public void testJdbcTx1_1() {
+		testJdbcTx2();
+	}
+
+	public void testJdbcTx1_2() {
+		testJdbcTx2();
 	}
 
-	@Repeat(5)
-	public void testJdbcTx1() throws Exception {
+	public void testJdbcTx1_3() {
 		testJdbcTx2();
 	}
 
-	@Timed(millis=273)
-	public void testJdbcTx2() throws InterruptedException {
-		//Thread.sleep(2000);
+	public void testJdbcTx2() {
 		assertEquals("Any previous tx must have been rolled back", 0, countRowsInTable("person"));
-		//insertPerson("foo");
 		executeSqlScript("/org/springframework/orm/jpa/insertPerson.sql", false);
 	}
 
-	//@NotTransactional
 	@SuppressWarnings({ "unused", "unchecked" })
 	public void testEntityManagerProxyIsProxy() {
 		assertTrue(Proxy.isProxyClass(sharedEntityManager.getClass()));
@@ -86,21 +85,31 @@ public void testEntityManagerProxyIsProxy() {
 		assertTrue("Close should have been silently ignored", sharedEntityManager.isOpen());
 	}
 
-	@ExpectedException(RuntimeException.class)
 	public void testBogusQuery() {
-		Query query = sharedEntityManager.createQuery("It's raining toads");
-		// required in OpenJPA case
-		query.executeUpdate();
+		try {
+			Query query = sharedEntityManager.createQuery("It's raining toads");
+			// required in OpenJPA case
+			query.executeUpdate();
+			fail("Should have thrown a RuntimeException");
+		}
+		catch (RuntimeException e) {
+			/* expected */
+		}
 	}
 
-	@ExpectedException(EntityNotFoundException.class)
 	public void testGetReferenceWhenNoRow() {
-		Person notThere = sharedEntityManager.getReference(Person.class, 666);
+		try {
+			Person notThere = sharedEntityManager.getReference(Person.class, 666);
 
-		// We may get here (as with Hibernate).
-		// Either behaviour is valid: throw exception on first access
-		// or on getReference itself.
-		notThere.getFirstName();
+			// We may get here (as with Hibernate).
+			// Either behaviour is valid: throw exception on first access
+			// or on getReference itself.
+			notThere.getFirstName();
+			fail("Should have thrown an EntityNotFoundException");
+		}
+		catch (EntityNotFoundException e) {
+			/* expected */
+		}
 	}
 
 	public void testLazyLoading() {
@@ -125,7 +134,6 @@ public void testLazyLoading() {
 		}
 		finally {
 			deleteFromTables(new String[] { "person", "drivers_license" });
-			//setComplete();
 		}
 	}
 
@@ -157,12 +165,12 @@ public void testEntityManagerProxyRejectsProgrammaticTxManagement() {
 		}
 	}
 
-//	public void testAspectJInjectionOfConfigurableEntity() {
-//		Person p = new Person();
-//		System.err.println(p);
-//		assertNotNull("Was injected", p.getTestBean());
-//		assertEquals("Ramnivas", p.getTestBean().getName());
-//	}
+	// public void testAspectJInjectionOfConfigurableEntity() {
+	// Person p = new Person();
+	// System.err.println(p);
+	// assertNotNull("Was injected", p.getTestBean());
+	// assertEquals("Ramnivas", p.getTestBean().getName());
+	// }
 
 	public void testInstantiateAndSaveWithSharedEmProxy() {
 		testInstantiateAndSave(sharedEntityManager);
@@ -194,7 +202,7 @@ public void testQueryNoPersons() {
 		}
 	}
 
-	@NotTransactional
+	@Transactional(propagation = Propagation.NOT_SUPPORTED)
 	@SuppressWarnings("unchecked")
 	public void testQueryNoPersonsNotTransactional() {
 		EntityManager em = entityManagerFactory.createEntityManager();
@@ -225,7 +233,7 @@ public void testQueryNoPersonsShared() {
 		}
 	}
 
-	@NotTransactional
+	@Transactional(propagation = Propagation.NOT_SUPPORTED)
 	@SuppressWarnings("unchecked")
 	public void testQueryNoPersonsSharedNotTransactional() {
 		EntityManager em = SharedEntityManagerCreator.createSharedEntityManager(entityManagerFactory);
@@ -238,7 +246,9 @@ public void testQueryNoPersonsSharedNotTransactional() {
 			fail("Should have thrown IllegalStateException");
 		}
 		catch (Exception ex) {
-			// IllegalStateException expected, but PersistenceException thrown by Hibernate
+			// IllegalStateException expected, but PersistenceException thrown by
+			// Hibernate
+			System.err.println(ex);
 			assertTrue(ex.getMessage().indexOf("closed") != -1);
 		}
 		q = em.createQuery("select p from Person as p");

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 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,16 +16,15 @@
 
 package org.springframework.orm.jpa;
 
-import java.util.List;
 import java.lang.reflect.Proxy;
+import java.util.List;
 
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 import javax.persistence.TransactionRequiredException;
 
 import org.springframework.orm.jpa.domain.Person;
-import org.springframework.orm.jpa.AbstractEntityManagerFactoryIntegrationTests;
-import org.springframework.test.annotation.NotTransactional;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
@@ -38,7 +37,7 @@
 @SuppressWarnings("deprecation")
 public class ApplicationManagedEntityManagerIntegrationTests extends AbstractEntityManagerFactoryIntegrationTests {
 
-	@NotTransactional
+	@Transactional(propagation = Propagation.NOT_SUPPORTED)
 	public void testEntityManagerIsProxy() {
 		assertTrue("EntityManagerFactory is proxied", Proxy.isProxyClass(entityManagerFactory.getClass()));
 	}

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

@@ -16,8 +16,8 @@
 
 package org.springframework.orm.jpa;
 
-import java.util.List;
 import java.lang.reflect.Proxy;
+import java.util.List;
 
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceException;
@@ -27,8 +27,8 @@
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.orm.jpa.domain.Person;
-import org.springframework.test.annotation.ExpectedException;
-import org.springframework.test.annotation.NotTransactional;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Integration tests using in-memory database for container-managed JPA
@@ -39,12 +39,12 @@
 @SuppressWarnings("deprecation")
 public class ContainerManagedEntityManagerIntegrationTests extends AbstractEntityManagerFactoryIntegrationTests {
 
-	@NotTransactional
+	@Transactional(propagation = Propagation.NOT_SUPPORTED)
 	public void testExceptionTranslationWithDialectFoundOnIntroducedEntityManagerInfo() throws Exception {
 		doTestExceptionTranslationWithDialectFound(((EntityManagerFactoryInfo) entityManagerFactory).getJpaDialect());
 	}
 
-	@NotTransactional
+	@Transactional(propagation = Propagation.NOT_SUPPORTED)
 	public void testExceptionTranslationWithDialectFoundOnEntityManagerFactoryBean() throws Exception {
 		AbstractEntityManagerFactoryBean aefb =
 				(AbstractEntityManagerFactoryBean) applicationContext.getBean("&entityManagerFactory");
@@ -80,9 +80,14 @@ public void testEntityManagerProxyIsProxy() {
 	}
 
 	// This would be legal, at least if not actually _starting_ a tx
-	@ExpectedException(IllegalStateException.class)
 	public void testEntityManagerProxyRejectsProgrammaticTxManagement() {
-		createContainerManagedEntityManager().getTransaction();
+		try {
+			createContainerManagedEntityManager().getTransaction();
+			fail("Should have thrown an IllegalStateException");
+		}
+		catch (IllegalStateException e) {
+			/* expected */
+		}
 	}
 
 	/*
@@ -93,10 +98,15 @@ public void testContainerEntityManagerProxyAllowsJoinTransactionInTransaction()
 		createContainerManagedEntityManager().joinTransaction();
 	}
 
-	@NotTransactional
-	@ExpectedException(TransactionRequiredException.class)
+	@Transactional(propagation = Propagation.NOT_SUPPORTED)
 	public void testContainerEntityManagerProxyRejectsJoinTransactionWithoutTransaction() {
-		createContainerManagedEntityManager().joinTransaction();
+		try {
+			createContainerManagedEntityManager().joinTransaction();
+			fail("Should have thrown a TransactionRequiredException");
+		}
+		catch (TransactionRequiredException e) {
+			/* expected */
+		}
 	}
 
 	public void testInstantiateAndSave() {

spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java

@@ -25,23 +25,31 @@
 import org.springframework.orm.jpa.AbstractContainerEntityManagerFactoryIntegrationTests;
 import org.springframework.orm.jpa.EntityManagerFactoryInfo;
 import org.springframework.orm.jpa.domain.Person;
-import org.springframework.test.annotation.IfProfileValue;
 
 /**
  * Hibernate-specific JPA tests.
  *
  * @author Juergen Hoeller
  * @author Rod Johnson
  */
-// Essentially @Ignore-d since AnnotationBeanConfigurerAspect cannot be found
-@IfProfileValue(name="test-group", value="broken")
+// TODO Decide what to do with broken HibernateEntityManagerFactoryIntegrationTests.
+// See isDisabledInThisEnvironment() for details.
 @SuppressWarnings("deprecation")
 public class HibernateEntityManagerFactoryIntegrationTests extends
 		AbstractContainerEntityManagerFactoryIntegrationTests {
 
 	private SessionFactory sessionFactory;
 
 
+	/**
+	 * Always returns {@code true}, thereby disabling this entire test class
+	 * since AnnotationBeanConfigurerAspect cannot be found.
+	 */
+	@Override
+	protected boolean isDisabledInThisEnvironment(String testMethodName) {
+		return true;
+	}
+
 	public void setSessionFactory(SessionFactory sessionFactory) {
 		this.sessionFactory = sessionFactory;
 	}
@@ -51,7 +59,6 @@ protected String[] getConfigLocations() {
 		return HIBERNATE_CONFIG_LOCATIONS;
 	}
 
-
 	public void testCanCastNativeEntityManagerFactoryToHibernateEntityManagerFactoryImpl() {
 		EntityManagerFactoryInfo emfi = (EntityManagerFactoryInfo) entityManagerFactory;
 		assertTrue(emfi.getNativeEntityManagerFactory() instanceof HibernateEntityManagerFactory);
@@ -78,7 +85,7 @@ public void testWithHibernateSessionFactory() {
 	public void testConfigurablePerson() {
 		Query q = this.sessionFactory.getCurrentSession().createQuery("select p from ContextualPerson as p");
 		assertEquals(0, q.list().size());
-		//assertNotNull(new ContextualPerson().entityManager);  TODO
+		// assertNotNull(new ContextualPerson().entityManager); TODO
 	}
 
 }

spring-orm/src/test/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -27,6 +27,8 @@
 import org.springframework.util.Assert;
 
 /**
+ * This class is only used within tests in the spring-orm module.
+ *
  * <p>
  * Convenient superclass for JUnit 3.8 based tests depending on a Spring
  * context. The test instance itself is populated by Dependency Injection.

spring-orm/src/test/java/org/springframework/test/AbstractSingleSpringContextTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -26,6 +26,8 @@
 import org.springframework.util.StringUtils;
 
 /**
+ * This class is only used within tests in the spring-orm module.
+ *
  * <p>
  * Abstract JUnit 3.8 test class that holds and exposes a single Spring
  * {@link org.springframework.context.ApplicationContext ApplicationContext}.

spring-orm/src/test/java/org/springframework/test/AbstractSpringContextTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -25,6 +25,8 @@
 import org.springframework.util.StringUtils;
 
 /**
+ * This class is only used within tests in the spring-orm module.
+ *
  * <p>
  * Superclass for JUnit 3.8 test cases using Spring
  * {@link org.springframework.context.ApplicationContext ApplicationContexts}.

spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -31,7 +31,9 @@
 import org.springframework.test.jdbc.JdbcTestUtils;
 
 /**
- * Subclass of AbstractTransactionalSpringContextTests that adds some convenience
+ * This class is only used within tests in the spring-orm module.
+ *
+ * <p>Subclass of AbstractTransactionalSpringContextTests that adds some convenience
  * functionality for JDBC access. Expects a {@link javax.sql.DataSource} bean
  * to be defined in the Spring application context.
  *