HHH-19871 Drop JUnit 4 usage in Hibernate Envers #11131

mbellade · 2025-10-17T13:36:04Z

https://hibernate.atlassian.net/browse/HHH-19871

Drafting a possible migration path for Envers tests from JUnit 4 -> 6. This approach is the "least invasive", adding on top of the existing hibernate-testing annotations like @Jpa adding only the required Envers machinery, while relying on existing JUnit 6 features like @ClassTemplates to run tests with multiple audit strategies.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license
and can be relicensed under the terms of the LGPL v2.1 license in the future at the maintainers' discretion.
For more information on licensing, please check here.

hibernate-github-bot · 2025-10-17T13:36:11Z

Thanks for your pull request!

This pull request appears to follow the contribution rules.

› This message was automatically generated.

marko-bekhta · 2025-10-17T13:40:36Z

Only downside is, we cannot use @BeforeAll/@afterall methods to set-up / tear-down test data

have you tried this one:
https://docs.junit.org/current/api/org.junit.jupiter.params/org/junit/jupiter/params/BeforeParameterizedClassInvocation.html

(Last time I've played around with this it had some strange behavior, but I don't remember the sepcifics anymore 🙂)

mbellade · 2025-10-17T13:43:03Z

Hey @marko-bekhta, yes I saw that (there's also this) but I'm not sure how that would help - @BeforeAll/@AfterAll annotated methods would still only be executed once for @ClassTemplates, per JUnit's API.

marko-bekhta · 2025-10-17T13:46:54Z

Ah I meant to use the other pair of anotations in the evnerse test classes rather than @BeforeAll/@AfterAll. Or you mean the problem is that the callbacks are implemented in the extensions and that's where the problem comes from ?

...org/hibernate/orm/test/envers/integration/query/AssociationRevisionsOfEntitiesQueryTest.java

mbellade · 2025-10-17T15:19:52Z

As discussed offline, there are a few alternatives to improve on the @Order restriction - I'll update the PR once we've determined which one we'd prefer for envers.

.../src/test/java/org/hibernate/orm/test/envers/integration/auditReader/AuditReaderAPITest.java

...test/java/org/hibernate/orm/test/envers/integration/basic/BasicTypeColumnDefinitionTest.java

.../org/hibernate/orm/test/envers/integration/collection/EntitySameMapKeyMultiMapValueTest.java

...te-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/Components.java

-		em.getTransaction().commit();
+		scope.inTransaction( em -> {
+			ComponentTestEntity cte1 = em.find( ComponentTestEntity.class, id1 );
+			ComponentTestEntity cte2 = em.find( ComponentTestEntity.class, id2 );


...rnate-envers/src/test/java/org/hibernate/testing/envers/EnversEntityManagerFactoryScope.java

@@ -222,4 +226,33 @@
 			entityManager.close();
 		}
 	}
+
+	public static AuditStrategy getAuditStrategy(EntityManager entityManager) {


...src/test/java/org/hibernate/orm/test/envers/integration/customtype/ExtendedEnumTypeTest.java


-	private void assertEnumProperty(Class<?> entityClass, Class<?> typeClass, String propertyName, EnumType expectedType) {
-		doInJPA( this::entityManagerFactory, entityManager -> {
+	private void assertEnumProperty(EntityManagerFactoryScope scope, Class<?> entityClass, Class<?> typeClass, String propertyName, EnumType expectedType) {


...s/integration/entityNames/singleAssociatedNotAudited/ReadEntityAssociatedNotAuditedTest.java

mbellade · 2025-11-04T13:09:02Z

Marking as ready for review, there are more tests to work on but we can start merging the JUnit extension work and what has already been migrated so far.

.../src/test/java/org/hibernate/orm/test/envers/integration/hashcode/SetHashcodeChangeTest.java

...t/java/org/hibernate/orm/test/envers/integration/manytoone/lazy/ManyToOneLazyDeleteTest.java

.../org/hibernate/orm/test/envers/integration/manytoone/foreignkey/ForeignKeyExclusionTest.java

...test/java/org/hibernate/orm/test/envers/integration/manytomany/sametable/BasicSametable.java

.../src/test/java/org/hibernate/orm/test/envers/integration/manytomany/OrderColumnListTest.java

.../src/test/java/org/hibernate/orm/test/envers/integration/manytomany/IndexColumnListTest.java

- Created new envers-junit hooks and hibernate-testing changes - Migrated the `org.hibernate.orm.test.envers.integration` package

...orm/test/envers/integration/strategy/ValidityAuditStrategyComponentCollectionRevEndTest.java

 				return true;
 			}
-			if ( object == null | getClass() != object.getClass() ) {
+			if (object == null | getClass() != object.getClass()) {


...orm/test/envers/integration/strategy/ValidityAuditStrategyComponentCollectionRevEndTest.java

 				return true;
 			}
-			if ( object == null | getClass() != object.getClass() ) {
+			if (object == null | getClass() != object.getClass()) {


...est/java/org/hibernate/orm/test/envers/integration/tm/SessionInterceptorTransactionTest.java

+	}
+
+	@Test
+	public void testInterceptorInvocations(EntityManagerFactoryScope scope) {


...a/org/hibernate/orm/test/envers/integration/tm/SessionFactoryInterceptorTransactionTest.java

+	}
+
+	@AfterClassTemplate
+	public void cleanupData(EntityManagerFactoryScope scope) throws Exception {


.../test/envers/integration/onetomany/inverseToSuperclass/OneToManyInverseToSuperclassTest.java

+			// Revision 1
+			Root m1 = new Root();
+			DetailSubclass det1 = new DetailSubclass2();
+			DetailSubclass det2 = new DetailSubclass2();


mbellade added the Envers label Oct 17, 2025

github-advanced-security bot found potential problems Oct 17, 2025

View reviewed changes

...org/hibernate/orm/test/envers/integration/query/AssociationRevisionsOfEntitiesQueryTest.java Dismissed Show dismissed Hide dismissed

mbellade force-pushed the envers-junit branch 2 times, most recently from dfd4d86 to 798f410 Compare October 22, 2025 14:29

github-advanced-security bot found potential problems Oct 22, 2025

View reviewed changes

mbellade force-pushed the envers-junit branch 3 times, most recently from ab22c63 to fd09d92 Compare October 22, 2025 16:19

github-advanced-security bot found potential problems Oct 23, 2025

View reviewed changes

github-advanced-security bot found potential problems Oct 24, 2025

View reviewed changes

mbellade force-pushed the envers-junit branch 2 times, most recently from 9d5369c to 72e1f20 Compare October 24, 2025 14:49

mbellade force-pushed the envers-junit branch from 3315ec0 to 1abb681 Compare November 4, 2025 13:07

mbellade marked this pull request as ready for review November 4, 2025 13:08

github-advanced-security bot found potential problems Nov 4, 2025

View reviewed changes

beikov approved these changes Nov 4, 2025

View reviewed changes

beikov reviewed Nov 4, 2025

View reviewed changes

.../src/test/java/org/hibernate/orm/test/envers/integration/manytomany/OrderColumnListTest.java Show resolved Hide resolved

beikov reviewed Nov 4, 2025

View reviewed changes

.../src/test/java/org/hibernate/orm/test/envers/integration/manytomany/IndexColumnListTest.java Show resolved Hide resolved

HHH-19871 Envers migration to JUnit 6

7350ee5

- Created new envers-junit hooks and hibernate-testing changes - Migrated the `org.hibernate.orm.test.envers.integration` package

mbellade force-pushed the envers-junit branch from 1abb681 to 7350ee5 Compare November 4, 2025 14:09

github-advanced-security bot found potential problems Nov 4, 2025

View reviewed changes

Uh oh!

HHH-19871 Drop JUnit 4 usage in Hibernate Envers #11131

Are you sure you want to change the base?

HHH-19871 Drop JUnit 4 usage in Hibernate Envers #11131

Conversation

mbellade commented Oct 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hibernate-github-bot bot commented Oct 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

marko-bekhta commented Oct 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mbellade commented Oct 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

marko-bekhta commented Oct 17, 2025

Uh oh!

Uh oh!

mbellade commented Oct 17, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Check notice

Check notice

Uh oh!

Check notice

Uh oh!

Uh oh!

mbellade commented Nov 4, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Check warning

Uh oh!

Uh oh!

Check warning

Check notice

Check notice

Check notice

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

mbellade commented Oct 17, 2025 •

edited

Loading

hibernate-github-bot bot commented Oct 17, 2025 •

edited

Loading

marko-bekhta commented Oct 17, 2025 •

edited

Loading

mbellade commented Oct 17, 2025 •

edited

Loading