Fix EmbeddableIntegratorTest

Author: dreab8

hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/EmbeddableIntegratorTest.java

@@ -6,6 +6,7 @@
  */
 package org.hibernate.test.annotations.embeddables;
 
+import javax.persistence.PersistenceException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
@@ -16,13 +17,14 @@
 import org.hibernate.SessionFactory;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.dialect.H2Dialect;
-import org.hibernate.exception.GenericJDBCException;
 
 import org.hibernate.testing.RequiresDialect;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.junit.Test;
 
+import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 /**
  * @author Chris Pheby
@@ -33,24 +35,31 @@ public class EmbeddableIntegratorTest extends BaseUnitTestCase {
 	/**
 	 * Throws a mapping exception because DollarValue is not mapped
 	 */
-	@Test(expected = JDBCException.class)
+	@Test
 	public void testWithoutIntegrator() {
 		SessionFactory sf = new Configuration().addAnnotatedClass( Investor.class )
 				.setProperty( "hibernate.hbm2ddl.auto", "create-drop" )
 				.buildSessionFactory();
 
 		try {
 			Session sess = sf.openSession();
-			Investor myInv = getInvestor();
-			myInv.setId( 1L );
-
-			sess.save( myInv );
-			sess.flush();
-			sess.clear();
-
-			Investor inv = (Investor) sess.get( Investor.class, 1L );
-			assertEquals( new BigDecimal( "100" ), inv.getInvestments().get( 0 ).getAmount().getAmount() );
-
+			try {
+				sess.getTransaction().begin();
+				Investor myInv = getInvestor();
+				myInv.setId( 1L );
+
+				sess.save( myInv );
+				sess.flush();
+				fail("A JDBCException expected");
+
+				sess.clear();
+
+				Investor inv = (Investor) sess.get( Investor.class, 1L );
+				assertEquals( new BigDecimal( "100" ), inv.getInvestments().get( 0 ).getAmount().getAmount() );
+			}catch (PersistenceException e){
+				assertTyping(JDBCException.class, e.getCause());
+				sess.getTransaction().rollback();
+			}
 			sess.close();
 		}
 		finally {
@@ -65,8 +74,9 @@ public void testWithTypeContributor() {
 				.setProperty( "hibernate.hbm2ddl.auto", "create-drop" )
 				.buildSessionFactory();
 
+		Session sess = sf.openSession();
 		try {
-			Session sess = sf.openSession();
+			sess.getTransaction().begin();
 			Investor myInv = getInvestor();
 			myInv.setId( 2L );
 
@@ -78,6 +88,8 @@ public void testWithTypeContributor() {
 			assertEquals( new BigDecimal( "100" ), inv.getInvestments().get( 0 ).getAmount().getAmount() );
 
 			sess.close();
+		}catch (Exception e){
+			sess.getTransaction().rollback();
 		}
 		finally {
 			sf.close();