HHH-19916 - More drop JUnit 4 usage work

Author: sebersole

hibernate-integrationtest-java-modules/hibernate-integrationtest-java-modules.gradle

@@ -24,9 +24,7 @@ dependencies {
 	api project( ':hibernate-envers' )
 	implementation project( ':hibernate-scan-jandex' )
 
-    // todo : to get rid of these
-    testImplementation testLibs.junit4
-    testImplementation testLibs.junit4Engine
+    testImplementation testLibs.junitJupiterApi
 
 	//Provide the jakarta.cdi module, as it's required by module jakarta.transaction
 	//but not provided as transitive dependency of Narayana.

hibernate-integrationtest-java-modules/src/test/java/module-info.java

@@ -22,6 +22,6 @@
 	 * Test-only configuration.
 	 */
 
-	opens org.hibernate.orm.integrationtest.java.module.test to junit;
-	requires junit;
+	opens org.hibernate.orm.integrationtest.java.module.test to org.junit.platform.commons;
+	requires org.junit.jupiter.api;
 }

hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/JavaModulePathIT.java

@@ -4,18 +4,15 @@
  */
 package org.hibernate.orm.integrationtest.java.module.test;
 
-
-
 import org.hibernate.Session;
 import org.hibernate.envers.boot.internal.EnversIntegrator;
 import org.hibernate.orm.integrationtest.java.module.test.service.AuthorService;
-
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class JavaModulePathIT {
 
@@ -67,9 +64,8 @@ public void integrator() {
 	}
 
 	private void checkIsInModulePath(Class<?> clazz) {
-		Assert.assertTrue(
-				clazz + " should be part of a named module - there is a problem in test setup",
-				clazz.getModule().isNamed()
+		assertTrue( clazz.getModule().isNamed(),
+				clazz + " should be part of a named module - there is a problem in test setup"
 		);
 	}
 }

hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/ScannerTest.java

@@ -14,9 +14,10 @@
 import org.hibernate.boot.archive.scan.spi.ClassDescriptor;
 import org.hibernate.boot.archive.scan.spi.ScanResult;
 import org.hibernate.orm.integrationtest.java.module.test.entity.Author;
+import org.junit.jupiter.api.Test;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  * We need to test that the scanner works, including when there is a module-info.class
@@ -34,11 +35,11 @@ public void verifyModuleInfoScanner() {
 				StandardScanParameters.INSTANCE
 		);
 		Set<ClassDescriptor> locatedClasses = scan.getLocatedClasses();
-		Assert.assertEquals( 1, locatedClasses.size() );
+		assertEquals( 1, locatedClasses.size() );
 		ClassDescriptor classDescriptor = locatedClasses.iterator().next();
-		Assert.assertNotNull( classDescriptor );
-		Assert.assertEquals( Author.class.getName(), classDescriptor.getName() );
-		Assert.assertEquals( ClassDescriptor.Categorization.MODEL, classDescriptor.getCategorization() );
+		assertNotNull( classDescriptor );
+		assertEquals( Author.class.getName(), classDescriptor.getName() );
+		assertEquals( ClassDescriptor.Categorization.MODEL, classDescriptor.getCategorization() );
 	}
 
 }