HHH-19871 --wip-- Envers migration to JUnit 6

- `org.hibernate.orm.test.envers.integration.collection`

Author: mbellade

hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/CollectionNullValueTest.java

@@ -7,38 +7,35 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase;
-import org.hibernate.orm.test.envers.Priority;
+import org.hibernate.envers.AuditReaderFactory;
 import org.hibernate.orm.test.envers.entities.collection.StringListEntity;
 import org.hibernate.orm.test.envers.entities.collection.StringMapEntity;
 import org.hibernate.orm.test.envers.entities.collection.StringSetEntity;
 import org.hibernate.orm.test.envers.tools.TestTools;
-import org.junit.Test;
-
+import org.hibernate.testing.envers.junit.EnversTest;
+import org.hibernate.testing.orm.junit.BeforeClassTemplate;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.Test;
 
-import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author Chris Cranford
  */
 @JiraKey(value = "HHH-11901")
-public class CollectionNullValueTest extends BaseEnversJPAFunctionalTestCase {
+@EnversTest
+@Jpa(annotatedClasses = { StringMapEntity.class, StringListEntity.class, StringSetEntity.class })
+public class CollectionNullValueTest {
 	private Integer mapId;
 	private Integer listId;
 	private Integer setId;
 
-	@Override
-	protected Class<?>[] getAnnotatedClasses() {
-		return new Class<?>[] { StringMapEntity.class, StringListEntity.class, StringSetEntity.class };
-	}
-
-	@Test
-	@Priority(10)
-	public void initData() {
+	@BeforeClassTemplate
+	public void initData(EntityManagerFactoryScope scope) {
 		// Persist map with null values
-		mapId = doInJPA( this::entityManagerFactory, entityManager -> {
+		mapId = scope.fromTransaction( entityManager -> {
 			final StringMapEntity sme = new StringMapEntity();
 			sme.getStrings().put( "A", "B" );
 			sme.getStrings().put( "B", null );
@@ -48,7 +45,7 @@ public void initData() {
 		} );
 
 		// Update map with null values
-		doInJPA( this::entityManagerFactory, entityManager -> {
+		scope.inTransaction( entityManager -> {
 			final StringMapEntity sme = entityManager.find( StringMapEntity.class, mapId );
 			sme.getStrings().put( "C", null );
 			sme.getStrings().put( "D", "E" );
@@ -57,7 +54,7 @@ public void initData() {
 		} );
 
 		// Persist list with null values
-		listId = doInJPA( this::entityManagerFactory, entityManager -> {
+		listId = scope.fromTransaction( entityManager -> {
 			final StringListEntity sle = new StringListEntity();
 			sle.getStrings().add( "A" );
 			sle.getStrings().add( null );
@@ -67,7 +64,7 @@ public void initData() {
 		} );
 
 		// Update list with null values
-		doInJPA( this::entityManagerFactory, entityManager -> {
+		scope.inTransaction( entityManager -> {
 			final StringListEntity sle = entityManager.find( StringListEntity.class, listId );
 			sle.getStrings().add( null );
 			sle.getStrings().add( "D" );
@@ -76,7 +73,7 @@ public void initData() {
 		} );
 
 		// Persist set with null values
-		setId = doInJPA( this::entityManagerFactory, entityManager -> {
+		setId = scope.fromTransaction( entityManager -> {
 			final StringSetEntity sse = new StringSetEntity();
 			sse.getStrings().add( "A" );
 			sse.getStrings().add( null );
@@ -86,7 +83,7 @@ public void initData() {
 		} );
 
 		// Update set with null values
-		doInJPA( this::entityManagerFactory, entityManager -> {
+		scope.inTransaction( entityManager -> {
 			final StringSetEntity sse = entityManager.find( StringSetEntity.class, setId );
 			sse.getStrings().add( null );
 			sse.getStrings().add( "D" );
@@ -96,41 +93,49 @@ public void initData() {
 	}
 
 	@Test
-	public void testStringMapHistory() {
-		final List<Number> revisions = getAuditReader().getRevisions( StringMapEntity.class, mapId );
-		assertEquals( Arrays.asList( 1, 2 ), revisions );
+	public void testStringMapHistory(EntityManagerFactoryScope scope) {
+		scope.inEntityManager( entityManager -> {
+			final var auditReader = AuditReaderFactory.get( entityManager );
+			final List<Number> revisions = auditReader.getRevisions( StringMapEntity.class, mapId );
+			assertEquals( Arrays.asList( 1, 2 ), revisions );
 
-		final StringMapEntity rev1 = getAuditReader().find( StringMapEntity.class, mapId, 1 );
-		assertEquals( TestTools.makeMap( "A", "B" ), rev1.getStrings() );
+			final StringMapEntity rev1 = auditReader.find( StringMapEntity.class, mapId, 1 );
+			assertEquals( TestTools.makeMap( "A", "B" ), rev1.getStrings() );
 
-		final StringMapEntity rev2 = getAuditReader().find( StringMapEntity.class, mapId, 2 );
-		assertEquals( TestTools.makeMap( "D", "E" ), rev2.getStrings() );
+			final StringMapEntity rev2 = auditReader.find( StringMapEntity.class, mapId, 2 );
+			assertEquals( TestTools.makeMap( "D", "E" ), rev2.getStrings() );
+		} );
 	}
 
 	@Test
-	public void testStringListHistory() {
-		final List<Number> revisions = getAuditReader().getRevisions( StringListEntity.class, listId );
-		assertEquals( Arrays.asList( 3, 4 ), revisions );
-
-		final StringListEntity rev3 = getAuditReader().find( StringListEntity.class, listId, 3 );
-		assertEquals( TestTools.makeList( "A" ), rev3.getStrings() );
-
-		// NOTE: the only reason this assertion expects a null element is because the collection is indexed.
-		// ORM will return a list that consists of { null, "D" } and Envers should effectively mimic that.
-		final StringListEntity rev4 = getAuditReader().find( StringListEntity.class, listId, 4 );
-		assertEquals( TestTools.makeList( null, "D" ), rev4.getStrings() );
+	public void testStringListHistory(EntityManagerFactoryScope scope) {
+		scope.inEntityManager( entityManager -> {
+			final var auditReader = AuditReaderFactory.get( entityManager );
+			final List<Number> revisions = auditReader.getRevisions( StringListEntity.class, listId );
+			assertEquals( Arrays.asList( 3, 4 ), revisions );
+
+			final StringListEntity rev3 = auditReader.find( StringListEntity.class, listId, 3 );
+			assertEquals( TestTools.makeList( "A" ), rev3.getStrings() );
+
+			// NOTE: the only reason this assertion expects a null element is because the collection is indexed.
+			// ORM will return a list that consists of { null, "D" } and Envers should effectively mimic that.
+			final StringListEntity rev4 = auditReader.find( StringListEntity.class, listId, 4 );
+			assertEquals( TestTools.makeList( null, "D" ), rev4.getStrings() );
+		} );
 	}
 
 	@Test
-	public void testStringSetHistory() {
-		final List<Number> revisions = getAuditReader().getRevisions( StringSetEntity.class, setId );
-		assertEquals( Arrays.asList( 5, 6 ), revisions );
+	public void testStringSetHistory(EntityManagerFactoryScope scope) {
+		scope.inEntityManager( entityManager -> {
+			final var auditReader = AuditReaderFactory.get( entityManager );
+			final List<Number> revisions = auditReader.getRevisions( StringSetEntity.class, setId );
+			assertEquals( Arrays.asList( 5, 6 ), revisions );
 
-		final StringSetEntity rev5 = getAuditReader().find( StringSetEntity.class, setId, 5 );
-		assertEquals( TestTools.makeSet( "A" ), rev5.getStrings() );
+			final StringSetEntity rev5 = auditReader.find( StringSetEntity.class, setId, 5 );
+			assertEquals( TestTools.makeSet( "A" ), rev5.getStrings() );
 
-		final StringSetEntity rev6 = getAuditReader().find( StringSetEntity.class, setId, 6 );
-		assertEquals( TestTools.makeSet( "D" ), rev6.getStrings() );
+			final StringSetEntity rev6 = auditReader.find( StringSetEntity.class, setId, 6 );
+			assertEquals( TestTools.makeSet( "D" ), rev6.getStrings() );
+		} );
 	}
-
 }