Update processor tests to use JUnit 5

tooling/metamodel-generator/hibernate-processor.gradle

@@ -80,6 +80,7 @@ configurations {
 def quarkusOrmPanacheTestTask = tasks.register( 'quarkusOrmPanacheTest', Test ) {
 	description = 'Runs the Quarkus ORM Panache tests.'
 	group = 'verification'
+	useJUnitPlatform()
 
 	testClassesDirs = sourceSets.quarkusOrmPanache.output.classesDirs
 	classpath = sourceSets.quarkusOrmPanache.runtimeClasspath
@@ -89,6 +90,7 @@ def quarkusOrmPanacheTestTask = tasks.register( 'quarkusOrmPanacheTest', Test )
 def quarkusHrPanacheTestTask = tasks.register( 'quarkusHrPanacheTest', Test ) {
 	description = 'Runs the Quarkus HR Panache tests.'
 	group = 'verification'
+	useJUnitPlatform()
 
 	testClassesDirs = sourceSets.quarkusHrPanache.output.classesDirs
 	classpath = sourceSets.quarkusHrPanache.runtimeClasspath
@@ -98,6 +100,7 @@ def quarkusHrPanacheTestTask = tasks.register( 'quarkusHrPanacheTest', Test ) {
 def jakartaDataTestTask = tasks.register( 'jakartaDataTest', Test ) {
     description = 'Runs the Jakarta Data tests.'
     group = 'verification'
+	useJUnitPlatform()
 
     testClassesDirs = sourceSets.jakartaData.output.classesDirs
     classpath = sourceSets.jakartaData.runtimeClasspath
@@ -160,4 +163,4 @@ tasks.forbiddenApisQuarkusOrmPanache {
 
 tasks.forbiddenApisQuarkusHrPanache {
 	enabled = false
-}
+}

tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/DataTest.java

@@ -6,7 +6,7 @@
 
 import org.hibernate.processor.test.util.CompilationTest;
 import org.hibernate.processor.test.util.WithClasses;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor;
 import static org.hibernate.processor.test.util.TestUtil.assertNoMetamodelClassGeneratedFor;
@@ -15,10 +15,11 @@
 /**
  * @author Gavin King
  */
-public class DataTest extends CompilationTest {
+@CompilationTest
+class DataTest {
 	@Test
 	@WithClasses({ Author.class, Book.class, BookAuthorRepository.class, IdOperations.class, Concrete.class, Thing.class })
-	public void test() {
+	void test() {
 		System.out.println( getMetaModelSourceAsString( Author.class ) );
 		System.out.println( getMetaModelSourceAsString( Book.class ) );
 		System.out.println( getMetaModelSourceAsString( Author.class, true ) );

tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/EgTest.java

@@ -6,18 +6,19 @@
 
 import org.hibernate.processor.test.util.CompilationTest;
 import org.hibernate.processor.test.util.WithClasses;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor;
 import static org.hibernate.processor.test.util.TestUtil.getMetaModelSourceAsString;
 
 /**
  * @author Gavin King
  */
-public class EgTest extends CompilationTest {
+@CompilationTest
+class EgTest {
 	@Test
 	@WithClasses({ Publisher.class, Author.class, Address.class, Book.class, Library.class, Bookshop.class, Publishers.class })
-	public void test() {
+	void test() {
 		System.out.println( getMetaModelSourceAsString( Author.class ) );
 		System.out.println( getMetaModelSourceAsString( Book.class ) );
 		System.out.println( getMetaModelSourceAsString( Author.class, true ) );

tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/embeddedid/EmbeddedIdTest.java

@@ -6,18 +6,19 @@
 
 import org.hibernate.processor.test.util.CompilationTest;
 import org.hibernate.processor.test.util.WithClasses;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor;
 import static org.hibernate.processor.test.util.TestUtil.getMetaModelSourceAsString;
 
 /**
  * @author Gavin King
  */
-public class EmbeddedIdTest extends CompilationTest {
+@CompilationTest
+class EmbeddedIdTest {
 	@Test
 	@WithClasses({ Thing.class, ThingRepo.class })
-	public void test() {
+	void test() {
 		System.out.println( getMetaModelSourceAsString( ThingRepo.class ) );
 		assertMetamodelClassGeneratedFor( Thing.class, true );
 		assertMetamodelClassGeneratedFor( Thing.class );

tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/fqcninquery/FqcnInQueryTest.java

@@ -7,16 +7,17 @@
 import jakarta.persistence.EntityManager;
 import org.hibernate.processor.test.util.CompilationTest;
 import org.hibernate.processor.test.util.WithClasses;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor;
 import static org.hibernate.processor.test.util.TestUtil.assertPresenceOfMethodInMetamodelFor;
 import static org.hibernate.processor.test.util.TestUtil.getMetaModelSourceAsString;
 
-public class FqcnInQueryTest extends CompilationTest {
+@CompilationTest
+class FqcnInQueryTest {
 	@Test
 	@WithClasses({MyEntity.class, MyRepository.class})
-	public void test() {
+	void test() {
 		System.out.println( getMetaModelSourceAsString( MyRepository.class ) );
 		System.out.println( getMetaModelSourceAsString( MyEntity.class ) );
 

tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/idclass/CompositeIdClassTest.java

@@ -7,20 +7,21 @@
 import org.hibernate.processor.test.data.idclass.MyEntity.MyEntityId;
 import org.hibernate.processor.test.util.CompilationTest;
 import org.hibernate.processor.test.util.WithClasses;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor;
 import static org.hibernate.processor.test.util.TestUtil.assertPresenceOfMethodInMetamodelFor;
 import static org.hibernate.processor.test.util.TestUtil.getMetaModelSourceAsString;
 
-public class CompositeIdClassTest extends CompilationTest {
+@CompilationTest
+class CompositeIdClassTest {
 	@Test
 	@WithClasses({
 			MyRepository.class,
 			YourRepository.class,
 			MyEntity.class,
 	})
-	public void test() {
+	void test() {
 		System.out.println( getMetaModelSourceAsString( MyEntity.class ) );
 		System.out.println( getMetaModelSourceAsString( MyEntity.class, true ) );
 		System.out.println( getMetaModelSourceAsString( MyRepository.class ) );

tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/innerclass/InnerClassTest.java

@@ -10,18 +10,19 @@
 import org.hibernate.processor.test.data.innerclass.InnerClassTest.One.Two;
 import org.hibernate.processor.test.util.CompilationTest;
 import org.hibernate.processor.test.util.WithClasses;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor;
 import static org.hibernate.processor.test.util.TestUtil.assertNoMetamodelClassGeneratedFor;
 import static org.hibernate.processor.test.util.TestUtil.getMetaModelSourceAsString;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class InnerClassTest extends CompilationTest {
+@CompilationTest
+class InnerClassTest {
 
 	@WithClasses({Person.class, Dummy.class, Inner.class, Two.class})
 	@Test
-	public void test() {
+	void test() {
 		System.out.println( getMetaModelSourceAsString( InnerClassTest.class ) );
 		System.out.println( getMetaModelSourceAsString( Dummy.class ) );
 		System.out.println( getMetaModelSourceAsString( Person.class ) );

tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/innerclass/InnerRepositoryTest.java

@@ -13,16 +13,17 @@
 import jakarta.persistence.Id;
 import org.hibernate.processor.test.util.CompilationTest;
 import org.hibernate.processor.test.util.WithClasses;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor;
 import static org.hibernate.processor.test.util.TestUtil.getMetaModelSourceAsString;
 
-public class InnerRepositoryTest extends CompilationTest {
+@CompilationTest
+class InnerRepositoryTest {
 
 	@Test
 	@WithClasses({Thing.class, ThingRepo.class})
-	public void test() {
+	void test() {
 		System.out.println( getMetaModelSourceAsString( ThingRepo.class ) );
 		assertMetamodelClassGeneratedFor( ThingRepo.class );
 	}

tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/multivaluebinding/TopicPostTest.java

@@ -7,7 +7,7 @@
 import jakarta.persistence.EntityManager;
 import org.hibernate.processor.test.util.CompilationTest;
 import org.hibernate.processor.test.util.WithClasses;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
@@ -21,10 +21,11 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 
-public class TopicPostTest extends CompilationTest {
+@CompilationTest
+class TopicPostTest {
 	@Test
 	@WithClasses({Post.class, PostRepository.class})
-	public void test() {
+	void test() {
 		assertMetamodelClassGeneratedFor( Post.class, true );
 		assertMetamodelClassGeneratedFor( Post.class );
 		assertMetamodelClassGeneratedFor( PostRepository.class );

tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/namedquery/NamedQueryTest.java

@@ -6,7 +6,7 @@
 
 import org.hibernate.processor.test.util.CompilationTest;
 import org.hibernate.processor.test.util.WithClasses;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor;
 import static org.hibernate.processor.test.util.TestUtil.assertNoMetamodelClassGeneratedFor;
@@ -15,10 +15,11 @@
 /**
  * @author Gavin King
  */
-public class NamedQueryTest extends CompilationTest {
+@CompilationTest
+class NamedQueryTest {
 	@Test
 	@WithClasses({ Author.class, Book.class, BookAuthorRepository.class, BookAuthorRepository$.class })
-	public void test() {
+	void test() {
 		System.out.println( getMetaModelSourceAsString( Author.class ) );
 		System.out.println( getMetaModelSourceAsString( Book.class ) );
 		System.out.println( getMetaModelSourceAsString( Author.class, true ) );

tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/processingorder/ProcessingOrderTest.java

@@ -6,7 +6,7 @@
 
 import org.hibernate.processor.test.util.CompilationTest;
 import org.hibernate.processor.test.util.WithClasses;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
@@ -18,10 +18,11 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 
-public class ProcessingOrderTest extends CompilationTest {
+@CompilationTest
+class ProcessingOrderTest {
 	@Test
 	@WithClasses({Post.class, PostRepository.class, Topic.class})
-	public void test() {
+	void test() {
 		assertMetamodelClassGeneratedFor( PostRepository.class );
 
 		assertPresenceOfMethodInMetamodelFor( PostRepository.class, "getPostsByTopic", Topic.class );

tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/quarkus/QuarkusOrmPanacheTest.java

@@ -8,7 +8,7 @@
 import org.hibernate.processor.test.util.CompilationTest;
 import org.hibernate.processor.test.util.TestUtil;
 import org.hibernate.processor.test.util.WithClasses;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Assertions;
 
 import jakarta.inject.Inject;
@@ -22,11 +22,12 @@
 /**
  * @author Gavin King
  */
-public class QuarkusOrmPanacheTest extends CompilationTest {
+@CompilationTest
+class QuarkusOrmPanacheTest {
 
 	@Test
 	@WithClasses({ PanacheBook.class, JakartaDataBookRepository.class })
-	public void testJakartaDataRepositoryMetamodel() throws Exception {
+	void testJakartaDataRepositoryMetamodel() throws Exception {
 		// JD repository
 		System.out.println( TestUtil.getMetaModelSourceAsString( JakartaDataBookRepository.class ) );
 		Class<?> repositoryClass = getMetamodelClassFor( JakartaDataBookRepository.class );

tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/ReactiveTest.java

@@ -6,18 +6,19 @@
 
 import org.hibernate.processor.test.util.CompilationTest;
 import org.hibernate.processor.test.util.WithClasses;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor;
 import static org.hibernate.processor.test.util.TestUtil.getMetaModelSourceAsString;
 
 /**
  * @author Gavin King
  */
-public class ReactiveTest extends CompilationTest {
+@CompilationTest
+class ReactiveTest {
 	@Test
 	@WithClasses({ Publisher.class, Author.class, Address.class, Book.class, Library.class, Library2.class, RepoWithPrimary.class })
-	public void test() {
+	void test() {
 		System.out.println( getMetaModelSourceAsString( Author.class ) );
 		System.out.println( getMetaModelSourceAsString( Book.class ) );
 		System.out.println( getMetaModelSourceAsString( Author.class, true ) );

tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/selectenumproperty/TopicTypeEnumTest.java

@@ -6,15 +6,16 @@
 
 import org.hibernate.processor.test.util.CompilationTest;
 import org.hibernate.processor.test.util.WithClasses;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor;
 import static org.hibernate.processor.test.util.TestUtil.getMetaModelSourceAsString;
 
-public class TopicTypeEnumTest extends CompilationTest {
+@CompilationTest
+class TopicTypeEnumTest {
 	@Test
 	@WithClasses({Topic.class, TopicRepository.class})
-	public void test() {
+	void test() {
 		System.out.println( getMetaModelSourceAsString( Topic.class ) );
 		System.out.println( getMetaModelSourceAsString( Topic.class, true ) );
 		System.out.println( getMetaModelSourceAsString( TopicRepository.class ) );

tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/SuperRepoTest.java

@@ -7,17 +7,18 @@
 import org.hibernate.processor.test.util.CompilationTest;
 import org.hibernate.processor.test.util.TestUtil;
 import org.hibernate.processor.test.util.WithClasses;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor;
 
 /**
  * @author Gavin King
  */
-public class SuperRepoTest extends CompilationTest {
+@CompilationTest
+class SuperRepoTest {
 	@Test
 	@WithClasses({ Book.class, SuperRepo.class, Repo.class })
-	public void testQueryMethod() {
+	void testQueryMethod() {
 		System.out.println( TestUtil.getMetaModelSourceAsString( SuperRepo.class ) );
 		System.out.println( TestUtil.getMetaModelSourceAsString( Repo.class ) );
 		assertMetamodelClassGeneratedFor( Book.class );

tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/generic/SuperRepoTest.java

@@ -7,17 +7,18 @@
 import org.hibernate.processor.test.util.CompilationTest;
 import org.hibernate.processor.test.util.TestUtil;
 import org.hibernate.processor.test.util.WithClasses;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor;
 
 /**
  * @author Gavin King
  */
-public class SuperRepoTest extends CompilationTest {
+@CompilationTest
+class SuperRepoTest {
 	@Test
 	@WithClasses({ Book.class, SuperRepo.class, Repo.class })
-	public void testQueryMethod() {
+	void testQueryMethod() {
 //		System.out.println( TestUtil.getMetaModelSourceAsString( SuperRepo.class ) );
 		System.out.println( TestUtil.getMetaModelSourceAsString( Repo.class ) );
 		assertMetamodelClassGeneratedFor( Book.class );

tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/versioned/VersionedTest.java

@@ -6,18 +6,19 @@
 
 import org.hibernate.processor.test.util.CompilationTest;
 import org.hibernate.processor.test.util.WithClasses;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor;
 import static org.hibernate.processor.test.util.TestUtil.getMetaModelSourceAsString;
 
 /**
  * @author Gavin King
  */
-public class VersionedTest extends CompilationTest {
+@CompilationTest
+class VersionedTest {
 	@Test
 	@WithClasses({ Versioned.class, VersionedRepo.class, SpecialVersioned.class, SpecialVersionedRepo.class })
-	public void test() {
+	void test() {
 		System.out.println( getMetaModelSourceAsString( VersionedRepo.class ) );
 		assertMetamodelClassGeneratedFor( Versioned.class, true );
 		assertMetamodelClassGeneratedFor( Versioned.class );