[hibernate-commits] Hibernate SVN: r15676 - in core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test: emops and 3 other directories.

[hibernate-commits at lists.jboss.org]

Author: jcosta at redhat.com
Date: 2008-12-10 07:01:47 -0500 (Wed, 10 Dec 2008)
New Revision: 15676

Modified:
   core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CallbacksTest.java
   core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/emops/FlushTest.java
   core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/exception/ExceptionTest.java
   core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/lock/LockTest.java
   core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java
Log:
EJB-407 - Fixing the test cases, to close the EM and/or finish the active transaction

Modified: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CallbacksTest.java
===================================================================
--- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CallbacksTest.java	2008-12-10 01:59:47 UTC (rev 15675)
+++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CallbacksTest.java	2008-12-10 12:01:47 UTC (rev 15676)
@@ -116,6 +116,7 @@
 		em.flush();
 		assertNotNull( rc.getCreationDate() );
 		em.getTransaction().rollback();
+		em.close();
 	}
 
 	public void testCallBackListenersHierarchy() throws Exception {

Modified: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/emops/FlushTest.java
===================================================================
--- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/emops/FlushTest.java	2008-12-10 01:59:47 UTC (rev 15675)
+++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/emops/FlushTest.java	2008-12-10 12:01:47 UTC (rev 15676)
@@ -66,7 +66,10 @@
 		for (Decorate value : founds) {
 			assertTrue( names.contains( value.getPet().getName() ) );
 		}
+		manager.getTransaction().rollback();
 		
+		manager.close();
+		
 	}
 
 	public Dog createDog(String name, double weight, int bones, EntityManager manager) {

Modified: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/exception/ExceptionTest.java
===================================================================
--- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/exception/ExceptionTest.java	2008-12-10 01:59:47 UTC (rev 15675)
+++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/exception/ExceptionTest.java	2008-12-10 12:01:47 UTC (rev 15676)
@@ -99,6 +99,7 @@
 		catch( PersistenceException e ) {
 			Throwable t = e.getCause();
 			assertTrue("Should be a constraint violation", t instanceof ConstraintViolationException);
+			em.getTransaction().rollback();
 		}
 		finally {
 			em.close();

Modified: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/lock/LockTest.java
===================================================================
--- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/lock/LockTest.java	2008-12-10 01:59:47 UTC (rev 15675)
+++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/lock/LockTest.java	2008-12-10 12:01:47 UTC (rev 15676)
@@ -30,6 +30,8 @@
 		assertEquals( "surname", lock.getName() );
 		em.remove( lock );
 		em.getTransaction().commit();
+		
+		em.close();
 	}
 
 	public void testLockWrite() throws Exception {

Modified: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java
===================================================================
--- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java	2008-12-10 01:59:47 UTC (rev 15675)
+++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java	2008-12-10 12:01:47 UTC (rev 15676)
@@ -42,6 +42,7 @@
 		em.getTransaction().begin();
 		em.remove( em.find( Book.class, book.id ) );
 		em.getTransaction().commit();
+		em.close();
 	}
 
 //	public void testTransactionalOperationsWhenTransactional() throws Exception {