[#1686] Clean up bytecode-enhancements-it

Author: DavideD

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

@@ -1,3 +1,18 @@
+buildscript {
+    repositories {
+        // Example: ./gradlew build -PenableMavenLocalRepo
+        if ( project.hasProperty( 'enableMavenLocalRepo' ) ) {
+            // Useful for local development, it should be disabled otherwise
+            mavenLocal()
+        }
+        mavenCentral()
+    }
+}
+
+plugins {
+    id "org.hibernate.orm" version "${hibernateOrmGradlePluginVersion}"
+}
+
 description = 'Bytecode enhancements integration tests'
 
 ext {
@@ -13,16 +28,13 @@ dependencies {
 
     // Testing on one database should be enough
     runtimeOnly "io.vertx:vertx-pg-client:${vertxVersion}"
+
     // Allow authentication to PostgreSQL using SCRAM:
     runtimeOnly 'com.ongres.scram:client:2.1'
 
     // 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}"
 
@@ -31,34 +43,8 @@ dependencies {
     testImplementation "io.vertx:vertx-junit5:${vertxVersion}"
 }
 
-buildscript {
-    repositories {
-        // Example: ./gradlew build -PenableMavenLocalRepo
-        if ( project.hasProperty( 'enableMavenLocalRepo' ) ) {
-            // Useful for local development, it should be disabled otherwise
-            mavenLocal()
-        }
-        maven {
-            url 'https://plugins.gradle.org/m2/'
-        }
-        mavenCentral()
-    }
-    dependencies {
-        classpath "org.hibernate.orm:hibernate-gradle-plugin:${hibernateOrmGradlePluginVersion}"
-    }
-}
-
-
-// Hibernate Gradle plugin to enable bytecode enhancements
-apply plugin: 'org.hibernate.orm'
-
-hibernate {
-    enhancement {
-        lazyInitialization(true)
-        dirtyTracking(true)
-        associationManagement(false)
-    }
-}
+// Optional: enable the bytecode enhancements
+hibernate { enhancement }
 
 // Print a summary of the results of the tests (number of failures, successes and skipped)
 // This is the same as the one in hibernate-reactive-core
@@ -70,10 +56,24 @@ def loggingSummary(db, result, desc) {
     }
 }
 
+// Example:
+// gradle test -Pdb=MySQL
+test {
+    def selectedDb = project.hasProperty( 'db' )
+            ? project.properties['db']
+            : 'PostgreSQL'
+    doFirst {
+        systemProperty 'db', selectedDb
+    }
+    afterSuite { desc, result ->
+        loggingSummary( selectedDb, result, desc )
+    }
+}
+
 // Configuration for the tests
-// This is the same as the one in hibernate-reactive-core
-tasks.withType(Test) {
+tasks.withType( Test ).configureEach {
     defaultCharacterEncoding = "UTF-8"
+    useJUnitPlatform()
     testLogging {
         displayGranularity 1
         showStandardStreams = project.hasProperty('showStandardOutput')
@@ -87,45 +87,30 @@ tasks.withType(Test) {
     if ( project.hasProperty( 'includeTests' ) ) {
         // Example: ./gradlew testAll -PincludeTests=DefaultPortTest
         filter {
-            includeTestsMatching project.getProperty( 'includeTests' ) ?: '*'
+            includeTestsMatching project.properties['includeTests'] ?: '*' as String
         }
     }
 }
 
-test {
-    useJUnitPlatform()
-    def selectedDb = project.hasProperty( 'db' )
-            ? project.getProperty( 'db' )
-            : 'PostgreSQL'
-
-    // We only want to test this on Postgres
-    onlyIf { selectedDb.toLowerCase().startsWith( 'p' ) }
-    afterSuite { desc, result ->
-        loggingSummary( 'PostgreSQL', result, desc )
-    }
-    doFirst {
-        systemProperty 'db', selectedDb
-    }
-}
-
 // Rule to recognize calls to testDb<dbName>
 // and run the tests on the selected db
 // Example:
 // gradle testDbMySQL testDbDB2
 tasks.addRule( "Pattern testDb<id>" ) { String taskName ->
     if ( taskName.startsWith( "testDb" ) ) {
-        task( type: Test, taskName ) {
+        tasks.register( taskName, Test ) {
             def dbName = taskName.substring( "testDb".length() )
             description = "Run tests for ${dbName}"
 
             // We only want to test this on Postgres
             onlyIf { dbName.toLowerCase().startsWith( 'p' ) }
-            afterSuite { desc, result ->
-                loggingSummary( dbName, result, desc )
-            }
             doFirst() {
                 systemProperty 'db', dbName
             }
+            afterSuite { desc, result ->
+                loggingSummary( dbName, result, desc )
+            }
+
         }
     }
-}
+}

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

@@ -32,7 +32,6 @@
 import io.vertx.core.Promise;
 import io.vertx.core.VertxOptions;
 import io.vertx.junit5.RunTestOnContext;
-import io.vertx.junit5.Timeout;
 import io.vertx.junit5.VertxExtension;
 import io.vertx.junit5.VertxTestContext;
 import jakarta.persistence.criteria.CriteriaQuery;
@@ -48,7 +47,6 @@
  */
 @ExtendWith(VertxExtension.class)
 @TestInstance(TestInstance.Lifecycle.PER_METHOD)
-@Timeout(value = 10, timeUnit = TimeUnit.MINUTES)
 public abstract class BaseReactiveIT {
 
 	// These properties are in DatabaseConfiguration in core

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

@@ -7,9 +7,11 @@
 
 import java.util.Collection;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import org.junit.jupiter.api.Test;
 
+import io.vertx.junit5.Timeout;
 import io.vertx.junit5.VertxTestContext;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -18,6 +20,7 @@
  * Test fetching of basic lazy fields when
  * bytecode enhancements is enabled.
  */
+@Timeout(value = 10, timeUnit = TimeUnit.MINUTES)
 public class LazyBasicFieldTest extends BaseReactiveIT {
 	@Override
 	protected Collection<Class<?>> annotatedEntities() {

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

@@ -7,13 +7,15 @@
 
 import java.util.Collection;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import org.hibernate.reactive.it.lazytoone.Captain;
 import org.hibernate.reactive.it.lazytoone.Ship;
 import org.hibernate.reactive.mutiny.Mutiny;
 
 import org.junit.jupiter.api.Test;
 
+import io.vertx.junit5.Timeout;
 import io.vertx.junit5.VertxTestContext;
 import jakarta.persistence.metamodel.Attribute;
 
@@ -22,6 +24,7 @@
 /**
  * Test bytecode enhancements on a lazy one-to-one bidirectional association
  */
+@Timeout(value = 10, timeUnit = TimeUnit.MINUTES)
 public class LazyOneToOneBETest extends BaseReactiveIT {
 
 	@Override