HHH-9994 - Finish mariadb (mysql) database profile - Fix hibernate-envers tests hang on

dreab8 · dreab8 · commit 444c7f0eda1c · 2015-08-20T17:53:33.000+01:00
diff --git a/hibernate-envers/hibernate-envers.gradle b/hibernate-envers/hibernate-envers.gradle
@@ -58,3 +58,9 @@ jar {
             'org.apache.tools.ant;resolution:=optional'
     }
 }
+
+tasks."matrix_mariadb" {
+    beforeTest { descriptor ->
+        println "Starting test: " + descriptor
+    }
+}
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/BaseEnversFunctionalTestCase.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/BaseEnversFunctionalTestCase.java
@@ -14,6 +14,7 @@
 import org.hibernate.envers.AuditReader;
 import org.hibernate.envers.AuditReaderFactory;
 import org.hibernate.envers.configuration.EnversSettings;
+import org.hibernate.resource.transaction.spi.TransactionStatus;
 
 import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
 import org.junit.runner.RunWith;
@@ -52,6 +53,11 @@ protected Session getSession() {
 	}
 
 	protected AuditReader getAuditReader() {
+		Session session = getSession();
+		if(session.getTransaction().getStatus() != TransactionStatus.ACTIVE ){
+			session.getTransaction().begin();
+		}
+
 		return AuditReaderFactory.get( getSession() );
 	}
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/BaseEnversJPAFunctionalTestCase.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/BaseEnversJPAFunctionalTestCase.java
@@ -12,6 +12,7 @@
 import java.util.Map;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
+import javax.persistence.spi.PersistenceUnitTransactionType;
 import javax.transaction.SystemException;
 
 import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
@@ -29,12 +30,14 @@
 import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl;
 import org.hibernate.jpa.boot.spi.Bootstrap;
 import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor;
+import org.hibernate.jpa.internal.EntityManagerImpl;
 import org.hibernate.jpa.test.PersistenceUnitDescriptorAdapter;
 
 import org.hibernate.testing.AfterClassOnce;
 import org.hibernate.testing.BeforeClassOnce;
 import org.hibernate.testing.jta.TestingJtaPlatformImpl;
 import org.hibernate.testing.junit4.Helper;
+
 import org.junit.After;
 
 import org.jboss.logging.Logger;
@@ -263,10 +266,28 @@ protected EntityManager getOrCreateEntityManager() {
 	}
 
 	protected AuditReader getAuditReader() {
+		EntityManager entityManager = getOrCreateEntityManager();
+		PersistenceUnitTransactionType transactionType = ((EntityManagerImpl) entityManager).getTransactionType();
+
+		if ( transactionType == PersistenceUnitTransactionType.JTA ) {
+			if ( !JtaStatusHelper.isActive( TestingJtaPlatformImpl.INSTANCE.getTransactionManager() ) ) {
+				try {
+					TestingJtaPlatformImpl.INSTANCE.getTransactionManager().begin();
+				}
+				catch (Exception e) {
+					e.printStackTrace();
+				}
+			}
+		}
+		else if ( !entityManager.getTransaction().isActive() ) {
+			entityManager.getTransaction().begin();
+		}
+
 		if ( auditReader != null ) {
 			return auditReader;
 		}
-		return auditReader = AuditReaderFactory.get( getOrCreateEntityManager() );
+
+		return auditReader = AuditReaderFactory.get( entityManager );
 	}
 
 	protected EntityManager createIsolatedEntityManager() {
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/OutsideTransactionTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/OutsideTransactionTest.java
@@ -9,20 +9,24 @@
 import java.util.Map;
 
 import org.hibernate.Session;
+import org.hibernate.dialect.MySQL5Dialect;
 import org.hibernate.envers.configuration.EnversSettings;
 import org.hibernate.envers.exception.AuditException;
 import org.hibernate.envers.test.BaseEnversFunctionalTestCase;
 import org.hibernate.envers.test.entities.StrTestEntity;
 import org.hibernate.envers.test.integration.collection.norevision.Name;
 import org.hibernate.envers.test.integration.collection.norevision.Person;
 
+import org.hibernate.testing.SkipForDialect;
 import org.hibernate.testing.TestForIssue;
+
 import org.junit.Test;
 
 /**
  * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com)
  */
 @TestForIssue(jiraKey = "HHH-5565")
+@SkipForDialect(value = MySQL5Dialect.class, comment = "The test hangs on")
 public class OutsideTransactionTest extends BaseEnversFunctionalTestCase {
 	@Override
 	protected Class<?>[] getAnnotatedClasses() {
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/AbstractCollectionChangeTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/AbstractCollectionChangeTest.java
@@ -63,6 +63,8 @@ public void initData() {
 		session.getTransaction().commit();
 
 		personId = p.getId();
+
+		session.close();
 	}
 
 	@Test
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/DefaultValueComponents.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/DefaultValueComponents.java
@@ -448,7 +448,6 @@ private void checkCorrectlyPersisted(
 			String expectedComp2Str1Rev1, String expectedComp2Str1Rev2) {
 		// Verify that the entity was correctly persisted
 		EntityManager em = getEntityManager();
-		em.getTransaction().begin();
 		Long entCount = (Long) em.createQuery(
 				"select count(s) from DefaultValueComponentTestEntity s where s.id = "
 						+ expectedId.toString()
@@ -483,6 +482,5 @@ private void checkCorrectlyPersisted(
 		else {
 			assert expectedComp2Str1Rev2.equals( comp2Str1Rev2 );
 		}
-		em.getTransaction().commit();
 	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/EmbeddableWithDeclaredDataTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/EmbeddableWithDeclaredDataTest.java
@@ -57,6 +57,7 @@ public void testEmbeddableThatExtendsMappedSuperclass() {
 
 		// Reload and Compare Revision
 		EntityManager em = getEntityManager();
+		em.getTransaction().begin();
 		EntityWithEmbeddableWithDeclaredData entityLoaded = em.find( EntityWithEmbeddableWithDeclaredData.class, id );
 
 		AuditReader reader = AuditReaderFactory.get( em );
@@ -65,7 +66,7 @@ public void testEmbeddableThatExtendsMappedSuperclass() {
 		Assert.assertEquals( 1, revs.size() );
 
 		EntityWithEmbeddableWithDeclaredData entityRev1 = reader.find( EntityWithEmbeddableWithDeclaredData.class, id, revs.get( 0 ) );
-
+		em.getTransaction().commit();
 		Assert.assertEquals( entityLoaded.getName(), entityRev1.getName() );
 
 		// only value.codeArt should be audited because it is the only audited field in EmbeddableWithDeclaredData;
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredDataTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredDataTest.java
@@ -55,6 +55,7 @@ public void testEmbeddableThatExtendsMappedSuperclass() {
 
 		// Reload and Compare Revision
 		EntityManager em = getEntityManager();
+		em.getTransaction().begin();
 		EntityWithEmbeddableWithNoDeclaredData entityLoaded = em.find( EntityWithEmbeddableWithNoDeclaredData.class, id );
 
 		AuditReader reader = AuditReaderFactory.get( em );
@@ -64,6 +65,7 @@ public void testEmbeddableThatExtendsMappedSuperclass() {
 
 		EntityWithEmbeddableWithNoDeclaredData entityRev1 = reader.find( EntityWithEmbeddableWithNoDeclaredData.class, id, revs.get( 0 ) );
 
+		em.getTransaction().commit();
 		Assert.assertEquals( entityLoaded.getName(), entityRev1.getName() );
 
 		// value should be null because there is no data in EmbeddableWithNoDeclaredData
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/EnumTypeTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/EnumTypeTest.java
@@ -43,9 +43,11 @@ public void initData() {
 	@Test
 	public void testEnumRepresentation() {
 		EntityManager entityManager = getEntityManager();
+		entityManager.getTransaction().begin();
 		List<Object[]> values = entityManager.createNativeQuery(
 				"SELECT enum1, enum2 FROM EnumTypeEntity_AUD ORDER BY rev ASC"
 		).getResultList();
+		entityManager.getTransaction().commit();
 		entityManager.close();
 
 		Assert.assertNotNull( values );
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/merge/AddDelTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/merge/AddDelTest.java
@@ -60,8 +60,6 @@ public void initData() {
 	public void testRevisionsCountOfGivenIdStrEntity() {
 		// Revision 2 has not changed entity's state.
 		Assert.assertEquals( Arrays.asList( 1, 3 ), getAuditReader().getRevisions( GivenIdStrEntity.class, 1 ) );
-
-		getSession().close();
 	}
 
 	@Test
@@ -74,7 +72,5 @@ public void testHistoryOfGivenIdStrEntity() {
 				3
 		)
 		);
-
-		getSession().close();
 	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicJoinColumnSet.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicJoinColumnSet.java
@@ -106,8 +106,12 @@ public void testRevisionsCounts() {
 
 	@Test
 	public void testHistoryOfColl1() {
-		StrTestEntity str1 = getEntityManager().find( StrTestEntity.class, str1_id );
-		StrTestEntity str2 = getEntityManager().find( StrTestEntity.class, str2_id );
+		EntityManager entityManager = getEntityManager();
+		entityManager.getTransaction().begin();
+		StrTestEntity str1 = entityManager.find( StrTestEntity.class, str1_id );
+		StrTestEntity str2 = entityManager.find( StrTestEntity.class, str2_id );
+
+		entityManager.getTransaction().commit();
 
 		SetJoinColumnRefCollEntity rev1 = getAuditReader().find( SetJoinColumnRefCollEntity.class, coll1_id, 1 );
 		SetJoinColumnRefCollEntity rev2 = getAuditReader().find( SetJoinColumnRefCollEntity.class, coll1_id, 2 );
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/AuditedCollectionProxyTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/AuditedCollectionProxyTest.java
@@ -65,6 +65,8 @@ public void initData() {
 	public void testProxyIdentifier() {
 		EntityManager em = getEntityManager();
 
+		em.getTransaction().begin();
+
 		ListRefEdEntity listReferencedEntity1 = em.getReference(
 				ListRefEdEntity.class, id_ListRefEdEntity1
 		);
@@ -76,12 +78,10 @@ public void testProxyIdentifier() {
 				Integer.valueOf( 3 ), "refing3", listReferencedEntity1
 		);
 
-		em.getTransaction().begin();
 		em.persist( refingEntity3 );
-		em.getTransaction().commit();
 
 		listReferencedEntity1.getReffering().size();
-
+		em.getTransaction().commit();
 	}
 
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/QueryingWithProxyObjectTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/QueryingWithProxyObjectTest.java
@@ -71,6 +71,5 @@ public void testQueryingWithProxyObject() {
 				.getSingleResult();
 		Assert.assertEquals( originalSte, ste );
 
-		getSession().close();
 	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/readwriteexpression/ReadWriteExpressionChange.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/readwriteexpression/ReadWriteExpressionChange.java
@@ -43,6 +43,7 @@ public void initData() {
 	@Test
 	public void shouldRespectWriteExpression() {
 		EntityManager em = getEntityManager();
+		em.getTransaction().begin();
 		List resultList = em.createNativeQuery( "select size_in_cm from t_staff_AUD where id =" + id ).getResultList();
 		Assert.assertEquals( 1, resultList.size() );
 		Double sizeInCm = null;
@@ -52,6 +53,7 @@ public void shouldRespectWriteExpression() {
 		else {
 			sizeInCm = (Double) resultList.get( 0 );
 		}
+		em.getTransaction().commit();
 		Assert.assertEquals( HEIGHT_CENTIMETERS, sizeInCm.doubleValue(), 0.00000001 );
 	}
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/removal/RemoveDefaultRevisionEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/removal/RemoveDefaultRevisionEntity.java
@@ -8,9 +8,13 @@
 
 import org.hibernate.envers.enhanced.SequenceIdRevisionEntity;
 
+import org.hibernate.testing.DialectChecks;
+import org.hibernate.testing.RequiresDialectFeature;
+
 /**
  * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com)
  */
+@RequiresDialectFeature(DialectChecks.SupportsCascadeDeleteCheck.class)
 public class RemoveDefaultRevisionEntity extends AbstractRevisionEntityRemovalTest {
 	@Override
 	protected Class<?> getRevisionEntityClass() {
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/removal/RemoveTrackingRevisionEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/removal/RemoveTrackingRevisionEntity.java
@@ -10,9 +10,13 @@
 
 import org.hibernate.envers.enhanced.SequenceIdTrackingModifiedEntitiesRevisionEntity;
 
+import org.hibernate.testing.DialectChecks;
+import org.hibernate.testing.RequiresDialectFeature;
+
 /**
  * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com)
  */
+@RequiresDialectFeature(DialectChecks.SupportsCascadeDeleteCheck.class)
 public class RemoveTrackingRevisionEntity extends AbstractRevisionEntityRemovalTest {
 	@Override
 	public void addConfigOptions(Map configuration) {

Original file line number	Diff line number	Diff line change
`@@ -58,3 +58,9 @@ jar {`
`58`	`58`	`'org.apache.tools.ant;resolution:=optional'`
`59`	`59`	`}`
`60`	`60`	`}`
	`61`	`+`
	`62`	`+tasks."matrix_mariadb" {`
	`63`	`+ beforeTest { descriptor ->`
	`64`	`+ println "Starting test: " + descriptor`
	`65`	`+ }`
	`66`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,8 @@ public void initData() {`
`63`	`63`	`session.getTransaction().commit();`
`64`	`64`
`65`	`65`	`personId = p.getId();`
	`66`	`+`
	`67`	`+ session.close();`
`66`	`68`	`}`
`67`	`69`
`68`	`70`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -448,7 +448,6 @@ private void checkCorrectlyPersisted(`
`448`	`448`	`String expectedComp2Str1Rev1, String expectedComp2Str1Rev2) {`
`449`	`449`	`// Verify that the entity was correctly persisted`
`450`	`450`	`EntityManager em = getEntityManager();`
`451`		`- em.getTransaction().begin();`
`452`	`451`	`Long entCount = (Long) em.createQuery(`
`453`	`452`	`"select count(s) from DefaultValueComponentTestEntity s where s.id = "`
`454`	`453`	`+ expectedId.toString()`
`@@ -483,6 +482,5 @@ private void checkCorrectlyPersisted(`
`483`	`482`	`else {`
`484`	`483`	`assert expectedComp2Str1Rev2.equals( comp2Str1Rev2 );`
`485`	`484`	`}`
`486`		`- em.getTransaction().commit();`
`487`	`485`	`}`
`488`	`486`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,6 @@ public void initData() {`
`60`	`60`	`public void testRevisionsCountOfGivenIdStrEntity() {`
`61`	`61`	`// Revision 2 has not changed entity's state.`
`62`	`62`	`Assert.assertEquals( Arrays.asList( 1, 3 ), getAuditReader().getRevisions( GivenIdStrEntity.class, 1 ) );`
`63`		`-`
`64`		`- getSession().close();`
`65`	`63`	`}`
`66`	`64`
`67`	`65`	`@Test`
`@@ -74,7 +72,5 @@ public void testHistoryOfGivenIdStrEntity() {`
`74`	`72`	`3`
`75`	`73`	`)`
`76`	`74`	`);`
`77`		`-`
`78`		`- getSession().close();`
`79`	`75`	`}`
`80`	`76`	`}`