[#1582] upgrade integration-tests to JUnit5

Author: blafond

integration-tests/bytecode-enhancements-it/build.gradle

@@ -19,12 +19,16 @@ dependencies {
     // logging
     runtimeOnly "org.apache.logging.log4j:log4j-core:${log4jVersion}"
 
+    // JUnit5
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
+
     // Testcontainers
     testImplementation "org.testcontainers:postgresql:${testcontainersVersion}"
 
     // Testing
     testImplementation "org.assertj:assertj-core:${assertjVersion}"
-    testImplementation "io.vertx:vertx-unit:${vertxVersion}"
+    testImplementation "io.vertx:vertx-junit5:${vertxVersion}"
 }
 
 buildscript {
@@ -89,6 +93,7 @@ tasks.withType(Test) {
 }
 
 test {
+    useJUnitPlatform()
     def selectedDb = project.hasProperty( 'db' )
             ? project.getProperty( 'db' )
             : 'PostgreSQL'

integration-tests/bytecode-enhancements-it/src/test/java/org/hibernate/reactive/it/BaseReactiveIT.java

@@ -11,6 +11,8 @@
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
+
+import io.vertx.junit5.VertxTestContext;
 import jakarta.persistence.criteria.CriteriaQuery;
 
 import org.hibernate.SessionFactory;
@@ -22,21 +24,19 @@
 import org.hibernate.reactive.provider.Settings;
 import org.hibernate.reactive.stage.Stage;
 
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.smallrye.mutiny.Uni;
 import io.vertx.core.Promise;
-import io.vertx.core.Vertx;
 import io.vertx.core.VertxOptions;
-import io.vertx.ext.unit.Async;
-import io.vertx.ext.unit.TestContext;
-import io.vertx.ext.unit.junit.RunTestOnContext;
-import io.vertx.ext.unit.junit.Timeout;
-import io.vertx.ext.unit.junit.VertxUnitRunner;
+import io.vertx.junit5.RunTestOnContext;
+import io.vertx.junit5.Timeout;
+import io.vertx.junit5.VertxExtension;
 import org.testcontainers.containers.PostgreSQLContainer;
 import org.testcontainers.utility.DockerImageName;
 
@@ -47,7 +47,9 @@
  * Similar to BaseReactiveTest in the hibernate-reactive-core.
  * Hopefully, one day we will reorganize the code better.
  */
-@RunWith(VertxUnitRunner.class)
+@ExtendWith(VertxExtension.class)
+@TestInstance(TestInstance.Lifecycle.PER_METHOD)
+@Timeout(value = 600, timeUnit = TimeUnit.SECONDS)
 public abstract class BaseReactiveIT {
 
 	// These properties are in DatabaseConfiguration in core
@@ -67,17 +69,20 @@ public abstract class BaseReactiveIT {
 			.withDatabaseName( DB_NAME )
 			.withReuse( true );
 
-	@ClassRule
-	public static final Timeout rule = Timeout.seconds( 10 * 60 );
 
 	private static SessionFactory ormSessionFactory;
-	@ClassRule
-	public static final RunTestOnContext vertxContextRule = new RunTestOnContext( () -> {
-		VertxOptions options = new VertxOptions();
-		options.setBlockedThreadCheckInterval( 5 );
-		options.setBlockedThreadCheckIntervalUnit( TimeUnit.MINUTES );
-		return Vertx.vertx( options );
-	} );
+
+	/**
+	 * Configure Vertx JUnit5 test context
+	 */
+	@RegisterExtension
+	static RunTestOnContext testOnContext = new RunTestOnContext( vertxOptions() );
+
+	private static VertxOptions vertxOptions() {
+		return new VertxOptions()
+				.setBlockedThreadCheckInterval( 5 )
+				.setBlockedThreadCheckIntervalUnit( TimeUnit.MINUTES );
+	}
 
 	/**
 	 * Configure properties defined in {@link Settings}.
@@ -113,10 +118,6 @@ private static String dbConnectionUrl(boolean enableDocker) {
 		return "postgres://localhost:5432/" + DB_NAME;
 	}
 
-	protected static void test(TestContext context, CompletionStage<?> work) {
-		test( context.async(), context, work );
-	}
-
 	/**
 	 * These entities will be added to the configuration of the factory and
 	 * the rows in the mapping tables deleted after each test.
@@ -135,29 +136,19 @@ protected Collection<String> mappings() {
 		return List.of();
 	}
 
-	/**
-	 * For when we need to create the {@link Async} in advance
-	 */
-	protected static void test(Async async, TestContext context, CompletionStage<?> work) {
+	public static void test(VertxTestContext context, CompletionStage<?> work) {
 		work.whenComplete( (res, err) -> {
 			if ( err != null ) {
-				context.fail( err );
+				context.failNow( err );
 			}
 			else {
-				async.complete();
+				context.completeNow();
 			}
 		} );
 	}
 
-	protected static void test(TestContext context, Uni<?> uni) {
-		test( context.async(), context, uni );
-	}
-
-	/**
-	 * For when we need to create the {@link Async} in advance
-	 */
-	public static void test(Async async, TestContext context, Uni<?> uni) {
-		uni.subscribe().with( res -> async.complete(), context::fail );
+	public static void test(VertxTestContext context, Uni<?> uni) {
+		uni.subscribe().with( res -> context.completeNow(), context::failNow );
 	}
 
 	protected Configuration constructConfiguration() {
@@ -193,8 +184,8 @@ private <T> CriteriaQuery<T> queryForDelete(Class<T> entityClass) {
 		return query;
 	}
 
-	@Before
-	public void before(TestContext context) {
+	@BeforeEach
+	public void before(VertxTestContext context) {
 		test( context, setupSessionFactory( this::constructConfiguration ) );
 	}
 
@@ -212,9 +203,9 @@ protected CompletionStage<Void> setupSessionFactory(Configuration configuration)
 	 * @param confSupplier supplies the configuration for the factory
 	 * @return a {@link CompletionStage} void that succeeds when the factory is ready.
 	 */
-	protected CompletionStage<Void> setupSessionFactory(Supplier<Configuration> confSupplier) {
+	protected static CompletionStage<Void> setupSessionFactory(Supplier<Configuration> confSupplier) {
 		CompletableFuture<Void> future = new CompletableFuture<>();
-		vertxContextRule.vertx()
+		testOnContext.vertx()
 				.executeBlocking(
 						// schema generation is a blocking operation and so it causes an
 						// exception when run on the Vert.x event loop. So call it using
@@ -232,7 +223,7 @@ protected CompletionStage<Void> setupSessionFactory(Supplier<Configuration> conf
 		return future;
 	}
 
-	private void startFactoryManager(Promise<Object> p, Supplier<Configuration> confSupplier ) {
+	private static void startFactoryManager(Promise<Object> p, Supplier<Configuration> confSupplier ) {
 		try {
 			ormSessionFactory = createHibernateSessionFactory( confSupplier.get() );
 			p.complete();
@@ -242,7 +233,7 @@ private void startFactoryManager(Promise<Object> p, Supplier<Configuration> conf
 		}
 	}
 
-	private SessionFactory createHibernateSessionFactory(Configuration configuration) {
+	private static SessionFactory createHibernateSessionFactory(Configuration configuration) {
 		StandardServiceRegistryBuilder builder = new ReactiveServiceRegistryBuilder()
 				.applySettings( configuration.getProperties() );
 		addServices( builder );
@@ -251,13 +242,13 @@ private SessionFactory createHibernateSessionFactory(Configuration configuration
 		return configuration.buildSessionFactory( registry );
 	}
 
-	protected void addServices(StandardServiceRegistryBuilder builder) {}
+	protected static void addServices(StandardServiceRegistryBuilder builder) {}
 
-	protected void configureServices(StandardServiceRegistry registry) {
+	protected static void configureServices(StandardServiceRegistry registry) {
 	}
 
-	@After
-	public void after(TestContext context) {
+	@AfterEach
+	public void after(VertxTestContext context) {
 		test( context, cleanDb() );
 	}
 
@@ -271,8 +262,8 @@ protected CompletionStage<Void> cleanDb() {
 				: deleteEntities( classes.toArray( new Class<?>[0] ) );
 	}
 
-	@AfterClass
-	public static void closeFactory(TestContext context) {
+	@AfterAll
+	public static void closeFactory() {
 		if ( ormSessionFactory != null && ormSessionFactory.isOpen() ) {
 			ormSessionFactory.close();
 		}

integration-tests/bytecode-enhancements-it/src/test/java/org/hibernate/reactive/it/LazyBasicFieldTest.java

@@ -8,9 +8,9 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import io.vertx.ext.unit.TestContext;
+import io.vertx.junit5.VertxTestContext;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -25,7 +25,7 @@ protected Collection<Class<?>> annotatedEntities() {
 	}
 
 	@Test
-	public void testFetchBasicField(TestContext context) {
+	public void testFetchBasicField(VertxTestContext context) {
 		final Crew emily = new Crew();
 		emily.setId( 21L );
 		emily.setName( "Emily Jackson" );

integration-tests/bytecode-enhancements-it/src/test/java/org/hibernate/reactive/it/LazyOneToOneBETest.java

@@ -12,9 +12,9 @@
 import org.hibernate.reactive.it.lazytoone.Ship;
 import org.hibernate.reactive.mutiny.Mutiny;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import io.vertx.ext.unit.TestContext;
+import io.vertx.junit5.VertxTestContext;
 import jakarta.persistence.metamodel.Attribute;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -30,7 +30,7 @@ protected Collection<Class<?>> annotatedEntities() {
 	}
 
 	@Test
-	public void testCascadeDelete(TestContext context) {
+	public void testCascadeDelete(VertxTestContext context) {
 		Captain robert = new Captain( "Robert Witterel" );
 		Ship obraDinn = new Ship( "Obra Dinn" );
 		obraDinn.setCaptain( robert );
@@ -46,16 +46,16 @@ public void testCascadeDelete(TestContext context) {
 				.chain( () -> getMutinySessionFactory()
 						.withSession( session -> session
 								.find( Ship.class, obraDinn.getId() )
-								.invoke( context::assertNull )
+								.invoke( ship -> assertThat( ship ).isNull())
 								.chain( () -> session.find( Captain.class, robert.getId() ) )
-								.invoke( context::assertNull )
+								.invoke( captain -> assertThat( captain ).isNull())
 						)
 				)
 		);
 	}
 
 	@Test
-	public void testFetchOnChildSide(TestContext context) {
+	public void testFetchOnChildSide(VertxTestContext context) {
 		Captain robert = new Captain( "Robert Witterel" );
 		Ship obraDinn = new Ship( "Obra Dinn" );
 		obraDinn.setCaptain( robert );
@@ -80,7 +80,7 @@ public void testFetchOnChildSide(TestContext context) {
 	}
 
 	@Test
-	public void testFetchOnParentSide(TestContext context) {
+	public void testFetchOnParentSide(VertxTestContext context) {
 		Captain robert = new Captain( "Robert Witterel" );
 		Ship obraDinn = new Ship( "Obra Dinn" );
 		obraDinn.setCaptain( robert );