diff --git a/tooling/metamodel-generator/hibernate-processor.gradle b/tooling/metamodel-generator/hibernate-processor.gradle index 51ba5d86fd50..ff49cbb4dcbb 100644 --- a/tooling/metamodel-generator/hibernate-processor.gradle +++ b/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 -} \ No newline at end of file +} diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/DataTest.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/DataTest.java index e6066e725dd0..0fcf64f0db27 100644 --- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/DataTest.java +++ b/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 ) ); diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/EgTest.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/EgTest.java index c42514256245..a19d596a5959 100644 --- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/EgTest.java +++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/EgTest.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.getMetaModelSourceAsString; @@ -14,10 +14,11 @@ /** * @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 ) ); diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/embeddedid/EmbeddedIdTest.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/embeddedid/EmbeddedIdTest.java index 5f5e8c86227b..87eb45e555ba 100644 --- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/embeddedid/EmbeddedIdTest.java +++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/embeddedid/EmbeddedIdTest.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.getMetaModelSourceAsString; @@ -14,10 +14,11 @@ /** * @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 ); diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/fqcninquery/FqcnInQueryTest.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/fqcninquery/FqcnInQueryTest.java index 1c6d47a82a64..ed61033a7cb4 100644 --- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/fqcninquery/FqcnInQueryTest.java +++ b/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 ) ); diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/idclass/CompositeIdClassTest.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/idclass/CompositeIdClassTest.java index 9d1d7f42a355..2ced4e2ee42a 100644 --- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/idclass/CompositeIdClassTest.java +++ b/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 ) ); diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/innerclass/InnerClassTest.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/innerclass/InnerClassTest.java index 1b98eb1e3d62..a507bb0ba941 100644 --- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/innerclass/InnerClassTest.java +++ b/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 ) ); diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/innerclass/InnerRepositoryTest.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/innerclass/InnerRepositoryTest.java index d1885c20d6a8..83a534949dd4 100644 --- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/innerclass/InnerRepositoryTest.java +++ b/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 ); } diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/multivaluebinding/TopicPostTest.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/multivaluebinding/TopicPostTest.java index 730e6cdacf89..26fa5bd08472 100644 --- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/multivaluebinding/TopicPostTest.java +++ b/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 ); diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/namedquery/NamedQueryTest.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/namedquery/NamedQueryTest.java index 2b67839568ac..5e1e2350bcdd 100644 --- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/namedquery/NamedQueryTest.java +++ b/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 ) ); diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/processingorder/ProcessingOrderTest.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/processingorder/ProcessingOrderTest.java index 9a0e63e9bde9..d0fb9662d3a0 100644 --- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/processingorder/ProcessingOrderTest.java +++ b/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 ); diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/quarkus/QuarkusOrmPanacheTest.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/quarkus/QuarkusOrmPanacheTest.java index 9412c9055034..7a36c5edbcf5 100644 --- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/quarkus/QuarkusOrmPanacheTest.java +++ b/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 ); diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/ReactiveTest.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/ReactiveTest.java index 094ea9207bb7..2643aae49317 100644 --- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/ReactiveTest.java +++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/ReactiveTest.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.getMetaModelSourceAsString; @@ -14,10 +14,11 @@ /** * @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 ) ); diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/selectenumproperty/TopicTypeEnumTest.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/selectenumproperty/TopicTypeEnumTest.java index e0365574afb6..f8a9916fe663 100644 --- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/selectenumproperty/TopicTypeEnumTest.java +++ b/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 ) ); diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/SuperRepoTest.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/SuperRepoTest.java index 59b1dbdff76c..51f29b6457a3 100644 --- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/SuperRepoTest.java +++ b/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 ); diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/generic/SuperRepoTest.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/generic/SuperRepoTest.java index 7e760e7a612b..128e74fd3921 100644 --- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/generic/SuperRepoTest.java +++ b/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 ); diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/versioned/VersionedTest.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/versioned/VersionedTest.java index 3597f573db99..89bbedaf52c6 100644 --- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/versioned/VersionedTest.java +++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/versioned/VersionedTest.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.getMetaModelSourceAsString; @@ -14,10 +14,11 @@ /** * @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 ); diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/namedquery/ThingTest.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/namedquery/ThingTest.java index ce59c5519376..c4d7aacd9023 100644 --- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/namedquery/ThingTest.java +++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/namedquery/ThingTest.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.assertPresenceOfFieldInMetamodelFor; import static org.hibernate.processor.test.util.TestUtil.assertPresenceOfMethodInMetamodelFor; import static org.hibernate.processor.test.util.TestUtil.getMetaModelSourceAsString; -public class ThingTest extends CompilationTest { +@CompilationTest +class ThingTest { @Test @WithClasses( Thing.class ) - public void test() { + void test() { System.out.println( getMetaModelSourceAsString( Thing.class) ); System.out.println( getMetaModelSourceAsString( Thing.class, true) ); assertMetamodelClassGeneratedFor(Thing.class); diff --git a/tooling/metamodel-generator/src/quarkusHrPanache/java/org/hibernate/processor/test/hrPanache/QuarkusHrPanacheTest.java b/tooling/metamodel-generator/src/quarkusHrPanache/java/org/hibernate/processor/test/hrPanache/QuarkusHrPanacheTest.java index 8db8d6ecfb21..f41e4e1a060d 100644 --- a/tooling/metamodel-generator/src/quarkusHrPanache/java/org/hibernate/processor/test/hrPanache/QuarkusHrPanacheTest.java +++ b/tooling/metamodel-generator/src/quarkusHrPanache/java/org/hibernate/processor/test/hrPanache/QuarkusHrPanacheTest.java @@ -7,7 +7,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 io.smallrye.mutiny.Uni; @@ -21,10 +21,11 @@ /** * @author Gavin King */ -public class QuarkusHrPanacheTest extends CompilationTest { +@CompilationTest +class QuarkusHrPanacheTest { @Test @WithClasses({ PanacheBook.class }) - public void testPanacheEntityMetamodel() throws Exception { + void testPanacheEntityMetamodel() throws Exception { // Panache entity System.out.println( TestUtil.getMetaModelSourceAsString( PanacheBook.class ) ); Class entityClass = getMetamodelClassFor( PanacheBook.class ); @@ -51,7 +52,7 @@ public void testPanacheEntityMetamodel() throws Exception { @Test @WithClasses({ PanacheBook.class, PanacheBookRepository.class }) - public void testPanacheRepositoryMetamodel() throws Exception { + void testPanacheRepositoryMetamodel() throws Exception { // Panache repository System.out.println( TestUtil.getMetaModelSourceAsString( PanacheBookRepository.class ) ); Class repositoryClass = getMetamodelClassFor( PanacheBookRepository.class ); @@ -82,7 +83,7 @@ private void checkUni(Method method) { @Test @WithClasses({ PanacheBook.class, QuarkusBookRepository.class }) - public void testQuarkusRepositoryMetamodel() throws Exception { + void testQuarkusRepositoryMetamodel() throws Exception { // Regular repository System.out.println( TestUtil.getMetaModelSourceAsString( QuarkusBookRepository.class ) ); Class repositoryClass = getMetamodelClassFor( QuarkusBookRepository.class ); @@ -128,7 +129,7 @@ public void testQuarkusRepositoryMetamodel() throws Exception { @Test @WithClasses({ PanacheBook.class, BookRepositoryWithSession.class }) - public void testBookRepositoryWithSessionMetamodel() throws Exception { + void testBookRepositoryWithSessionMetamodel() throws Exception { // Regular repository with default session method System.out.println( TestUtil.getMetaModelSourceAsString( BookRepositoryWithSession.class ) ); Class repositoryClass = getMetamodelClassFor( BookRepositoryWithSession.class ); @@ -147,7 +148,7 @@ public void testBookRepositoryWithSessionMetamodel() throws Exception { // Not supported yet: https://hibernate.atlassian.net/browse/HHH-17960 // @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 ); diff --git a/tooling/metamodel-generator/src/quarkusOrmPanache/java/org/hibernate/processor/test/ormPanache/QuarkusOrmPanacheTest.java b/tooling/metamodel-generator/src/quarkusOrmPanache/java/org/hibernate/processor/test/ormPanache/QuarkusOrmPanacheTest.java index 94a05ed125fa..ccf3fe5bae0c 100644 --- a/tooling/metamodel-generator/src/quarkusOrmPanache/java/org/hibernate/processor/test/ormPanache/QuarkusOrmPanacheTest.java +++ b/tooling/metamodel-generator/src/quarkusOrmPanache/java/org/hibernate/processor/test/ormPanache/QuarkusOrmPanacheTest.java @@ -7,7 +7,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; @@ -20,10 +20,11 @@ import java.lang.reflect.Modifier; // Note: JD test is in jakartaData tests, due to requiring Java 17 -public class QuarkusOrmPanacheTest extends CompilationTest { +@CompilationTest +class QuarkusOrmPanacheTest { @Test @WithClasses({ PanacheBook.class }) - public void testPanacheEntityMetamodel() throws Exception { + void testPanacheEntityMetamodel() throws Exception { // Panache entity System.out.println( TestUtil.getMetaModelSourceAsString( PanacheBook.class ) ); Class entityClass = getMetamodelClassFor( PanacheBook.class ); @@ -48,7 +49,7 @@ public void testPanacheEntityMetamodel() throws Exception { @Test @WithClasses({ PanacheBook.class, PanacheBookRepository.class }) - public void testPanacheRepositoryMetamodel() throws Exception { + void testPanacheRepositoryMetamodel() throws Exception { // Panache repository System.out.println( TestUtil.getMetaModelSourceAsString( PanacheBookRepository.class ) ); Class repositoryClass = getMetamodelClassFor( PanacheBookRepository.class ); @@ -73,7 +74,7 @@ public void testPanacheRepositoryMetamodel() throws Exception { @Test @WithClasses({ PanacheBook.class, QuarkusBookRepository.class }) - public void testQuarkusRepositoryMetamodel() throws Exception { + void testQuarkusRepositoryMetamodel() throws Exception { // Panache repository System.out.println( TestUtil.getMetaModelSourceAsString( QuarkusBookRepository.class ) ); Class repositoryClass = getMetamodelClassFor( QuarkusBookRepository.class ); diff --git a/tooling/metamodel-generator/src/test/java/DefaultPackageTest.java b/tooling/metamodel-generator/src/test/java/DefaultPackageTest.java index 42582432648e..672a19c4ea6b 100644 --- a/tooling/metamodel-generator/src/test/java/DefaultPackageTest.java +++ b/tooling/metamodel-generator/src/test/java/DefaultPackageTest.java @@ -5,18 +5,19 @@ import org.hibernate.processor.test.util.CompilationTest; import org.hibernate.processor.test.util.TestForIssue; 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 Hardy Ferentschik */ +@CompilationTest @TestForIssue(jiraKey = "METAGEN-40") @WithClasses(DefaultPackageEntity.class) -public class DefaultPackageTest extends CompilationTest { +class DefaultPackageTest { @Test - public void testMetaModelGeneratedForEntitiesInDefaultPackage() { + void testMetaModelGeneratedForEntitiesInDefaultPackage() { assertMetamodelClassGeneratedFor( DefaultPackageEntity.class ); } } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/StringUtilTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/StringUtilTest.java index 2f74ec83fb72..7d182a6d8241 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/StringUtilTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/StringUtilTest.java @@ -6,11 +6,11 @@ import org.hibernate.processor.test.util.TestForIssue; import org.hibernate.processor.util.StringUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Hardy Ferentschik diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/AccessTypeTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/AccessTypeTest.java index 19c80728f432..324ff25b8673 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/AccessTypeTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/AccessTypeTest.java @@ -9,7 +9,7 @@ import org.hibernate.processor.test.util.TestUtil; import org.hibernate.processor.test.util.WithClasses; import org.hibernate.processor.test.util.WithMappingFiles; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hibernate.processor.test.util.TestUtil.assertAbsenceOfFieldInMetamodelFor; import static org.hibernate.processor.test.util.TestUtil.assertAttributeTypeInMetaModelFor; @@ -20,6 +20,7 @@ * @author Hardy Ferentschik */ // TODO - differentiate needed classes per test better. Right now all test classes are processed for each test (HF) +@CompilationTest @WithClasses({ Address.class, Area.class, @@ -44,36 +45,36 @@ User.class }) @WithMappingFiles("orm.xml") -public class AccessTypeTest extends CompilationTest { +class AccessTypeTest { @Test - public void testXmlConfiguredEntityGenerated() { + void testXmlConfiguredEntityGenerated() { TestUtil.assertMetamodelClassGeneratedFor( Order.class ); } @Test - public void testExcludeTransientFieldAndStatic() { + void testExcludeTransientFieldAndStatic() { TestUtil.assertAbsenceOfFieldInMetamodelFor( Product.class, "nonPersistent" ); TestUtil.assertAbsenceOfFieldInMetamodelFor( Product.class, "nonPersistent2" ); } @Test - public void testDefaultAccessTypeOnEntity() { + void testDefaultAccessTypeOnEntity() { TestUtil.assertAbsenceOfFieldInMetamodelFor( User.class, "nonPersistent" ); } @Test - public void testDefaultAccessTypeForSubclassOfEntity() { + void testDefaultAccessTypeForSubclassOfEntity() { TestUtil.assertAbsenceOfFieldInMetamodelFor( Customer.class, "nonPersistent" ); } @Test - public void testDefaultAccessTypeForEmbeddable() { + void testDefaultAccessTypeForEmbeddable() { TestUtil.assertAbsenceOfFieldInMetamodelFor( Detail.class, "nonPersistent" ); } @Test - public void testInheritedAccessTypeForEmbeddable() { + void testInheritedAccessTypeForEmbeddable() { TestUtil.assertAbsenceOfFieldInMetamodelFor( Country.class, "nonPersistent" ); assertAbsenceOfFieldInMetamodelFor( Pet.class, "nonPersistent", "Collection of embeddable not taken care of" @@ -82,7 +83,7 @@ public void testInheritedAccessTypeForEmbeddable() { @Test @TestForIssue(jiraKey = " METAGEN-81") - public void testAccessTypeForEmbeddableDeterminedByIdAnnotationInRootEntity() { + void testAccessTypeForEmbeddableDeterminedByIdAnnotationInRootEntity() { assertPresenceOfFieldInMetamodelFor( Hotel.class, "webDomainExpert", "Access type should be inherited position of the @Id field annotation in the root entity" @@ -90,12 +91,12 @@ public void testAccessTypeForEmbeddableDeterminedByIdAnnotationInRootEntity() { } @Test - public void testDefaultAccessTypeForMappedSuperclass() { + void testDefaultAccessTypeForMappedSuperclass() { TestUtil.assertAbsenceOfFieldInMetamodelFor( Detail.class, "volume" ); } @Test - public void testExplicitAccessTypeAndDefaultFromRootEntity() { + void testExplicitAccessTypeAndDefaultFromRootEntity() { assertAbsenceOfFieldInMetamodelFor( LivingBeing.class, "nonPersistent", @@ -110,7 +111,7 @@ public void testExplicitAccessTypeAndDefaultFromRootEntity() { } @Test - public void testMemberAccessType() { + void testMemberAccessType() { assertPresenceOfFieldInMetamodelFor( Customer.class, "goodPayer", "access type overriding" ); assertAttributeTypeInMetaModelFor( Customer.class, "goodPayer", Boolean.class, "access type overriding" ); } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/annotationtype/AnnotationTypeTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/annotationtype/AnnotationTypeTest.java index 2795c56ec83c..1b18180d9157 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/annotationtype/AnnotationTypeTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/annotationtype/AnnotationTypeTest.java @@ -9,18 +9,19 @@ import org.hibernate.processor.test.util.TestUtil; import org.hibernate.processor.test.util.WithClasses; import org.hibernate.processor.test.util.WithMappingFiles; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Sergey Morgunov */ +@CompilationTest @TestForIssue(jiraKey = "HHH-13145") -public class AnnotationTypeTest extends CompilationTest { +class AnnotationTypeTest { @Test @WithClasses({ Entity.class }) @WithMappingFiles("orm.xml") - public void testXmlConfiguredEntityGenerated() { + void testXmlConfiguredEntityGenerated() { TestUtil.assertMetamodelClassGeneratedFor( Entity.class ); } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/arraytype/ArrayTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/arraytype/ArrayTest.java index a8e7901c9764..f96777160fb8 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/arraytype/ArrayTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/arraytype/ArrayTest.java @@ -7,26 +7,27 @@ import org.hibernate.processor.test.util.CompilationTest; import org.hibernate.processor.test.util.TestForIssue; 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.assertAttributeTypeInMetaModelFor; /** * @author Hardy Ferentschik */ -public class ArrayTest extends CompilationTest { +@CompilationTest +class ArrayTest { @Test @TestForIssue(jiraKey = "METAGEN-2") @WithClasses(Image.class) - public void testPrimitiveArray() { + void testPrimitiveArray() { assertAttributeTypeInMetaModelFor( Image.class, "data", byte[].class, "Wrong type for field." ); } @Test @TestForIssue(jiraKey = "METAGEN-2") @WithClasses(TemperatureSamples.class) - public void testIntegerArray() { + void testIntegerArray() { assertAttributeTypeInMetaModelFor( TemperatureSamples.class, "samples", Integer[].class, "Wrong type for field." ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/arraytype/ArrayTestWithTypeUseTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/arraytype/ArrayTestWithTypeUseTest.java index e23d405137ce..540227203eb2 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/arraytype/ArrayTestWithTypeUseTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/arraytype/ArrayTestWithTypeUseTest.java @@ -7,7 +7,7 @@ import org.hibernate.processor.test.util.CompilationTest; import org.hibernate.processor.test.util.TestForIssue; 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.assertAttributeTypeInMetaModelFor; import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor; @@ -15,11 +15,12 @@ /** * @author Chris Cranford */ -public class ArrayTestWithTypeUseTest extends CompilationTest { +@CompilationTest +class ArrayTestWithTypeUseTest { @Test @TestForIssue(jiraKey = "HHH-12011") @WithClasses(TestEntity.class) - public void testArrayWithBeanValidation() { + void testArrayWithBeanValidation() { assertMetamodelClassGeneratedFor( TestEntity.class ); // Primitive Arrays diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/blob/BlobTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/blob/BlobTest.java index 83e5cfacdf19..314086d9c1ee 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/blob/BlobTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/blob/BlobTest.java @@ -7,7 +7,7 @@ import org.hibernate.processor.test.util.CompilationTest; import org.hibernate.processor.test.util.TestForIssue; 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.assertPresenceOfFieldInMetamodelFor; @@ -15,12 +15,13 @@ /** * @author Hardy Ferentschik */ -public class BlobTest extends CompilationTest { +@CompilationTest +class BlobTest { @Test @TestForIssue(jiraKey = "METAGEN-38") @WithClasses(BlobEntity.class) - public void testBlobField() { + void testBlobField() { assertMetamodelClassGeneratedFor( BlobEntity.class ); assertPresenceOfFieldInMetamodelFor( BlobEntity.class, "blob", "the metamodel should have a member 'blob'" ); } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/circulartypevariable/CircularTypeVariableTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/circulartypevariable/CircularTypeVariableTest.java index 8c5ba74c4915..e99b06c8c0cc 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/circulartypevariable/CircularTypeVariableTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/circulartypevariable/CircularTypeVariableTest.java @@ -9,15 +9,15 @@ import org.hibernate.processor.test.util.TestUtil; import org.hibernate.processor.test.util.WithClasses; -import org.junit.Test; - +import org.junit.jupiter.api.Test; +@CompilationTest @TestForIssue(jiraKey = "HHH-17253") -public class CircularTypeVariableTest extends CompilationTest { +class CircularTypeVariableTest { @Test @WithClasses({ RoleAccess.class, User.class }) - public void testCircularTypeVariable() { + void testCircularTypeVariable() { TestUtil.assertMetamodelClassGeneratedFor( RoleAccess.class ); TestUtil.assertMetamodelClassGeneratedFor( User.class ); } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/classnamecollision/ClassNameCollisionTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/classnamecollision/ClassNameCollisionTest.java index 0806e04a0e88..5feab3185462 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/classnamecollision/ClassNameCollisionTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/classnamecollision/ClassNameCollisionTest.java @@ -6,21 +6,22 @@ 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; import static org.hibernate.processor.test.util.TestUtil.getMetamodelClassFor; import static org.junit.jupiter.api.Assertions.assertEquals; -public class ClassNameCollisionTest extends CompilationTest { +@CompilationTest +class ClassNameCollisionTest { @Test @WithClasses({ Something.class, org.hibernate.processor.test.classnamecollision.somewhere.Something.class }) - public void testAmbiguousSimpleName() { + void testAmbiguousSimpleName() { System.out.println( getMetaModelSourceAsString( Something.class ) ); assertMetamodelClassGeneratedFor( Something.class ); System.out.println( getMetaModelSourceAsString( org.hibernate.processor.test.classnamecollision.somewhere.Something.class ) ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/ElementCollectionWithConverterTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/ElementCollectionWithConverterTest.java index facb93edb887..6c87c975a57f 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/ElementCollectionWithConverterTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/ElementCollectionWithConverterTest.java @@ -7,7 +7,7 @@ import org.hibernate.processor.test.util.CompilationTest; import org.hibernate.processor.test.util.TestForIssue; 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.assertListAttributeTypeInMetaModelFor; import static org.hibernate.processor.test.util.TestUtil.assertMapAttributesInMetaModelFor; @@ -17,11 +17,12 @@ /** * @author Chris Cranford */ -public class ElementCollectionWithConverterTest extends CompilationTest { +@CompilationTest +class ElementCollectionWithConverterTest { @Test @TestForIssue(jiraKey = "HHH-12581") @WithClasses( { Item.class } ) - public void testConverterAppliedToElementCollections() { + void testConverterAppliedToElementCollections() { assertMetamodelClassGeneratedFor( Item.class ); // Verify that field roles is a SetAttribute with a generic type of Role.class diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constant/BadEnumConstantInNamedQueryTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constant/BadEnumConstantInNamedQueryTest.java index a24f622873f3..1e2b0275e560 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constant/BadEnumConstantInNamedQueryTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constant/BadEnumConstantInNamedQueryTest.java @@ -8,7 +8,7 @@ import org.hibernate.processor.test.util.TestForIssue; import org.hibernate.processor.test.util.WithClasses; -import org.junit.Test; +import org.junit.jupiter.api.Test; import jakarta.persistence.EntityManager; @@ -18,12 +18,13 @@ import static org.hibernate.processor.test.util.TestUtil.getMetaModelSourceAsString; import static org.junit.jupiter.api.Assertions.assertThrows; +@CompilationTest @TestForIssue(jiraKey = "HHH-No-Such-Key") -public class BadEnumConstantInNamedQueryTest extends CompilationTest { +class BadEnumConstantInNamedQueryTest { @Test @WithClasses({ CookBook.class }) - public void testFourthWithoutCheckHQL() { + void testFourthWithoutCheckHQL() { System.out.println( getMetaModelSourceAsString( CookBook.class ) ); assertMetamodelClassGeneratedFor( CookBook.class ); assertPresenceOfFieldInMetamodelFor( CookBook.class, "QUERY_FIND_GOOD_BOOKS" ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constant/ConstantInNamedQueryTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constant/ConstantInNamedQueryTest.java index d61987e7aa96..4bcfd8600dea 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constant/ConstantInNamedQueryTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constant/ConstantInNamedQueryTest.java @@ -9,7 +9,7 @@ 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 jakarta.persistence.EntityManager; @@ -17,12 +17,13 @@ import static org.hibernate.processor.test.util.TestUtil.assertPresenceOfFieldInMetamodelFor; import static org.hibernate.processor.test.util.TestUtil.assertPresenceOfMethodInMetamodelFor; +@CompilationTest @TestForIssue(jiraKey = "HHH-18106") -public class ConstantInNamedQueryTest extends CompilationTest { +class ConstantInNamedQueryTest { @Test @WithClasses(value = {}, sources = "org.hibernate.processor.test.constant.CookBookWithCheck") - public void withCheckHQL() { + void withCheckHQL() { final String entityClass = "org.hibernate.processor.test.constant.CookBookWithCheck"; System.out.println( TestUtil.getMetaModelSourceAsString( entityClass ) ); @@ -38,7 +39,7 @@ public void withCheckHQL() { @Test @WithClasses(value = CookBookWithoutCheck.class, sources = "org.hibernate.processor.test.constant.NumericBookType") - public void withoutCheckHQL() { + void withoutCheckHQL() { final String entityClass = "org.hibernate.processor.test.constant.CookBookWithoutCheck"; System.out.println( TestUtil.getMetaModelSourceAsString( entityClass ) ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/SuperClassWithGetEntityManagerTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/SuperClassWithGetEntityManagerTest.java index 351744e167cd..5913f289c404 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/SuperClassWithGetEntityManagerTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/SuperClassWithGetEntityManagerTest.java @@ -12,7 +12,7 @@ import org.hibernate.processor.test.util.TestUtil; import org.hibernate.processor.test.util.WithClasses; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test various scenarios where a superclass of an entity has a {@code getEntityManager()} method. @@ -21,17 +21,18 @@ *

* The method may be static or not. */ +@CompilationTest @TestForIssue(jiraKey = "HHH-17683") -public class SuperClassWithGetEntityManagerTest extends CompilationTest { +class SuperClassWithGetEntityManagerTest { @Test @WithClasses({ EntityWithInstanceGetEntityManager.class, EntityExtendingEntityWithInstanceGetEntityManager.class }) - public void entityWithInstanceGetEntityManager() { + void entityWithInstanceGetEntityManager() { doTest( EntityWithInstanceGetEntityManager.class, EntityExtendingEntityWithInstanceGetEntityManager.class ); } @Test @WithClasses({ EntityWithStaticGetEntityManager.class, EntityExtendingEntityWithStaticGetEntityManager.class }) - public void entityWithStaticGetEntityManager() { + void entityWithStaticGetEntityManager() { doTest( EntityWithStaticGetEntityManager.class, EntityExtendingEntityWithStaticGetEntityManager.class ); } @@ -39,7 +40,7 @@ public void entityWithStaticGetEntityManager() { @WithClasses({ NonEntityWithInstanceGetEntityManager.class, EntityExtendingNonEntityWithInstanceGetEntityManager.class }) - public void nonEntityWithInstanceGetEntityManager() { + void nonEntityWithInstanceGetEntityManager() { doTest( NonEntityWithInstanceGetEntityManager.class, EntityExtendingNonEntityWithInstanceGetEntityManager.class @@ -51,7 +52,7 @@ public void nonEntityWithInstanceGetEntityManager() { NonEntityWithStaticGetEntityManager.class, EntityExtendingNonEntityWithStaticGetEntityManager.class }) - public void nonEntityWithStaticGetEntityManager() { + void nonEntityWithStaticGetEntityManager() { doTest( NonEntityWithStaticGetEntityManager.class, EntityExtendingNonEntityWithStaticGetEntityManager.class @@ -63,7 +64,7 @@ public void nonEntityWithStaticGetEntityManager() { MapperSuperClassWithInstanceGetEntityManager.class, EntityExtendingMapperSuperClassWithInstanceGetEntityManager.class }) - public void mappedSuperClassWithInstanceGetEntityManager() { + void mappedSuperClassWithInstanceGetEntityManager() { doTest( MapperSuperClassWithInstanceGetEntityManager.class, EntityExtendingMapperSuperClassWithInstanceGetEntityManager.class @@ -75,7 +76,7 @@ public void mappedSuperClassWithInstanceGetEntityManager() { MapperSuperClassWithStaticGetEntityManager.class, EntityExtendingMapperSuperClassWithStaticGetEntityManager.class }) - public void mappedSuperClassWithStaticGetEntityManager() { + void mappedSuperClassWithStaticGetEntityManager() { doTest( MapperSuperClassWithStaticGetEntityManager.class, EntityExtendingMapperSuperClassWithStaticGetEntityManager.class @@ -88,7 +89,7 @@ public void mappedSuperClassWithStaticGetEntityManager() { MapperSuperClassExtendingNonEntityWithInstanceGetEntityManager.class, EntityExtendingMapperSuperClassExtendingNonEntityWithInstanceGetEntityManager.class }) - public void mappedSuperClassExtendingNonEntityWithInstanceGetEntityManager() { + void mappedSuperClassExtendingNonEntityWithInstanceGetEntityManager() { doTest( MapperSuperClassExtendingNonEntityWithInstanceGetEntityManager.class, EntityExtendingMapperSuperClassExtendingNonEntityWithInstanceGetEntityManager.class @@ -103,7 +104,7 @@ public void mappedSuperClassExtendingNonEntityWithInstanceGetEntityManager() { MapperSuperClassExtendingNonEntityWithStaticGetEntityManager.class, EntityExtendingMapperSuperClassExtendingNonEntityWithStaticGetEntityManager.class }) - public void mappedSuperClassExtendingNonEntityWithStaticGetEntityManager() { + void mappedSuperClassExtendingNonEntityWithStaticGetEntityManager() { doTest( MapperSuperClassExtendingNonEntityWithStaticGetEntityManager.class, EntityExtendingMapperSuperClassExtendingNonEntityWithStaticGetEntityManager.class diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/DaoTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/DaoTest.java index 6be01d3a6fad..b615ba17a31d 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/DaoTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/DaoTest.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 DaoTest extends CompilationTest { +@CompilationTest +class DaoTest { @Test @WithClasses({ Book.class, Dao.class, Bean.class, StatefulDao.class, StatelessDao.class }) - public void testDao() { + void testDao() { System.out.println( TestUtil.getMetaModelSourceAsString( Dao.class ) ); System.out.println( TestUtil.getMetaModelSourceAsString( StatefulDao.class ) ); System.out.println( TestUtil.getMetaModelSourceAsString( StatelessDao.class ) ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/DaoTest2.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/DaoTest2.java index b86f8693da61..958710ca6af8 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/DaoTest2.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/DaoTest2.java @@ -8,17 +8,18 @@ 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 DaoTest2 extends CompilationTest { +@CompilationTest +class DaoTest2 { @Test @WithClasses({ Book.class, Dao2.class }) - public void testDao() { + void testDao() { System.out.println( TestUtil.getMetaModelSourceAsString( Dao2.class ) ); assertMetamodelClassGeneratedFor( Book.class ); assertMetamodelClassGeneratedFor( Dao2.class ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/ElementCollectionTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/ElementCollectionTest.java index 6eb8e21d50ea..bf1931ca24e8 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/ElementCollectionTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/ElementCollectionTest.java @@ -9,7 +9,7 @@ import org.hibernate.processor.test.util.WithClasses; import org.hibernate.processor.test.util.WithMappingFiles; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hibernate.processor.test.util.TestUtil.assertListAttributeTypeInMetaModelFor; import static org.hibernate.processor.test.util.TestUtil.assertMapAttributesInMetaModelFor; @@ -19,12 +19,13 @@ /** * @author Hardy Ferentschik */ -public class ElementCollectionTest extends CompilationTest { +@CompilationTest +class ElementCollectionTest { @Test @TestForIssue(jiraKey = "METAGEN-8") @WithClasses({ House.class, Room.class }) - public void testElementCollectionOnMap() { + void testElementCollectionOnMap() { assertMetamodelClassGeneratedFor( House.class ); assertMetamodelClassGeneratedFor( Room.class ); // side effect of METAGEN-8 was that a meta class for String was created! @@ -34,7 +35,7 @@ public void testElementCollectionOnMap() { @Test @TestForIssue(jiraKey = "METAGEN-19") @WithClasses({ Hotel.class, Room.class, Cleaner.class }) - public void testMapKeyClass() { + void testMapKeyClass() { assertMetamodelClassGeneratedFor( Hotel.class ); assertMapAttributesInMetaModelFor( Hotel.class, "roomsByName", String.class, Room.class, "Wrong type in map attribute." @@ -49,7 +50,7 @@ public void testMapKeyClass() { @TestForIssue(jiraKey = "METAGEN-22") @WithClasses({ Hostel.class, Room.class, Cleaner.class }) @WithMappingFiles("hostel.xml") - public void testMapKeyClassXmlConfigured() { + void testMapKeyClassXmlConfigured() { assertMetamodelClassGeneratedFor( Hostel.class ); assertMapAttributesInMetaModelFor( Hostel.class, "roomsByName", String.class, Room.class, "Wrong type in map attribute." @@ -63,7 +64,7 @@ public void testMapKeyClassXmlConfigured() { @Test @TestForIssue(jiraKey = "HHH-11004") @WithClasses({ OfficeBuilding.class }) - public void testArrayValueElementCollection() { + void testArrayValueElementCollection() { assertMetamodelClassGeneratedFor( OfficeBuilding.class ); assertMapAttributesInMetaModelFor( OfficeBuilding.class, "doorCodes", Integer.class, byte[].class, "Wrong type in map attribute." @@ -73,7 +74,7 @@ public void testArrayValueElementCollection() { @Test @TestForIssue(jiraKey = "HHH-11871") @WithClasses({ Homework.class}) - public void testListAttributeWithGenericTypeForJavaBeanGetter() { + void testListAttributeWithGenericTypeForJavaBeanGetter() { assertMetamodelClassGeneratedFor( Homework.class ); assertListAttributeTypeInMetaModelFor( Homework.class, "paths", String.class, "ListAttribute generic type should be String" ); } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/ElementCollectionTypeUseTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/ElementCollectionTypeUseTest.java index 03df3bc19cc2..a86c7fc8b819 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/ElementCollectionTypeUseTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/ElementCollectionTypeUseTest.java @@ -8,18 +8,22 @@ import org.hibernate.processor.test.util.TestForIssue; 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.*; +import static org.hibernate.processor.test.util.TestUtil.assertListAttributeTypeInMetaModelFor; +import static org.hibernate.processor.test.util.TestUtil.assertMapAttributesInMetaModelFor; +import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor; +import static org.hibernate.processor.test.util.TestUtil.assertSetAttributeTypeInMetaModelFor; /** * @author Chris Cranford */ -public class ElementCollectionTypeUseTest extends CompilationTest { +@CompilationTest +class ElementCollectionTypeUseTest { @Test @TestForIssue(jiraKey = "HHH-12612") @WithClasses(OfficeBuildingValidated.class) - public void testAnnotatedCollectionElements() { + void testAnnotatedCollectionElements() { System.out.println( TestUtil.getMetaModelSourceAsString( OfficeBuildingValidated.class ) ); assertMetamodelClassGeneratedFor( OfficeBuildingValidated.class ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/EmbeddableAccessTypeTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/EmbeddableAccessTypeTest.java index 0674053457db..7e8e4141187e 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/EmbeddableAccessTypeTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/EmbeddableAccessTypeTest.java @@ -6,17 +6,18 @@ 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.assertAttributeTypeInMetaModelFor; /** * @author Hardy Ferentschik */ -public class EmbeddableAccessTypeTest extends CompilationTest { +@CompilationTest +class EmbeddableAccessTypeTest { @Test @WithClasses({ Base.class, EmbeddableEntity.class, IStuff.class, MyEntity.class, Stuff.class }) - public void testCorrectAccessTypeUsedForEmbeddable() { + void testCorrectAccessTypeUsedForEmbeddable() { assertAttributeTypeInMetaModelFor( EmbeddableEntity.class, "stuffs", diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/EmbeddableTypeUseTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/EmbeddableTypeUseTest.java index 04b723c5d80b..ace1c2e9ca84 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/EmbeddableTypeUseTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/EmbeddableTypeUseTest.java @@ -8,7 +8,7 @@ import org.hibernate.processor.test.util.TestForIssue; 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.assertAttributeTypeInMetaModelFor; import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor; @@ -16,11 +16,12 @@ /** * @author Chris Cranford */ +@CompilationTest @TestForIssue(jiraKey = "HHH-12612") -public class EmbeddableTypeUseTest extends CompilationTest { +class EmbeddableTypeUseTest { @Test @WithClasses({SimpleEntity.class}) - public void testAnnotatedEmbeddable() { + void testAnnotatedEmbeddable() { System.out.println( TestUtil.getMetaModelSourceAsString( SimpleEntity.class ) ); assertMetamodelClassGeneratedFor( SimpleEntity.class ); assertAttributeTypeInMetaModelFor( diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/EmbeddableGenericsTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/EmbeddableGenericsTest.java index 6aadff3942bf..ac8dcac8aac8 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/EmbeddableGenericsTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/EmbeddableGenericsTest.java @@ -7,19 +7,22 @@ import org.hibernate.processor.test.util.CompilationTest; import org.hibernate.processor.test.util.TestForIssue; import org.hibernate.processor.test.util.WithClasses; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static java.lang.System.out; -import static org.hibernate.processor.test.util.TestUtil.*; +import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor; +import static org.hibernate.processor.test.util.TestUtil.assertSuperclassRelationshipInMetamodel; +import static org.hibernate.processor.test.util.TestUtil.getMetaModelSourceAsString; /** * @author Chris Cranford */ +@CompilationTest @TestForIssue(jiraKey = "HHH_12030") -public class EmbeddableGenericsTest extends CompilationTest { +class EmbeddableGenericsTest { @Test @WithClasses({ ChildEmbeddable.class, ParentEmbeddable.class }) - public void testGeneratingEmbeddablesWithGenerics() { + void testGeneratingEmbeddablesWithGenerics() { out.println( getMetaModelSourceAsString(ParentEmbeddable.class) ); assertMetamodelClassGeneratedFor( ChildEmbeddable.class ); assertMetamodelClassGeneratedFor( ParentEmbeddable.class ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/genericsinheritance/EmbeddableGenericsAndInterfaceTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/genericsinheritance/EmbeddableGenericsAndInterfaceTest.java index a87c2cc9e82a..de84ab44173e 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/genericsinheritance/EmbeddableGenericsAndInterfaceTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/genericsinheritance/EmbeddableGenericsAndInterfaceTest.java @@ -7,15 +7,16 @@ 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.assertAttributeTypeInMetaModelFor; import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor; import static org.hibernate.processor.test.util.TestUtil.assertSuperclassRelationshipInMetamodel; -public class EmbeddableGenericsAndInterfaceTest extends CompilationTest { +@CompilationTest +class EmbeddableGenericsAndInterfaceTest { @Test @WithClasses({ExampleEntity.class, UserEntity.class, ExampleEmbedded.class, ExampleSuperClassEmbedded.class}) - public void test() { + void test() { System.out.println( TestUtil.getMetaModelSourceAsString( ExampleEntity.class ) ); System.out.println( TestUtil.getMetaModelSourceAsString( ExampleSuperClassEmbedded.class ) ); System.out.println( TestUtil.getMetaModelSourceAsString( ExampleEmbedded.class ) ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/field/NestedEmbeddableTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/field/NestedEmbeddableTest.java index 7e339d22c15e..fd6fe48533a1 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/field/NestedEmbeddableTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/field/NestedEmbeddableTest.java @@ -6,14 +6,15 @@ 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.assertAttributeTypeInMetaModelFor; -public class NestedEmbeddableTest extends CompilationTest { +@CompilationTest +class NestedEmbeddableTest { @Test @WithClasses({ Author.class, Address.class, Postcode.class }) - public void testCorrectAccessTypeUsedForEmbeddable() { + void testCorrectAccessTypeUsedForEmbeddable() { assertAttributeTypeInMetaModelFor( Address.class, "city", diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/property/NestedEmbeddableTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/property/NestedEmbeddableTest.java index c4da03b68c92..028d6b8bdd06 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/property/NestedEmbeddableTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/property/NestedEmbeddableTest.java @@ -6,14 +6,15 @@ 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.assertAttributeTypeInMetaModelFor; -public class NestedEmbeddableTest extends CompilationTest { +@CompilationTest +class NestedEmbeddableTest { @Test @WithClasses({ Author.class, Address.class, Postcode.class }) - public void testCorrectAccessTypeUsedForEmbeddable() { + void testCorrectAccessTypeUsedForEmbeddable() { assertAttributeTypeInMetaModelFor( Address.class, "city", diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withinheritance/EmbeddedIdWithInheritanceTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withinheritance/EmbeddedIdWithInheritanceTest.java index cf0b3bbf04ba..40d641257a58 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withinheritance/EmbeddedIdWithInheritanceTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withinheritance/EmbeddedIdWithInheritanceTest.java @@ -7,7 +7,7 @@ import org.hibernate.processor.test.util.CompilationTest; import org.hibernate.processor.test.util.WithClasses; import org.hibernate.processor.test.util.WithMappingFiles; -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.assertPresenceOfFieldInMetamodelFor; @@ -15,11 +15,12 @@ /** * @author Hardy Ferentschik */ -public class EmbeddedIdWithInheritanceTest extends CompilationTest { +@CompilationTest +class EmbeddedIdWithInheritanceTest { @Test @WithClasses({ Ref.class, AbstractRef.class, TestEntity.class }) @WithMappingFiles("orm.xml") - public void testEntityContainsEmbeddedIdProperty() { + void testEntityContainsEmbeddedIdProperty() { assertMetamodelClassGeneratedFor( TestEntity.class ); assertPresenceOfFieldInMetamodelFor( TestEntity.class, "ref", "Property ref should be in metamodel" diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withoutinheritance/EmbeddedIdNoInheritanceTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withoutinheritance/EmbeddedIdNoInheritanceTest.java index 58609ad62afe..b48016394d50 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withoutinheritance/EmbeddedIdNoInheritanceTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withoutinheritance/EmbeddedIdNoInheritanceTest.java @@ -7,7 +7,7 @@ import org.hibernate.processor.test.util.CompilationTest; import org.hibernate.processor.test.util.WithClasses; import org.hibernate.processor.test.util.WithMappingFiles; -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.assertPresenceOfFieldInMetamodelFor; @@ -15,11 +15,12 @@ /** * @author Hardy Ferentschik */ -public class EmbeddedIdNoInheritanceTest extends CompilationTest { +@CompilationTest +class EmbeddedIdNoInheritanceTest { @Test @WithClasses({ Person.class, XmlPerson.class, PersonId.class }) @WithMappingFiles("orm.xml") - public void testGeneratedAnnotationNotGenerated() { + void testGeneratedAnnotationNotGenerated() { assertMetamodelClassGeneratedFor( Person.class ); assertPresenceOfFieldInMetamodelFor( Person.class, "id", "Property id should be in metamodel" diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/CoreTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/CoreTest.java index e727164c6f09..da5e69acdfd4 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/CoreTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/CoreTest.java @@ -6,14 +6,15 @@ 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; /** * @author Hardy Ferentschik */ -public class CoreTest extends CompilationTest { +@CompilationTest +public class CoreTest { @Test @WithClasses({MapEntity.class, MapEntityLocal.class, Order.class, LineItem.class, CreditCard.class, Customer.class, PersonId.class, Phone.class, Person.class, Product.class, BaseEmbeddedEntity.class, VersionedEntity.class, ShelfLife.class, diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generatedannotation/GeneratedAnnotationTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generatedannotation/GeneratedAnnotationTest.java index 5d468750bc7e..3a2c1a8fe636 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generatedannotation/GeneratedAnnotationTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generatedannotation/GeneratedAnnotationTest.java @@ -7,26 +7,27 @@ import org.hibernate.processor.test.util.CompilationTest; import org.hibernate.processor.test.util.TestForIssue; 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; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Hardy Ferentschik */ -public class GeneratedAnnotationTest extends CompilationTest { +@CompilationTest +class GeneratedAnnotationTest { @Test @TestForIssue(jiraKey = "METAGEN-79") @WithClasses(TestEntity.class) - public void testGeneratedAnnotationNotGenerated() { + void testGeneratedAnnotationNotGenerated() { assertMetamodelClassGeneratedFor( TestEntity.class ); // need to check the source because @Generated is not a runtime annotation String metaModelSource = getMetaModelSourceAsString( TestEntity.class ); String generatedString = "@Generated(\"org.hibernate.processor.HibernateProcessor\")"; - assertTrue( "@Generated should be added to the metamodel.", metaModelSource.contains( generatedString ) ); + assertTrue( metaModelSource.contains( generatedString ), "@Generated should be added to the metamodel." ); } } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generatedannotation/GenerationDateTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generatedannotation/GenerationDateTest.java index 397a9b7ba072..3fb258829135 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generatedannotation/GenerationDateTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generatedannotation/GenerationDateTest.java @@ -9,22 +9,23 @@ import org.hibernate.processor.test.util.TestForIssue; import org.hibernate.processor.test.util.WithClasses; import org.hibernate.processor.test.util.WithProcessorOption; -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.dumpMetaModelSourceFor; import static org.hibernate.processor.test.util.TestUtil.getMetaModelSourceAsString; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Hardy Ferentschik */ -public class GenerationDateTest extends CompilationTest { +@CompilationTest +class GenerationDateTest { @Test @TestForIssue(jiraKey = "METAGEN-73") @WithClasses(TestEntity.class) @WithProcessorOption(key = HibernateProcessor.ADD_GENERATION_DATE, value = "true") - public void testGeneratedAnnotationGenerated() { + void testGeneratedAnnotationGenerated() { assertMetamodelClassGeneratedFor( TestEntity.class ); // need to check the source because @Generated is not a runtime annotation @@ -33,6 +34,6 @@ public void testGeneratedAnnotationGenerated() { dumpMetaModelSourceFor( TestEntity.class ); String generatedString = "@Generated(value = \"org.hibernate.processor.HibernateProcessor\", date = \""; - assertTrue( "@Generated should also contain the date parameter.", metaModelSource.contains( generatedString ) ); + assertTrue( metaModelSource.contains( generatedString ), "@Generated should also contain the date parameter." ); } } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generatedannotation/SkipGeneratedAnnotationTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generatedannotation/SkipGeneratedAnnotationTest.java index 62e4c10b2ba9..9b8ca9be65fa 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generatedannotation/SkipGeneratedAnnotationTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generatedannotation/SkipGeneratedAnnotationTest.java @@ -9,25 +9,26 @@ import org.hibernate.processor.test.util.TestForIssue; import org.hibernate.processor.test.util.WithClasses; import org.hibernate.processor.test.util.WithProcessorOption; -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; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; /** * @author Hardy Ferentschik */ -public class SkipGeneratedAnnotationTest extends CompilationTest { +@CompilationTest +class SkipGeneratedAnnotationTest { @Test @TestForIssue(jiraKey = "METAGEN-79") @WithClasses(TestEntity.class) @WithProcessorOption(key = HibernateProcessor.ADD_GENERATED_ANNOTATION, value = "false") - public void testGeneratedAnnotationGenerated() { + void testGeneratedAnnotationGenerated() { assertMetamodelClassGeneratedFor( TestEntity.class ); // need to check the source because @Generated is not a runtime annotation String metaModelSource = getMetaModelSourceAsString( TestEntity.class ); - assertFalse( "@Generated should not be added to the metamodel.", metaModelSource.contains( "@Generated" ) ); + assertFalse( metaModelSource.contains( "@Generated" ), "@Generated should not be added to the metamodel." ); } } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generics/GenericsTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generics/GenericsTest.java index 7f3a3a2b96ac..6467a62c5114 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generics/GenericsTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generics/GenericsTest.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; /** * @author Emmanuel Bernard */ -public class GenericsTest extends CompilationTest { +@CompilationTest +class GenericsTest { @Test @WithClasses({ Parent.class, Child.class }) - public void testGenerics() { + void testGenerics() { assertMetamodelClassGeneratedFor( Parent.class ); assertMetamodelClassGeneratedFor( Child.class ); } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generictype/GenericEntityTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generictype/GenericEntityTest.java index 7c4e7cf9a483..0f2c0fd05ff0 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generictype/GenericEntityTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generictype/GenericEntityTest.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 java.lang.System.out; import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor; @@ -15,11 +15,12 @@ /** * @author Hardy Ferentschik */ -public class GenericEntityTest extends CompilationTest { +@CompilationTest +class GenericEntityTest { @Test @WithClasses(Generic.class) - public void testGeneric() { + void testGeneric() { out.println( getMetaModelSourceAsString( Generic.class ) ); assertMetamodelClassGeneratedFor( Generic.class ); } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hashcode/HashCodeTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hashcode/HashCodeTest.java index 41bc3fd0524b..83500e6a1563 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hashcode/HashCodeTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hashcode/HashCodeTest.java @@ -7,7 +7,7 @@ import org.hibernate.processor.test.util.CompilationTest; import org.hibernate.processor.test.util.TestForIssue; 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.assertAbsenceOfFieldInMetamodelFor; import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor; @@ -16,12 +16,13 @@ /** * @author Hardy Ferentschik */ -public class HashCodeTest extends CompilationTest { +@CompilationTest +class HashCodeTest { @Test @TestForIssue(jiraKey = "METAGEN-76") @WithClasses(HashEntity.class) - public void testHashCodeDoesNotCreateSingularAttribute() { + void testHashCodeDoesNotCreateSingularAttribute() { assertMetamodelClassGeneratedFor( HashEntity.class ); assertPresenceOfFieldInMetamodelFor( HashEntity.class, "id" ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17613/HHH17613Test.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17613/HHH17613Test.java index a17dfba362e2..51a923fe6f62 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17613/HHH17613Test.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17613/HHH17613Test.java @@ -10,15 +10,16 @@ import org.hibernate.processor.test.util.TestUtil; import org.hibernate.processor.test.util.WithClasses; -import org.junit.Test; +import org.junit.jupiter.api.Test; +@CompilationTest @TestForIssue(jiraKey = " HHH-17613") -public class HHH17613Test extends CompilationTest { +class HHH17613Test { @Test @WithClasses({ ChildA.class, ChildB.class, Parent.class }) @TestForIssue(jiraKey = " HHH-17613") - public void test() { + void test() { System.out.println( TestUtil.getMetaModelSourceAsString( ChildA.class ) ); System.out.println( TestUtil.getMetaModelSourceAsString( ChildB.class ) ); System.out.println( TestUtil.getMetaModelSourceAsString( Parent.class ) ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17661/HHH17661Test.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17661/HHH17661Test.java index 8a2cfabce2ab..a2ffe0712972 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17661/HHH17661Test.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17661/HHH17661Test.java @@ -8,15 +8,16 @@ import org.hibernate.processor.test.util.TestForIssue; import org.hibernate.processor.test.util.TestUtil; import org.hibernate.processor.test.util.WithClasses; -import org.junit.Test; +import org.junit.jupiter.api.Test; +@CompilationTest @TestForIssue(jiraKey = " HHH-17661") -public class HHH17661Test extends CompilationTest { +class HHH17661Test { @Test @WithClasses({ Entity.class, Tree.class, TreeRelation.class }) @TestForIssue(jiraKey = " HHH-17661") - public void test() { + void test() { System.out.println( TestUtil.getMetaModelSourceAsString( Entity.class ) ); System.out.println( TestUtil.getMetaModelSourceAsString( Tree.class ) ); System.out.println( TestUtil.getMetaModelSourceAsString( TreeRelation.class ) ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh18829/AutoGeneratedIdClassTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh18829/AutoGeneratedIdClassTest.java index aaeeba8cc91d..868bb6bd87dc 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh18829/AutoGeneratedIdClassTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh18829/AutoGeneratedIdClassTest.java @@ -8,7 +8,7 @@ import org.hibernate.processor.test.util.TestForIssue; 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 java.lang.reflect.RecordComponent; import java.util.Arrays; @@ -17,13 +17,14 @@ import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertTrue; +@CompilationTest @TestForIssue(jiraKey = " HHH-18829") -public class AutoGeneratedIdClassTest extends CompilationTest { +class AutoGeneratedIdClassTest { @Test @WithClasses({Employee.class, AnotherEmployee.class, Address.class, EmployeeWithIdClass.class}) @TestForIssue(jiraKey = "HHH-18829") - public void test() { + void test() { System.out.println( TestUtil.getMetaModelSourceAsString( Employee.class ) ); System.out.println( TestUtil.getMetaModelSourceAsString( AnotherEmployee.class ) ); System.out.println( TestUtil.getMetaModelSourceAsString( Address.class ) ); @@ -41,7 +42,7 @@ public void test() { @Test @WithClasses(value = {Outer.Inner.class, Outer.Super.class}) @TestForIssue(jiraKey = "HHH-18829") - public void testInner() { + void testInner() { System.out.println( TestUtil.getMetaModelSourceAsString( Outer.class ) ); System.out.println( TestUtil.getMetaModelSourceAsString( Outer.Inner.class ) ); System.out.println( TestUtil.getMetaModelSourceAsString( Outer.Super.class ) ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh18858/ArrayTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh18858/ArrayTest.java index 9a6e1682ca07..79b3e9858b20 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh18858/ArrayTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh18858/ArrayTest.java @@ -9,7 +9,7 @@ import jakarta.persistence.metamodel.SingularAttribute; 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 org.junit.jupiter.api.Assertions; import java.lang.reflect.Field; @@ -24,11 +24,12 @@ /** * @author Emmanuel Bernard */ -public class ArrayTest extends CompilationTest { +@CompilationTest +class ArrayTest { @Test @WithClasses({Competitor.class, Contest.class}) - public void testOneToMany() throws NoSuchFieldException, IllegalAccessException { + void testOneToMany() throws NoSuchFieldException, IllegalAccessException { System.out.println( getMetaModelSourceAsString( Competitor.class ) ); assertValidMetamodelField( Competitor.class, "id" ); assertValidMetamodelField( Competitor.class, "name" ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/QueryMethodTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/QueryMethodTest.java index 899750f0b0c4..e4787149fe73 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/QueryMethodTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/QueryMethodTest.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 QueryMethodTest extends CompilationTest { +@CompilationTest +class QueryMethodTest { @Test @WithClasses({ Book.class, Publisher.class, Dao.class, Books.class }) - public void testQueryMethod() { + void testQueryMethod() { System.out.println( TestUtil.getMetaModelSourceAsString( Dao.class ) ); System.out.println( TestUtil.getMetaModelSourceAsString( Books.class ) ); assertMetamodelClassGeneratedFor( Book.class ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/ValidationTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/ValidationTest.java index ab3707699818..dd11782b7b6c 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/ValidationTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/ValidationTest.java @@ -8,17 +8,18 @@ import org.hibernate.processor.test.util.IgnoreCompilationErrors; 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.assertNoMetamodelClassGeneratedFor; /** * @author Gavin King */ -public class ValidationTest extends CompilationTest { +@CompilationTest +class ValidationTest { @Test @IgnoreCompilationErrors @WithClasses({ Book.class, Dao1.class }) - public void testError1() { + void testError1() { System.out.println( TestUtil.getMetaModelSourceAsString( Dao1.class ) ); assertNoMetamodelClassGeneratedFor( Book.class ); assertNoMetamodelClassGeneratedFor( Dao1.class ); @@ -26,7 +27,7 @@ public void testError1() { @Test @IgnoreCompilationErrors @WithClasses({ Book.class, Dao2.class }) - public void testError2() { + void testError2() { System.out.println( TestUtil.getMetaModelSourceAsString( Dao2.class ) ); assertNoMetamodelClassGeneratedFor( Book.class ); assertNoMetamodelClassGeneratedFor( Dao2.class ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/idclass/CompositeIdClassTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/idclass/CompositeIdClassTest.java index 776200f2cb9f..103c3edcea8a 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/idclass/CompositeIdClassTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/idclass/CompositeIdClassTest.java @@ -8,17 +8,18 @@ import org.hibernate.processor.test.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.assertPresenceOfNameFieldInMetamodelFor; import static org.hibernate.processor.test.util.TestUtil.getMetaModelSourceAsString; -public class CompositeIdClassTest extends CompilationTest { +@CompilationTest +class CompositeIdClassTest { @Test @WithClasses(MyEntity.class) - public void test() { + void test() { System.out.println( getMetaModelSourceAsString( MyEntity.class ) ); assertMetamodelClassGeneratedFor( MyEntity.class ); assertPresenceOfNameFieldInMetamodelFor( diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/includeexclude/IncludeExcludeTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/includeexclude/IncludeExcludeTest.java index c3a5c950162a..e66b201fe29a 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/includeexclude/IncludeExcludeTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/includeexclude/IncludeExcludeTest.java @@ -8,17 +8,18 @@ import org.hibernate.processor.test.util.CompilationTest; import org.hibernate.processor.test.util.WithClasses; import org.hibernate.processor.test.util.WithProcessorOption; -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; -public class IncludeExcludeTest extends CompilationTest { +@CompilationTest +class IncludeExcludeTest { @Test @WithClasses({ Foo.class, Bar.class, Baz.class }) @WithProcessorOption(key = HibernateProcessor.INCLUDE, value = "org.hibernate.processor.test.includeexclude.*") @WithProcessorOption(key = HibernateProcessor.EXCLUDE, value = "org.hibernate.processor.test.includeexclude.F*") - public void testQueryMethod() { + void testQueryMethod() { assertNoMetamodelClassGeneratedFor( Foo.class ); assertMetamodelClassGeneratedFor( Bar.class ); assertNoMetamodelClassGeneratedFor( Baz.class ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/InheritanceTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/InheritanceTest.java index 71bcbe3d869c..659593bb9837 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/InheritanceTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/InheritanceTest.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.assertAttributeTypeInMetaModelFor; import static org.hibernate.processor.test.util.TestUtil.assertPresenceOfFieldInMetamodelFor; @@ -16,7 +16,8 @@ * @author Emmanuel Bernard * @author Hardy Ferentschik */ -public class InheritanceTest extends CompilationTest { +@CompilationTest +class InheritanceTest { @Test @WithClasses({ AbstractEntity.class, @@ -27,7 +28,7 @@ public class InheritanceTest extends CompilationTest { Person.class, User.class }) - public void testInheritance() throws Exception { + void testInheritance() throws Exception { // entity inheritance assertSuperclassRelationshipInMetamodel( Customer.class, User.class ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/deep/DeepInheritanceTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/deep/DeepInheritanceTest.java index 3b1a893ae45a..922430838e14 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/deep/DeepInheritanceTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/deep/DeepInheritanceTest.java @@ -8,7 +8,7 @@ import org.hibernate.processor.test.util.TestForIssue; 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.assertAttributeTypeInMetaModelFor; import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor; @@ -20,11 +20,12 @@ * * @author Igor Vaynberg */ -public class DeepInheritanceTest extends CompilationTest { +@CompilationTest +class DeepInheritanceTest { @Test @TestForIssue(jiraKey = "METAGEN-69") @WithClasses({ JetPlane.class, PersistenceBase.class, Plane.class }) - public void testDeepInheritance() throws Exception { + void testDeepInheritance() throws Exception { assertMetamodelClassGeneratedFor( Plane.class ); assertMetamodelClassGeneratedFor( JetPlane.class ); assertPresenceOfFieldInMetamodelFor( JetPlane.class, "jets" ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/UnmappedClassInHierarchyTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/UnmappedClassInHierarchyTest.java index 1b90d963c6c6..0cfbd078517a 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/UnmappedClassInHierarchyTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/UnmappedClassInHierarchyTest.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.assertSuperclassRelationshipInMetamodel; @@ -14,7 +14,8 @@ * @author Emmanuel Bernard * @author Hardy Ferentschik */ -public class UnmappedClassInHierarchyTest extends CompilationTest { +@CompilationTest +class UnmappedClassInHierarchyTest { @Test @WithClasses({ BaseEntity.class, @@ -24,7 +25,7 @@ public class UnmappedClassInHierarchyTest extends CompilationTest { SubA.class, SubB.class }) - public void testUnmappedClassInHierarchy() throws Exception { + void testUnmappedClassInHierarchy() throws Exception { assertSuperclassRelationshipInMetamodel( SubA.class, BaseEntity.class ); assertSuperclassRelationshipInMetamodel( SubB.class, MappedBase.class ); } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/innerclass/InnerClassTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/innerclass/InnerClassTest.java index c1881c3fb189..c3eacf3d875d 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/innerclass/InnerClassTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/innerclass/InnerClassTest.java @@ -10,18 +10,19 @@ import org.hibernate.processor.test.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 ) ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/innerclass/InnerInterfaceTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/innerclass/InnerInterfaceTest.java index 37cb6f99558c..e9d7bf7c2c0f 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/innerclass/InnerInterfaceTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/innerclass/InnerInterfaceTest.java @@ -12,14 +12,15 @@ import org.hibernate.annotations.processing.HQL; 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; +@CompilationTest @WithClasses({InnerInterfaceTest.MyEntity.class, InnerInterfaceTest.Queries.class}) -public class InnerInterfaceTest extends CompilationTest { +class InnerInterfaceTest { @Entity public static class MyEntity { @@ -39,7 +40,7 @@ public interface Queries { @Test - public void test() { + void test() { System.out.println( getMetaModelSourceAsString( InnerInterfaceTest.MyEntity.class ) ); System.out.println( getMetaModelSourceAsString( InnerInterfaceTest.Queries.class ) ); assertMetamodelClassGeneratedFor( InnerInterfaceTest.MyEntity.class ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/keypage/KeyBasedTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/keypage/KeyBasedTest.java index fd3e24409d09..77bd03d759bf 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/keypage/KeyBasedTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/keypage/KeyBasedTest.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 KeyBasedTest extends CompilationTest { +@CompilationTest +class KeyBasedTest { @Test @WithClasses({ Book.class, Dao.class, Queries.class }) - public void testQueryMethod() { + void testQueryMethod() { System.out.println( TestUtil.getMetaModelSourceAsString( Dao.class ) ); System.out.println( TestUtil.getMetaModelSourceAsString( Queries.class ) ); assertMetamodelClassGeneratedFor( Book.class ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/map/MetamodelGeneratedTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/map/MetamodelGeneratedTest.java index f6e270505aba..0357bf85ad1e 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/map/MetamodelGeneratedTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/map/MetamodelGeneratedTest.java @@ -8,17 +8,18 @@ import org.hibernate.processor.test.util.TestForIssue; import org.hibernate.processor.test.util.WithClasses; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Assertions; import static org.hibernate.processor.test.util.TestUtil.getMetamodelClassFor; -public class MetamodelGeneratedTest extends CompilationTest { +@CompilationTest +class MetamodelGeneratedTest { @Test @WithClasses({ MapOfMapEntity.class }) @TestForIssue(jiraKey = " HHH-17514") - public void test() { + void test() { Class repositoryClass = getMetamodelClassFor( MapOfMapEntity.class ); Assertions.assertNotNull( repositoryClass ); } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/dao/DaoTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/dao/DaoTest.java index d6692a76e63e..96db3466ebca 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/dao/DaoTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/dao/DaoTest.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 DaoTest extends CompilationTest { +@CompilationTest +class DaoTest { @Test @WithClasses({ Parent.class, Child.class, Queries.class }) - public void testDao() { + void testDao() { System.out.println( TestUtil.getMetaModelSourceAsString( Queries.class ) ); System.out.println( TestUtil.getMetaModelSourceAsString( Parent.class ) ); System.out.println( TestUtil.getMetaModelSourceAsString( Child.class ) ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/embeddablemappedsuperclass/EmbeddableMappedSuperClassTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/embeddablemappedsuperclass/EmbeddableMappedSuperClassTest.java index 926566905aa1..8be64055d169 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/embeddablemappedsuperclass/EmbeddableMappedSuperClassTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/embeddablemappedsuperclass/EmbeddableMappedSuperClassTest.java @@ -8,19 +8,20 @@ import org.hibernate.processor.test.util.TestForIssue; 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 Hardy Ferentschik */ -public class EmbeddableMappedSuperClassTest extends CompilationTest { +@CompilationTest +class EmbeddableMappedSuperClassTest { @Test @TestForIssue(jiraKey = "METAGEN-36") @WithClasses(EmbeddableAndMappedSuperClass.class) - public void testMetaModelsGenerated() { + void testMetaModelsGenerated() { assertMetamodelClassGeneratedFor( EmbeddableAndMappedSuperClass.class ); } } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/mappedsuperclasswithoutid/MappedSuperclassWithoutExplicitIdTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/mappedsuperclasswithoutid/MappedSuperclassWithoutExplicitIdTest.java index 6dea9679522d..a0d0def0f5e6 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/mappedsuperclasswithoutid/MappedSuperclassWithoutExplicitIdTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/mappedsuperclasswithoutid/MappedSuperclassWithoutExplicitIdTest.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.assertPresenceOfFieldInMetamodelFor; @@ -14,10 +14,11 @@ /** * @author Hardy Ferentschik */ -public class MappedSuperclassWithoutExplicitIdTest extends CompilationTest { +@CompilationTest +class MappedSuperclassWithoutExplicitIdTest { @Test @WithClasses({ ConcreteProduct.class, Product.class, Shop.class }) - public void testRightAccessTypeForMappedSuperclass() { + void testRightAccessTypeForMappedSuperclass() { assertMetamodelClassGeneratedFor( ConcreteProduct.class ); assertMetamodelClassGeneratedFor( Product.class ); assertMetamodelClassGeneratedFor( Shop.class ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/typedmappedsuperclass/TypesMappedSuperclassTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/typedmappedsuperclass/TypesMappedSuperclassTest.java index 1f3f32278d1f..ccd40573d6db 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/typedmappedsuperclass/TypesMappedSuperclassTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/typedmappedsuperclass/TypesMappedSuperclassTest.java @@ -7,15 +7,16 @@ import org.hibernate.processor.test.util.CompilationTest; import org.hibernate.processor.test.util.TestForIssue; 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 Hardy Ferentschik */ +@CompilationTest @TestForIssue(jiraKey = "METAGEN-37") -public class TypesMappedSuperclassTest extends CompilationTest { +class TypesMappedSuperclassTest { @Test @WithClasses({ AttachmentGroup.class, @@ -25,7 +26,7 @@ public class TypesMappedSuperclassTest extends CompilationTest { Post.class, UserRole.class }) - public void testExtractClosestRealType() { + void testExtractClosestRealType() { assertMetamodelClassGeneratedFor( AttachmentGroup.class ); } } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/MixedConfigurationTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/MixedConfigurationTest.java index 3aa9526e5c8d..f8c15a0d3110 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/MixedConfigurationTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/MixedConfigurationTest.java @@ -7,7 +7,7 @@ import org.hibernate.processor.test.util.CompilationTest; import org.hibernate.processor.test.util.WithClasses; import org.hibernate.processor.test.util.WithMappingFiles; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hibernate.processor.test.util.TestUtil.assertAbsenceOfFieldInMetamodelFor; import static org.hibernate.processor.test.util.TestUtil.assertAttributeTypeInMetaModelFor; @@ -17,11 +17,12 @@ /** * @author Hardy Ferentschik */ -public class MixedConfigurationTest extends CompilationTest { +@CompilationTest +class MixedConfigurationTest { @Test @WithClasses({ Car.class, Vehicle.class }) @WithMappingFiles("car.xml") - public void testDefaultAccessTypeApplied() { + void testDefaultAccessTypeApplied() { assertMetamodelClassGeneratedFor( Vehicle.class ); assertMetamodelClassGeneratedFor( Car.class ); @@ -33,7 +34,7 @@ public void testDefaultAccessTypeApplied() { @Test @WithClasses({ Truck.class, Vehicle.class }) @WithMappingFiles("truck.xml") - public void testExplicitXmlConfiguredAccessTypeApplied() { + void testExplicitXmlConfiguredAccessTypeApplied() { assertMetamodelClassGeneratedFor( Vehicle.class ); assertMetamodelClassGeneratedFor( Truck.class ); @@ -46,7 +47,7 @@ public void testExplicitXmlConfiguredAccessTypeApplied() { @Test @WithClasses({ Car.class, Vehicle.class, RentalCar.class, RentalCompany.class }) @WithMappingFiles({ "car.xml", "rentalcar.xml" }) - public void testMixedConfiguration() { + void testMixedConfiguration() { assertMetamodelClassGeneratedFor( RentalCar.class ); assertMetamodelClassGeneratedFor( RentalCompany.class ); @@ -64,7 +65,7 @@ public void testMixedConfiguration() { @Test @WithClasses({ Coordinates.class, ZeroCoordinates.class, Location.class }) @WithMappingFiles("coordinates.xml") - public void testAccessTypeForXmlConfiguredEmbeddables() { + void testAccessTypeForXmlConfiguredEmbeddables() { assertMetamodelClassGeneratedFor( Coordinates.class ); assertPresenceOfFieldInMetamodelFor( Coordinates.class, "longitude", "field exists and should be in metamodel" diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/XmlMetaCompleteTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/XmlMetaCompleteTest.java index 849553e9e8cb..85f0390a4fd5 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/XmlMetaCompleteTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/XmlMetaCompleteTest.java @@ -7,7 +7,7 @@ import org.hibernate.processor.test.util.CompilationTest; import org.hibernate.processor.test.util.WithClasses; import org.hibernate.processor.test.util.WithMappingFiles; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hibernate.processor.test.util.TestUtil.assertAbsenceOfFieldInMetamodelFor; import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor; @@ -15,11 +15,12 @@ /** * @author Hardy Ferentschik */ -public class XmlMetaCompleteTest extends CompilationTest { +@CompilationTest +class XmlMetaCompleteTest { @Test @WithClasses(Person.class) @WithMappingFiles("orm.xml") - public void testXmlConfiguredEmbeddedClassGenerated() { + void testXmlConfiguredEmbeddedClassGenerated() { assertMetamodelClassGeneratedFor( Person.class ); assertAbsenceOfFieldInMetamodelFor( Person.class, "name" ); } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedentity/NamedEntityTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedentity/NamedEntityTest.java index b56d4d5a402f..a744ce3bc9ea 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedentity/NamedEntityTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedentity/NamedEntityTest.java @@ -7,7 +7,7 @@ import jakarta.persistence.TypedQueryReference; 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.Field; import java.lang.reflect.ParameterizedType; @@ -17,14 +17,15 @@ import static org.hibernate.processor.test.util.TestUtil.assertPresenceOfFieldInMetamodelFor; import static org.hibernate.processor.test.util.TestUtil.getFieldFromMetamodelFor; import static org.hibernate.processor.test.util.TestUtil.getMetaModelSourceAsString; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; -public class NamedEntityTest extends CompilationTest { +@CompilationTest +class NamedEntityTest { @Test @WithClasses(Book.class) - public void test() { + void test() { System.out.println( getMetaModelSourceAsString( Book.class ) ); assertMetamodelClassGeneratedFor( Book.class ); @@ -33,7 +34,7 @@ public void test() { final Field field = getFieldFromMetamodelFor( Book.class, "_findAllBooks_" ); assertEquals( TypedQueryReference.class, field.getType() ); final Type genericType = field.getGenericType(); - assertTrue( genericType instanceof ParameterizedType ); + assertInstanceOf( ParameterizedType.class, genericType ); final ParameterizedType parameterizedType = (ParameterizedType) genericType; assertEquals( Book.class, parameterizedType.getActualTypeArguments()[0] ); } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedquery/AuxiliaryTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedquery/AuxiliaryTest.java index ba124475af83..c031fd4baaed 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedquery/AuxiliaryTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedquery/AuxiliaryTest.java @@ -9,7 +9,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 java.lang.reflect.ParameterizedType; @@ -23,10 +23,11 @@ /** * @author Gavin King */ -public class AuxiliaryTest extends CompilationTest { +@CompilationTest +class AuxiliaryTest { @Test @WithClasses({ Book.class, Main.class }) - public void test() { + void test() { System.out.println( TestUtil.getMetaModelSourceAsString( Main.class ) ); System.out.println( TestUtil.getMetaModelSourceAsString( Book.class ) ); assertMetamodelClassGeneratedFor( Book.class ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/noentity/NoEntityTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/noentity/NoEntityTest.java index 5b287e6f6f81..cb7ff4212dec 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/noentity/NoEntityTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/noentity/NoEntityTest.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 NoEntityTest extends CompilationTest { +@CompilationTest +class NoEntityTest { @Test @WithClasses({ Dao.class }) - public void testGeneratedAnnotationNotGenerated() { + void testGeneratedAnnotationNotGenerated() { System.out.println( TestUtil.getMetaModelSourceAsString( Dao.class ) ); assertMetamodelClassGeneratedFor( Dao.class ); } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/packageinfo/PackageInfoMetamodelTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/packageinfo/PackageInfoMetamodelTest.java index 7a2ead5ad9fa..bdacb80a76fa 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/packageinfo/PackageInfoMetamodelTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/packageinfo/PackageInfoMetamodelTest.java @@ -7,7 +7,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 jakarta.persistence.EntityManager; @@ -16,14 +16,15 @@ import static org.hibernate.processor.test.util.TestUtil.assertPresenceOfMethodInMetamodelFor; import static org.hibernate.processor.test.util.TestUtil.getMetaModelSourceAsString; -public class PackageInfoMetamodelTest extends CompilationTest { +@CompilationTest +class PackageInfoMetamodelTest { @Test @WithClasses(value = {}, sources = { "org.hibernate.processor.test.packageinfo.Message", "org.hibernate.processor.test.packageinfo.package-info" }) - public void test() { + void test() { assertMetamodelClassGeneratedFor( "org.hibernate.processor.test.packageinfo.Message" ); System.out.println( getMetaModelSourceAsString( "org.hibernate.processor.test.packageinfo.packageinfo" ) ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/persistence21/Jpa21DescriptorTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/persistence21/Jpa21DescriptorTest.java index 3f5235347ef9..cc42a05791ec 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/persistence21/Jpa21DescriptorTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/persistence21/Jpa21DescriptorTest.java @@ -9,7 +9,7 @@ import org.hibernate.processor.test.util.TestForIssue; import org.hibernate.processor.test.util.WithClasses; import org.hibernate.processor.test.util.WithProcessorOption; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor; @@ -18,14 +18,15 @@ * * @author Hardy Ferentschik */ -public class Jpa21DescriptorTest extends CompilationTest { +@CompilationTest +class Jpa21DescriptorTest { @Test @TestForIssue(jiraKey = "METAGEN-92") @WithClasses(Snafu.class) @WithProcessorOption(key = HibernateProcessor.PERSISTENCE_XML_OPTION, value = "org/hibernate/processor/test/persistence21/persistence.xml") - public void testMetaModelGeneratedForXmlConfiguredEntity() { + void testMetaModelGeneratedForXmlConfiguredEntity() { assertMetamodelClassGeneratedFor( Snafu.class ); } } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/rawtypes/RawTypesTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/rawtypes/RawTypesTest.java index e35baac23400..0b77e9c05c50 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/rawtypes/RawTypesTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/rawtypes/RawTypesTest.java @@ -7,18 +7,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; /** * @author Emmanuel Bernard */ -public class RawTypesTest extends CompilationTest { +@CompilationTest +class RawTypesTest { @Test @WithClasses({ DeskWithRawType.class, EmployeeWithRawType.class }) - public void testGenerics() { + void testGenerics() { assertMetamodelClassGeneratedFor( DeskWithRawType.class ); assertMetamodelClassGeneratedFor( EmployeeWithRawType.class ); } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/records/Java14RecordsTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/records/Java14RecordsTest.java index b074021ad6d8..4216b2ec9c00 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/records/Java14RecordsTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/records/Java14RecordsTest.java @@ -8,7 +8,7 @@ import org.hibernate.processor.test.util.CompilationTest; import org.hibernate.processor.test.util.TestForIssue; import org.hibernate.processor.test.util.WithClasses; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.lang.reflect.Field; import java.lang.reflect.ParameterizedType; @@ -18,25 +18,26 @@ import static java.lang.reflect.Modifier.isStatic; import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor; import static org.hibernate.processor.test.util.TestUtil.getFieldFromMetamodelFor; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; -public class Java14RecordsTest extends CompilationTest { +@CompilationTest +class Java14RecordsTest { @Test @TestForIssue(jiraKey = "HHH-16261") @WithClasses({Address.class, Author.class}) - public void testEmbeddableRecordProperty() { + void testEmbeddableRecordProperty() { assertMetamodelClassGeneratedFor(Address.class); for (final String fieldName : List.of("street", "city", "postalCode")) { - assertNotNull("Address must contain '" + fieldName + "' field", getFieldFromMetamodelFor(Address.class, fieldName)); + assertNotNull(getFieldFromMetamodelFor(Address.class, fieldName),"Address must contain '" + fieldName + "' field"); } assertMetamodelClassGeneratedFor(Author.class); final Field addressField = getFieldFromMetamodelFor(Author.class, "address"); - assertNotNull("Author must contain 'address' field", addressField); + assertNotNull(addressField, "Author must contain 'address' field"); assertTrue(isStatic(addressField.getModifiers())); if (addressField.getGenericType() instanceof ParameterizedType parameterizedType) { assertEquals(SingularAttribute.class, parameterizedType.getRawType()); @@ -49,7 +50,7 @@ public void testEmbeddableRecordProperty() { } final Field addressNameField = getFieldFromMetamodelFor(Author.class, "address".toUpperCase()); - assertNotNull("Author must contain 'ADDRESS' field", addressNameField); + assertNotNull(addressNameField, "Author must contain 'ADDRESS' field"); assertTrue(isStatic(addressNameField.getModifiers())); assertEquals(String.class, addressNameField.getGenericType()); } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/restriction/RestrictionTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/restriction/RestrictionTest.java index 62b877f267e7..89a095677963 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/restriction/RestrictionTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/restriction/RestrictionTest.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 RestrictionTest extends CompilationTest { +@CompilationTest +class RestrictionTest { @Test @WithClasses({Book.class, Bookshelf.class}) - public void testRestriction() { + void testRestriction() { System.out.println( getMetaModelSourceAsString( Bookshelf.class ) ); assertMetamodelClassGeneratedFor( Book.class ); assertMetamodelClassGeneratedFor( Bookshelf.class ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/resultclass/ResultClassTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/resultclass/ResultClassTest.java index 20ac819f80dc..f9444845b9a4 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/resultclass/ResultClassTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/resultclass/ResultClassTest.java @@ -8,7 +8,7 @@ import org.assertj.core.api.Assertions; 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; @@ -20,10 +20,11 @@ import static org.hibernate.processor.test.util.TestUtil.getMethodFromMetamodelFor; import static org.junit.jupiter.api.Assertions.assertEquals; -public class ResultClassTest extends CompilationTest { +@CompilationTest +class ResultClassTest { @Test @WithClasses({Post.class, NameValue.class}) - public void test() { + void test() { System.out.println( getMetaModelSourceAsString( Post.class ) ); assertMetamodelClassGeneratedFor( Post.class ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/separatecompilationunits/SeparateCompilationUnitsTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/separatecompilationunits/SeparateCompilationUnitsTest.java index ba6edf6f5d7e..5dcdf9202a11 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/separatecompilationunits/SeparateCompilationUnitsTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/separatecompilationunits/SeparateCompilationUnitsTest.java @@ -9,20 +9,21 @@ import org.hibernate.processor.test.util.IgnoreCompilationErrors; import org.hibernate.processor.test.util.TestForIssue; 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.getMetaModelSourceAsString; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Hardy Ferentschik */ +@CompilationTest @TestForIssue(jiraKey = "METAGEN-35") -public class SeparateCompilationUnitsTest extends CompilationTest { +class SeparateCompilationUnitsTest { @Test @WithClasses(value = Entity.class, preCompile = MappedSuperclass.class) @IgnoreCompilationErrors - public void testInheritance() throws Exception { + void testInheritance() throws Exception { // need to work with the source file. Entity_.class won't get generated, because the mapped superclass // will not be on the classpath String entityMetaModel = getMetaModelSourceAsString( Entity.class ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/sortedcollection/SortedCollectionTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/sortedcollection/SortedCollectionTest.java index 34017abecc6c..cc720d382834 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/sortedcollection/SortedCollectionTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/sortedcollection/SortedCollectionTest.java @@ -7,7 +7,7 @@ import org.hibernate.processor.test.util.CompilationTest; import org.hibernate.processor.test.util.TestForIssue; 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.assertPresenceOfFieldInMetamodelFor; @@ -15,12 +15,13 @@ /** * @author Hardy Ferentschik */ -public class SortedCollectionTest extends CompilationTest { +@CompilationTest +class SortedCollectionTest { @Test @TestForIssue(jiraKey = "METAGEN-62") @WithClasses({ Printer.class, PrintJob.class }) - public void testGenerics() { + void testGenerics() { assertMetamodelClassGeneratedFor( Printer.class ); assertMetamodelClassGeneratedFor( PrintJob.class ); assertPresenceOfFieldInMetamodelFor( Printer.class, "printQueue", "There sorted set attribute is missing" ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/SuperDaoTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/SuperDaoTest.java index e3c2a6912b5a..9b964898be19 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/SuperDaoTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/SuperDaoTest.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 SuperDaoTest extends CompilationTest { +@CompilationTest +class SuperDaoTest { @Test @WithClasses({ Book.class, SuperDao.class, Dao.class }) - public void testQueryMethod() { + void testQueryMethod() { // System.out.println( TestUtil.getMetaModelSourceAsString( SuperDao.class ) ); System.out.println( TestUtil.getMetaModelSourceAsString( Dao.class ) ); assertMetamodelClassGeneratedFor( Book.class ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/generic/SuperDaoTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/generic/SuperDaoTest.java index 031992d2df5a..db22f4a1b500 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/generic/SuperDaoTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/generic/SuperDaoTest.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 SuperDaoTest extends CompilationTest { +@CompilationTest +class SuperDaoTest { @Test @WithClasses({ Book.class, SuperDao.class, Dao.class }) - public void testQueryMethod() { + void testQueryMethod() { System.out.println( TestUtil.getMetaModelSourceAsString( SuperDao.class ) ); System.out.println( TestUtil.getMetaModelSourceAsString( Dao.class ) ); assertMetamodelClassGeneratedFor( Book.class ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/supresswarnings/SuppressExplicitWarningsAnnotationGeneratedTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/supresswarnings/SuppressExplicitWarningsAnnotationGeneratedTest.java index d140147a32b1..0ec82711acc7 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/supresswarnings/SuppressExplicitWarningsAnnotationGeneratedTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/supresswarnings/SuppressExplicitWarningsAnnotationGeneratedTest.java @@ -8,27 +8,28 @@ import org.hibernate.processor.test.util.CompilationTest; import org.hibernate.processor.test.util.WithClasses; import org.hibernate.processor.test.util.WithProcessorOption; -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; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Hardy Ferentschik */ -public class SuppressExplicitWarningsAnnotationGeneratedTest extends CompilationTest { +@CompilationTest +class SuppressExplicitWarningsAnnotationGeneratedTest { @Test @WithClasses(TestEntity.class) @WithProcessorOption(key = HibernateProcessor.ADD_SUPPRESS_WARNINGS_ANNOTATION, value = "foo, bar") - public void testSuppressedWarningsAnnotationGenerated() { + void testSuppressedWarningsAnnotationGenerated() { assertMetamodelClassGeneratedFor( TestEntity.class ); // need to check the source because @SuppressWarnings is not a runtime annotation String metaModelSource = getMetaModelSourceAsString( TestEntity.class ); assertTrue( - "@SuppressWarnings should be added to the metamodel.", - metaModelSource.contains( "@SuppressWarnings({\"foo\", \"bar\"})" ) + metaModelSource.contains( "@SuppressWarnings({\"foo\", \"bar\"})" ), + "@SuppressWarnings should be added to the metamodel." ); } } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/supresswarnings/SuppressWarningsAnnotationGeneratedTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/supresswarnings/SuppressWarningsAnnotationGeneratedTest.java index 4f57e42f5106..4c1703772f34 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/supresswarnings/SuppressWarningsAnnotationGeneratedTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/supresswarnings/SuppressWarningsAnnotationGeneratedTest.java @@ -9,28 +9,29 @@ import org.hibernate.processor.test.util.TestForIssue; import org.hibernate.processor.test.util.WithClasses; import org.hibernate.processor.test.util.WithProcessorOption; -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; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Hardy Ferentschik */ -public class SuppressWarningsAnnotationGeneratedTest extends CompilationTest { +@CompilationTest +class SuppressWarningsAnnotationGeneratedTest { @Test @TestForIssue(jiraKey = "METAGEN-50") @WithClasses(TestEntity.class) @WithProcessorOption(key = HibernateProcessor.ADD_SUPPRESS_WARNINGS_ANNOTATION, value = "true") - public void testSuppressedWarningsAnnotationGenerated() { + void testSuppressedWarningsAnnotationGenerated() { assertMetamodelClassGeneratedFor( TestEntity.class ); // need to check the source because @SuppressWarnings is not a runtime annotation String metaModelSource = getMetaModelSourceAsString( TestEntity.class ); assertTrue( - "@SuppressWarnings should be added to the metamodel.", - metaModelSource.contains( "@SuppressWarnings({\"deprecation\", \"rawtypes\"})" ) + metaModelSource.contains( "@SuppressWarnings({\"deprecation\", \"rawtypes\"})" ), + "@SuppressWarnings should be added to the metamodel." ); } } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/supresswarnings/SuppressWarningsAnnotationNotGeneratedTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/supresswarnings/SuppressWarningsAnnotationNotGeneratedTest.java index 0cdf72349037..41c1f0e1ccd8 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/supresswarnings/SuppressWarningsAnnotationNotGeneratedTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/supresswarnings/SuppressWarningsAnnotationNotGeneratedTest.java @@ -7,28 +7,29 @@ import org.hibernate.processor.test.util.CompilationTest; import org.hibernate.processor.test.util.TestForIssue; 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; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; /** * @author Hardy Ferentschik */ -public class SuppressWarningsAnnotationNotGeneratedTest extends CompilationTest { +@CompilationTest +class SuppressWarningsAnnotationNotGeneratedTest { @Test @TestForIssue(jiraKey = "METAGEN-50") @WithClasses(TestEntity.class) - public void testSuppressedWarningsAnnotationNotGenerated() { + void testSuppressedWarningsAnnotationNotGenerated() { assertMetamodelClassGeneratedFor( TestEntity.class ); // need to check the source because @SuppressWarnings is not a runtime annotation String metaModelSource = getMetaModelSourceAsString( TestEntity.class ); assertFalse( - "@SuppressWarnings should not be added to the metamodel.", - metaModelSource.contains( "@SuppressWarnings(\"all\")" ) + metaModelSource.contains( "@SuppressWarnings(\"all\")" ), + "@SuppressWarnings should not be added to the metamodel." ); } } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/targetannotation/TargetAnnotationTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/targetannotation/TargetAnnotationTest.java index 9dfc10bb4a29..721799aa53c8 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/targetannotation/TargetAnnotationTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/targetannotation/TargetAnnotationTest.java @@ -7,7 +7,7 @@ import org.hibernate.processor.test.util.CompilationTest; import org.hibernate.processor.test.util.TestForIssue; 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.assertAttributeTypeInMetaModelFor; import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor; @@ -16,12 +16,13 @@ /** * @author Hardy Ferentschik */ -public class TargetAnnotationTest extends CompilationTest { +@CompilationTest +class TargetAnnotationTest { @Test @TestForIssue(jiraKey = "METAGEN-30") @WithClasses({ Address.class, AddressImpl.class, House.class }) - public void testEmbeddableWithTargetAnnotation() { + void testEmbeddableWithTargetAnnotation() { assertMetamodelClassGeneratedFor( House.class ); assertPresenceOfFieldInMetamodelFor( House.class, "address", "the metamodel should have a member 'address'" ); assertAttributeTypeInMetaModelFor( diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/typeliteral/TypeLiteralTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/typeliteral/TypeLiteralTest.java index 7e99b5687097..dd2ed7051442 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/typeliteral/TypeLiteralTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/typeliteral/TypeLiteralTest.java @@ -8,7 +8,7 @@ import org.hibernate.processor.test.util.TestForIssue; import org.hibernate.processor.test.util.WithClasses; -import org.junit.Test; +import org.junit.jupiter.api.Test; import jakarta.persistence.EntityManager; @@ -17,7 +17,8 @@ import static org.hibernate.processor.test.util.TestUtil.assertPresenceOfMethodInMetamodelFor; import static org.hibernate.processor.test.util.TestUtil.getMetaModelSourceAsString; -public class TypeLiteralTest extends CompilationTest { +@CompilationTest +class TypeLiteralTest { @Test @WithClasses(value = {}, @@ -27,7 +28,7 @@ public class TypeLiteralTest extends CompilationTest { "org.hibernate.processor.test.typeliteral.DebitAccount" }) @TestForIssue(jiraKey = "HHH-18358") - public void inheritance() { + void inheritance() { final var entityClass = "org.hibernate.processor.test.typeliteral.Account"; System.out.println( getMetaModelSourceAsString( entityClass ) ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/uppercase/UppercaseTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/uppercase/UppercaseTest.java index e1dce79d5386..7ea4a81f2fda 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/uppercase/UppercaseTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/uppercase/UppercaseTest.java @@ -6,17 +6,18 @@ 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.assertPresenceOfFieldInMetamodelFor; import static org.hibernate.processor.test.util.TestUtil.getMetaModelSourceAsString; -public class UppercaseTest extends CompilationTest { +@CompilationTest +class UppercaseTest { @Test @WithClasses(value = Person.class) - public void test() { + void test() { System.out.println( getMetaModelSourceAsString( Person.class ) ); assertMetamodelClassGeneratedFor( Person.class ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/usertype/UserTypeTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/usertype/UserTypeTest.java index ec8dce656c71..1c2f311ae9e1 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/usertype/UserTypeTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/usertype/UserTypeTest.java @@ -7,7 +7,7 @@ import org.hibernate.processor.test.util.CompilationTest; import org.hibernate.processor.test.util.TestForIssue; 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.assertPresenceOfFieldInMetamodelFor; @@ -15,11 +15,12 @@ /** * @author Hardy Ferentschik */ +@CompilationTest @TestForIssue(jiraKey = "METAGEN-28") -public class UserTypeTest extends CompilationTest { +class UserTypeTest { @Test @WithClasses({ ContactDetails.class, PhoneNumber.class }) - public void testCustomUserTypeInMetaModel() { + void testCustomUserTypeInMetaModel() { assertMetamodelClassGeneratedFor( ContactDetails.class ); assertPresenceOfFieldInMetamodelFor( ContactDetails.class, "phoneNumber", "@Type annotated field should be in metamodel" diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationExtension.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationExtension.java new file mode 100644 index 000000000000..ded3c24c3ba1 --- /dev/null +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationExtension.java @@ -0,0 +1,275 @@ +/* + * SPDX-License-Identifier: Apache-2.0 + * Copyright Red Hat Inc. and Hibernate Authors + */ +package org.hibernate.processor.test.util; + +import org.hibernate.processor.HibernateProcessor; +import org.jboss.logging.Logger; +import org.junit.jupiter.api.extension.AfterEachCallback; +import org.junit.jupiter.api.extension.BeforeEachCallback; +import org.junit.jupiter.api.extension.Extension; +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.jupiter.api.extension.TestInstanceFactoryContext; +import org.junit.jupiter.api.extension.TestInstancePreConstructCallback; + +import javax.tools.Diagnostic; +import javax.tools.DiagnosticCollector; +import javax.tools.JavaCompiler; +import javax.tools.JavaFileObject; +import javax.tools.StandardJavaFileManager; +import javax.tools.ToolProvider; +import java.io.File; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class CompilationExtension + implements Extension, BeforeEachCallback, AfterEachCallback, TestInstancePreConstructCallback { + + private static final Logger log = Logger.getLogger( CompilationExtension.class ); + private static final String PACKAGE_SEPARATOR = "."; + private static final String ANNOTATION_PROCESSOR_OPTION_PREFIX = "-A"; + private static final String COMPILATION_TEST_INFO = "CompilationTestInfo"; + + @Override + public void beforeEach(ExtensionContext context) throws Exception { + CompilationTestInfo compilationTestInfo = getCompilationTestInfo( context ) + .forMethod( context.getRequiredTestMethod() ); + if ( compilationTestInfo.annotationProcessorNeedsToRun() ) { + final List> compilationDiagnostics = new ArrayList<>(); + // some test needs to compile some classes prior to the actual classes under test + if ( !compilationTestInfo.preCompileEntities.isEmpty() ) { + compile( getCompilationUnits( compilationTestInfo.preCompileEntities, null, compilationTestInfo ), compilationDiagnostics, compilationTestInfo ); + } + + // now we compile the actual test classes + compile( getCompilationUnits( compilationTestInfo.testEntities, compilationTestInfo.sources, + compilationTestInfo ), compilationDiagnostics, compilationTestInfo ); + + if ( !compilationTestInfo.ignoreCompilationErrors ) { + TestUtil.assertNoCompilationError( compilationDiagnostics ); + } + } + } + + @Override + public void afterEach(ExtensionContext context) { + context.getTestClass().ifPresent( TestUtil::deleteProcessorGeneratedFiles ); + } + + @Override + public void preConstructTestInstance(TestInstanceFactoryContext factoryContext, ExtensionContext context) { + Class testClass = factoryContext.getTestClass(); + + var store = context.getStore( ExtensionContext.StoreScope.EXTENSION_CONTEXT, + ExtensionContext.Namespace.create( testClass ) ); + + store.put( COMPILATION_TEST_INFO, new CompilationTestInfo( testClass ) ); + } + + private CompilationTestInfo getCompilationTestInfo(ExtensionContext context) { + var store = context.getStore( ExtensionContext.StoreScope.EXTENSION_CONTEXT, + ExtensionContext.Namespace.create( context.getRequiredTestClass() ) ); + + return store.get( COMPILATION_TEST_INFO, CompilationTestInfo.class ); + } + + private List getCompilationUnits(List> classesToCompile, List sources, CompilationTestInfo compilationTestInfo) { + List javaFiles = new ArrayList(); + for ( Class testClass : classesToCompile ) { + String pathToSource = getPathToSource( testClass ); + javaFiles.add( new File( pathToSource ) ); + } + if ( sources != null ) { + final var resourcesBaseDir = TestUtil.getResourcesBaseDir( compilationTestInfo.testClass ); + for ( String source : sources ) { + javaFiles.add( + new File( resourcesBaseDir, + source.replace( PACKAGE_SEPARATOR, File.separator ) + ".java" ) ); + } + + } + return javaFiles; + } + + private String getPathToSource(Class testClass) { + if ( testClass.isMemberClass() ) { + return getPathToSource( testClass.getDeclaringClass() ); + } + return TestUtil.getSourceBaseDir( testClass ).getAbsolutePath() + File.separator + testClass.getName() + .replace( PACKAGE_SEPARATOR, File.separator ) + ".java"; + } + + private void compile(List sourceFiles, List> compilationDiagnostics, CompilationTestInfo compilationTestInfo) throws Exception { + List options = createJavaOptions(compilationTestInfo); + + JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); + DiagnosticCollector diagnostics = new DiagnosticCollector(); + StandardJavaFileManager fileManager = compiler.getStandardFileManager( diagnostics, null, null ); + Iterable compilationUnits = fileManager.getJavaFileObjectsFromFiles( + sourceFiles + ); + + compileSources( options, compiler, diagnostics, fileManager, compilationUnits ); + compilationDiagnostics.addAll( diagnostics.getDiagnostics() ); + fileManager.close(); + } + + private List createJavaOptions(CompilationTestInfo compilationTestInfo) { + List options = new ArrayList<>(); + options.add( "-d" ); + options.add( TestUtil.getOutBaseDir( compilationTestInfo.testClass ).getAbsolutePath() ); + options.add( "-processor" ); + options.add( HibernateProcessor.class.getName() ); + + // pass orm files if specified + if ( !compilationTestInfo.mappingFiles.isEmpty() ) { + StringBuilder builder = new StringBuilder(); + builder.append( ANNOTATION_PROCESSOR_OPTION_PREFIX ); + builder.append( HibernateProcessor.ORM_XML_OPTION ); + builder.append( "=" ); + for ( String ormFile : compilationTestInfo.mappingFiles ) { + builder.append( ormFile ); + builder.append( "," ); + } + builder.deleteCharAt( builder.length() - 1 ); + options.add( builder.toString() ); + } + + // add any additional options specified by the test + for ( Map.Entry entry : compilationTestInfo.processorOptions.entrySet() ) { + StringBuilder builder = new StringBuilder(); + builder.append( ANNOTATION_PROCESSOR_OPTION_PREFIX ); + builder.append( entry.getKey() ); + builder.append( "=" ); + builder.append( entry.getValue() ); + options.add( builder.toString() ); + } + return options; + } + + private void compileSources(List options, + JavaCompiler compiler, + DiagnosticCollector diagnostics, + StandardJavaFileManager fileManager, + Iterable compilationUnits) { + JavaCompiler.CompilationTask task = compiler.getTask( + null, fileManager, diagnostics, options, null, compilationUnits + ); + task.call(); + for ( Diagnostic diagnostic : diagnostics.getDiagnostics() ) { + log.debug( diagnostic.getMessage( null ) ); + } + } + + private static class CompilationTestInfo { + private final Class testClass; + private final List> testEntities; + private final List> preCompileEntities; + private final List sources; + private final List mappingFiles; + private final Map processorOptions; + private final String packageName; + private final boolean ignoreCompilationErrors; + + private CompilationTestInfo(Class testClass, List> testEntities, List> preCompileEntities, List sources, List mappingFiles, Map processorOptions, String packageName, boolean ignoreCompilationErrors) { + this.testClass = testClass; + this.testEntities = testEntities; + this.preCompileEntities = preCompileEntities; + this.sources = sources; + this.mappingFiles = mappingFiles; + this.processorOptions = processorOptions; + this.packageName = packageName; + this.ignoreCompilationErrors = ignoreCompilationErrors; + } + + private CompilationTestInfo(Class testClass) { + this.testClass = testClass; + this.testEntities = new ArrayList<>(); + this.preCompileEntities = new ArrayList<>(); + this.sources = new ArrayList<>(); + this.mappingFiles = new ArrayList<>(); + this.processorOptions = new HashMap<>(); + Package pkg = testClass.getPackage(); + this.packageName = pkg != null ? pkg.getName() : null; + + processWithClasses( testClass.getAnnotation( WithClasses.class ) ); + processWithMappingFiles( testClass.getAnnotation( WithMappingFiles.class ) ); + processOptions( + testClass.getAnnotation( WithProcessorOption.class ), + testClass.getAnnotation( WithProcessorOption.List.class ) + ); + + ignoreCompilationErrors = testClass.getAnnotation( IgnoreCompilationErrors.class ) != null; + } + + protected CompilationTestInfo forMethod(Method method) { + + CompilationTestInfo copy = new CompilationTestInfo( + testClass, + new ArrayList<>( testEntities ), + new ArrayList<>( preCompileEntities ), + new ArrayList<>( sources ), + new ArrayList<>( mappingFiles ), + new HashMap<>( processorOptions ), + packageName, + // overrides potential class level configuration + ignoreCompilationErrors || method.getAnnotation( IgnoreCompilationErrors.class ) != null + ); + copy.processAnnotations( method ); + + return copy; + } + + private void processAnnotations(Method method) { + // configuration will be added to potential class level configuration + processWithClasses( method.getAnnotation( WithClasses.class ) ); + processWithMappingFiles( method.getAnnotation( WithMappingFiles.class ) ); + processOptions( + method.getAnnotation( WithProcessorOption.class ), + method.getAnnotation( WithProcessorOption.List.class ) + ); + } + + private void processWithClasses(WithClasses withClasses) { + if ( withClasses != null ) { + Collections.addAll( testEntities, withClasses.value() ); + Collections.addAll( preCompileEntities, withClasses.preCompile() ); + Collections.addAll( sources, withClasses.sources() ); + } + } + + private void processWithMappingFiles(WithMappingFiles withMappingFiles) { + if ( withMappingFiles != null ) { + String packageNameAsPath = TestUtil.fcnToPath( packageName ); + for ( String mappingFile : withMappingFiles.value() ) { + mappingFiles.add( packageNameAsPath + TestUtil.RESOURCE_SEPARATOR + mappingFile ); + } + } + } + + private void processOptions(WithProcessorOption withProcessorOption, + WithProcessorOption.List withProcessorOptionsListAnnotation) { + addOptions( withProcessorOption ); + if ( withProcessorOptionsListAnnotation != null ) { + for ( WithProcessorOption option : withProcessorOptionsListAnnotation.value() ) { + addOptions( option ); + } + } + } + + private void addOptions(WithProcessorOption withProcessorOptionsAnnotation) { + if ( withProcessorOptionsAnnotation != null ) { + processorOptions.put( withProcessorOptionsAnnotation.key(), withProcessorOptionsAnnotation.value() ); + } + } + + private boolean annotationProcessorNeedsToRun() { + return !testEntities.isEmpty() || !sources.isEmpty() || !mappingFiles.isEmpty(); + } + } +} diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationRunner.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationRunner.java deleted file mode 100644 index 567d844fd44b..000000000000 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationRunner.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - * Copyright Red Hat Inc. and Hibernate Authors - */ -package org.hibernate.processor.test.util; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.junit.runners.BlockJUnit4ClassRunner; -import org.junit.runners.model.FrameworkMethod; -import org.junit.runners.model.InitializationError; -import org.junit.runners.model.Statement; - -/** - * Custom JUnit runner which makes sure the annotation processor runs prior to the test method. - * - * @author Hardy Ferentschik - * @see CompilationStatement - */ -public class CompilationRunner extends BlockJUnit4ClassRunner { - private final List> testEntities; - private final List> preCompileEntities; - private final List sources; - private final List mappingFiles; - private final Map processorOptions; - private final String packageName; - private boolean ignoreCompilationErrors; - - - public CompilationRunner(Class clazz) throws InitializationError { - super( clazz ); - this.testEntities = new ArrayList<>(); - this.preCompileEntities = new ArrayList<>(); - this.sources = new ArrayList<>(); - this.mappingFiles = new ArrayList<>(); - this.processorOptions = new HashMap<>(); - Package pkg = clazz.getPackage(); - this.packageName = pkg != null ? pkg.getName() : null; - - processWithClasses( clazz.getAnnotation( WithClasses.class ) ); - processWithMappingFiles( clazz.getAnnotation( WithMappingFiles.class ) ); - processOptions( - clazz.getAnnotation( WithProcessorOption.class ), - clazz.getAnnotation( WithProcessorOption.List.class ) - ); - - ignoreCompilationErrors = clazz.getAnnotation( IgnoreCompilationErrors.class ) != null; - } - - @Override - protected Statement methodBlock(FrameworkMethod method) { - Statement statement = super.methodBlock( method ); - processAnnotations( method ); - if ( !annotationProcessorNeedsToRun() ) { - return statement; - } - - return new CompilationStatement( - statement, - getTestClass().getJavaClass(), - testEntities, - preCompileEntities, - sources, - mappingFiles, - processorOptions, - ignoreCompilationErrors - ); - } - - private void processWithClasses(WithClasses withClasses) { - if ( withClasses != null ) { - Collections.addAll( testEntities, withClasses.value() ); - Collections.addAll( preCompileEntities, withClasses.preCompile() ); - Collections.addAll( sources, withClasses.sources() ); - } - } - - private void processWithMappingFiles(WithMappingFiles withMappingFiles) { - if ( withMappingFiles != null ) { - String packageNameAsPath = TestUtil.fcnToPath( packageName ); - for ( String mappingFile : withMappingFiles.value() ) { - mappingFiles.add( packageNameAsPath + TestUtil.RESOURCE_SEPARATOR + mappingFile ); - } - } - } - - private void processOptions(WithProcessorOption withProcessorOption, - WithProcessorOption.List withProcessorOptionsListAnnotation) { - addOptions( withProcessorOption ); - if ( withProcessorOptionsListAnnotation != null ) { - for ( WithProcessorOption option : withProcessorOptionsListAnnotation.value() ) { - addOptions( option ); - } - } - } - - private void processAnnotations(FrameworkMethod method) { - // configuration will be added to potential class level configuration - processWithClasses( method.getAnnotation( WithClasses.class ) ); - processWithMappingFiles( method.getAnnotation( WithMappingFiles.class ) ); - processOptions( - method.getAnnotation( WithProcessorOption.class ), - method.getAnnotation( WithProcessorOption.List.class ) - ); - - // overrides potential class level configuration - ignoreCompilationErrors = method.getAnnotation( IgnoreCompilationErrors.class ) != null; - } - - private void addOptions(WithProcessorOption withProcessorOptionsAnnotation) { - if ( withProcessorOptionsAnnotation != null ) { - processorOptions.put( withProcessorOptionsAnnotation.key(), withProcessorOptionsAnnotation.value() ); - } - } - - private boolean annotationProcessorNeedsToRun() { - return !testEntities.isEmpty() || !sources.isEmpty() || !mappingFiles.isEmpty(); - } -} diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationStatement.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationStatement.java deleted file mode 100644 index 01a710921182..000000000000 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationStatement.java +++ /dev/null @@ -1,171 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - * Copyright Red Hat Inc. and Hibernate Authors - */ -package org.hibernate.processor.test.util; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import javax.tools.Diagnostic; -import javax.tools.DiagnosticCollector; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileObject; -import javax.tools.StandardJavaFileManager; -import javax.tools.ToolProvider; - -import org.hibernate.processor.HibernateProcessor; - -import org.junit.runners.model.Statement; - -import org.jboss.logging.Logger; - - -/** - * A custom JUnit statement which will run annotation processor prior to execute the original statement/test. - * - * The classes to process are specified via {@code WithClasses}, {@code WithMappingFiles} and {@code WithProcessorOption} - * on the actual test. - * - * @author Hardy Ferentschik - */ -public class CompilationStatement extends Statement { - private static final Logger log = Logger.getLogger( CompilationStatement.class ); - private static final String PACKAGE_SEPARATOR = "."; - private static final String ANNOTATION_PROCESSOR_OPTION_PREFIX = "-A"; - - private final Statement originalStatement; - private final Class testClass; - private final List> testEntities; - private final List> preCompileEntities; - private final List sources; - private final List xmlMappingFiles; - private final Map processorOptions; - private final boolean ignoreCompilationErrors; - private final List> compilationDiagnostics; - - public CompilationStatement(Statement originalStatement, - Class testClass, - List> testEntities, - List> proCompileEntities, - List sources, - List xmlMappingFiles, - Map processorOptions, - boolean ignoreCompilationErrors) { - this.originalStatement = originalStatement; - this.testClass = testClass; - this.testEntities = testEntities; - this.preCompileEntities = proCompileEntities; - this.sources = sources; - this.xmlMappingFiles = xmlMappingFiles; - this.processorOptions = processorOptions; - this.ignoreCompilationErrors = ignoreCompilationErrors; - this.compilationDiagnostics = new ArrayList>(); - } - - @Override - public void evaluate() throws Throwable { - // some test needs to compile some classes prior to the actual classes under test - if ( !preCompileEntities.isEmpty() ) { - compile( getCompilationUnits( preCompileEntities, null ) ); - } - - // now we compile the actual test classes - compile( getCompilationUnits( testEntities, sources ) ); - - if ( !ignoreCompilationErrors ) { - TestUtil.assertNoCompilationError( compilationDiagnostics ); - } - - originalStatement.evaluate(); - } - - private List getCompilationUnits(List> classesToCompile, List sources) { - List javaFiles = new ArrayList(); - for ( Class testClass : classesToCompile ) { - String pathToSource = getPathToSource( testClass ); - javaFiles.add( new File( pathToSource ) ); - } - if ( sources != null ) { - final var resourcesBaseDir = TestUtil.getResourcesBaseDir( testClass ); - for ( String source : sources ) { - javaFiles.add( - new File( resourcesBaseDir, - source.replace( PACKAGE_SEPARATOR, File.separator ) + ".java" ) ); - } - - } - return javaFiles; - } - - private String getPathToSource(Class testClass) { - if ( testClass.isMemberClass() ) { - return getPathToSource( testClass.getDeclaringClass() ); - } - return TestUtil.getSourceBaseDir( testClass ).getAbsolutePath() + File.separator + testClass.getName() - .replace( PACKAGE_SEPARATOR, File.separator ) + ".java"; - } - - private void compile(List sourceFiles) throws Exception { - List options = createJavaOptions(); - - JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); - DiagnosticCollector diagnostics = new DiagnosticCollector(); - StandardJavaFileManager fileManager = compiler.getStandardFileManager( diagnostics, null, null ); - Iterable compilationUnits = fileManager.getJavaFileObjectsFromFiles( - sourceFiles - ); - - compileSources( options, compiler, diagnostics, fileManager, compilationUnits ); - compilationDiagnostics.addAll( diagnostics.getDiagnostics() ); - fileManager.close(); - } - - private List createJavaOptions() { - List options = new ArrayList(); - options.add( "-d" ); - options.add( TestUtil.getOutBaseDir( testClass ).getAbsolutePath() ); - options.add( "-processor" ); - options.add( HibernateProcessor.class.getName() ); - - // pass orm files if specified - if ( !xmlMappingFiles.isEmpty() ) { - StringBuilder builder = new StringBuilder(); - builder.append( ANNOTATION_PROCESSOR_OPTION_PREFIX ); - builder.append( HibernateProcessor.ORM_XML_OPTION ); - builder.append( "=" ); - for ( String ormFile : xmlMappingFiles ) { - builder.append( ormFile ); - builder.append( "," ); - } - builder.deleteCharAt( builder.length() - 1 ); - options.add( builder.toString() ); - } - - // add any additional options specified by the test - for ( Map.Entry entry : processorOptions.entrySet() ) { - StringBuilder builder = new StringBuilder(); - builder.append( ANNOTATION_PROCESSOR_OPTION_PREFIX ); - builder.append( entry.getKey() ); - builder.append( "=" ); - builder.append( entry.getValue() ); - options.add( builder.toString() ); - } - return options; - } - - private void compileSources(List options, - JavaCompiler compiler, - DiagnosticCollector diagnostics, - StandardJavaFileManager fileManager, - Iterable compilationUnits) { - JavaCompiler.CompilationTask task = compiler.getTask( - null, fileManager, diagnostics, options, null, compilationUnits - ); - task.call(); - for ( Diagnostic diagnostic : diagnostics.getDiagnostics() ) { - log.debug( diagnostic.getMessage( null ) ); - } - } -} diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationTest.java index 97bc55ebe0c7..20b04ec24ed9 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationTest.java @@ -4,22 +4,14 @@ */ package org.hibernate.processor.test.util; -import org.junit.After; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; -/** - * Base class for annotation processor tests. - * - * @author Hardy Ferentschik - */ -@RunWith(CompilationRunner.class) -public abstract class CompilationTest { - - public CompilationTest() { - } +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; - @After - public void cleanup() throws Exception { - TestUtil.deleteProcessorGeneratedFiles(getClass()); - } +@Inherited +@Retention(RetentionPolicy.RUNTIME) +@ExtendWith(CompilationExtension.class) +public @interface CompilationTest { } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/TestUtil.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/TestUtil.java index 365232082fe9..f81651cd1c66 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/TestUtil.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/TestUtil.java @@ -4,11 +4,11 @@ */ package org.hibernate.processor.test.util; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.BufferedReader; import java.io.File; @@ -48,13 +48,13 @@ private TestUtil() { } public static void assertNoSourceFileGeneratedFor(Class clazz) { - assertNotNull( "Class parameter cannot be null", clazz ); + assertNotNull( clazz, "Class parameter cannot be null" ); File sourceFile = getMetaModelSourceFileFor( clazz, false ); - assertFalse( "There should be no source file: " + sourceFile.getName(), sourceFile.exists() ); + assertFalse( sourceFile.exists(), "There should be no source file: " + sourceFile.getName() ); } public static void assertAbsenceOfNonDefaultConstructorInMetamodelFor(Class clazz, String errorString) { - assertFalse(buildErrorString( errorString, clazz ), hasNonDefaultConstructorInMetamodelFor( clazz ) ); + assertFalse( hasNonDefaultConstructorInMetamodelFor( clazz ), buildErrorString( errorString, clazz ) ); } public static void assertAbsenceOfFieldInMetamodelFor(Class clazz, String fieldName) { @@ -66,7 +66,7 @@ public static void assertAbsenceOfFieldInMetamodelFor(Class clazz, String fie } public static void assertAbsenceOfFieldInMetamodelFor(Class clazz, String fieldName, String errorString) { - assertFalse( buildErrorString( errorString, clazz ), hasFieldInMetamodelFor( clazz, fieldName ) ); + assertFalse( hasFieldInMetamodelFor( clazz, fieldName ), buildErrorString( errorString, clazz ) ); } public static void assertPresenceOfFieldInMetamodelFor(Class clazz, String fieldName) { @@ -104,35 +104,36 @@ public static void assertPresenceOfMethodInMetamodelFor(String className, String } public static void assertPresenceOfFieldInMetamodelFor(Class clazz, String fieldName, String errorString) { - assertTrue( buildErrorString( errorString, clazz ), hasFieldInMetamodelFor( clazz, fieldName ) ); + assertTrue( hasFieldInMetamodelFor( clazz, fieldName ), buildErrorString( errorString, clazz ) ); } public static void assertPresenceOfFieldInMetamodelFor(String className, String fieldName, String errorString) { - assertTrue( buildErrorString( errorString, className ), hasFieldInMetamodelFor( className, fieldName ) ); + assertTrue( hasFieldInMetamodelFor( className, fieldName ), buildErrorString( errorString, className ) ); } public static void assertPresenceOfMethodInMetamodelFor(Class clazz, String fieldName, String errorString, Class... params) { - assertTrue( buildErrorString( errorString, clazz ), hasMethodInMetamodelFor( clazz, fieldName, params ) ); + assertTrue( hasMethodInMetamodelFor( clazz, fieldName, params ), buildErrorString( errorString, clazz ) ); } public static void assertPresenceOfMethodInMetamodelFor(String className, String fieldName, String errorString, Class... params) { - assertTrue( buildErrorString( errorString, className ), hasMethodInMetamodelFor( className, fieldName, params ) ); + assertTrue( hasMethodInMetamodelFor( className, fieldName, params ), buildErrorString( errorString, className ) ); } public static void assertPresenceOfNameFieldInMetamodelFor(Class clazz, String fieldName, String errorString) { - assertTrue( buildErrorString( errorString, clazz ), hasFieldInMetamodelFor( clazz, fieldName ) ); + assertTrue( hasFieldInMetamodelFor( clazz, fieldName ), buildErrorString( errorString, clazz ) ); assertEquals( - buildErrorString( errorString, clazz ), getFieldFromMetamodelFor( clazz, fieldName ).getType(), - String.class + getFieldFromMetamodelFor( clazz, fieldName ).getType(), + String.class, + buildErrorString( errorString, clazz ) ); } public static void assertAttributeTypeInMetaModelFor(Class clazz, String fieldName, Class expectedType, String errorString) { Field field = getFieldFromMetamodelFor( clazz, fieldName ); - assertNotNull( "Cannot find field '" + fieldName + "' in " + clazz.getName(), field ); + assertNotNull( field, "Cannot find field '" + fieldName + "' in " + clazz.getName() ); ParameterizedType type = (ParameterizedType) field.getGenericType(); Type actualType = type.getActualTypeArguments()[1]; if ( expectedType.isArray() ) { @@ -140,9 +141,9 @@ public static void assertAttributeTypeInMetaModelFor(Class clazz, String fiel actualType = getComponentType( actualType ); } assertEquals( - "Types do not match: " + buildErrorString( errorString, clazz ), expectedType, - actualType + actualType, + "Types do not match: " + buildErrorString( errorString, clazz ) ); } @@ -162,19 +163,19 @@ public static void assertMapAttributesInMetaModelFor(Class clazz, String fiel assertNotNull( field ); ParameterizedType type = (ParameterizedType) field.getGenericType(); Type actualMapKeyType = type.getActualTypeArguments()[1]; - assertEquals( buildErrorString( errorString, clazz ), expectedMapKey, actualMapKeyType ); + assertEquals( expectedMapKey, actualMapKeyType, buildErrorString( errorString, clazz ) ); Type actualMapKeyValue = type.getActualTypeArguments()[2]; - assertEquals( buildErrorString( errorString, clazz ), expectedMapValue, actualMapKeyValue ); + assertEquals( expectedMapValue, actualMapKeyValue, buildErrorString( errorString, clazz ) ); } public static void assertSuperclassRelationshipInMetamodel(Class entityClass, Class superEntityClass) { Class clazz = getMetamodelClassFor( entityClass ); Class superClazz = getMetamodelClassFor( superEntityClass ); assertEquals( - "Entity " + superClazz.getName() + " should be the superclass of " + clazz.getName(), superClazz.getName(), - clazz.getSuperclass().getName() + clazz.getSuperclass().getName(), + "Entity " + superClazz.getName() + " should be the superclass of " + clazz.getName() ); } @@ -288,7 +289,7 @@ public static Class getMetamodelClassFor(Class entityClass) { * @return the static metamodel class for the specified entity. */ public static Class getMetamodelClassFor(Class entityClass, boolean prefix) { - assertNotNull( "Class parameter cannot be null", entityClass ); + assertNotNull( entityClass, "Class parameter cannot be null" ); String metaModelClassName = getMetaModelClassName( entityClass, prefix ); try { URL outDirUrl = getOutBaseDir( entityClass ).toURI().toURL(); @@ -553,22 +554,22 @@ private static void assertCollectionAttributeTypeInMetaModelFor( Class expectedType, String errorString) { Field field = getFieldFromMetamodelFor( clazz, fieldName ); - assertNotNull( "Cannot find field '" + fieldName + "' in " + clazz.getName(), field ); + assertNotNull( field, "Cannot find field '" + fieldName + "' in " + clazz.getName() ); ParameterizedType type = (ParameterizedType) field.getGenericType(); Type rawType = type.getRawType(); assertEquals( - "Types do not match: " + buildErrorString( errorString, clazz ), collectionType, - rawType + rawType, + "Types do not match: " + buildErrorString( errorString, clazz ) ); Type genericType = type.getActualTypeArguments()[1]; assertEquals( - "Types do not match: " + buildErrorString( errorString, clazz ), expectedType, - genericType + genericType, + "Types do not match: " + buildErrorString( errorString, clazz ) ); } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/wildcard/WildcardTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/wildcard/WildcardTest.java index f6bd17714f04..5b618f60aa49 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/wildcard/WildcardTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/wildcard/WildcardTest.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 WildcardTest extends CompilationTest { +@CompilationTest +class WildcardTest { @Test @WithClasses({ PropertyRepo.class }) - public void testGeneratedAnnotationNotGenerated() { + void testGeneratedAnnotationNotGenerated() { System.out.println( TestUtil.getMetaModelSourceAsString( PropertyRepo.class ) ); assertMetamodelClassGeneratedFor( PropertyRepo.class ); } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlembeddable/EmbeddableConfiguredInXmlTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlembeddable/EmbeddableConfiguredInXmlTest.java index 9204b2a1afa3..4057673f27a6 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlembeddable/EmbeddableConfiguredInXmlTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlembeddable/EmbeddableConfiguredInXmlTest.java @@ -11,21 +11,22 @@ import org.hibernate.processor.test.util.WithMappingFiles; import org.hibernate.processor.test.xmlembeddable.foo.BusinessId; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hibernate.processor.test.util.TestUtil.getMetaModelSourceAsString; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Hardy Ferentschik */ -public class EmbeddableConfiguredInXmlTest extends CompilationTest { +@CompilationTest +class EmbeddableConfiguredInXmlTest { @Test @TestForIssue(jiraKey = "METAGEN-66") @WithClasses(value = { Foo.class, BusinessEntity.class }, preCompile = BusinessId.class) @WithMappingFiles("orm.xml") @IgnoreCompilationErrors - public void testAttributeForEmbeddableConfiguredInXmlExists() { + void testAttributeForEmbeddableConfiguredInXmlExists() { // need to work with the source file. BusinessEntity_.class won't get generated, because the business id won't // be on the classpath String entityMetaModel = getMetaModelSourceAsString( BusinessEntity.class ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/IgnoreInvalidXmlTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/IgnoreInvalidXmlTest.java index e37bc8d7ebaa..cbca108103b2 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/IgnoreInvalidXmlTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/IgnoreInvalidXmlTest.java @@ -7,18 +7,19 @@ import org.hibernate.processor.test.util.CompilationTest; import org.hibernate.processor.test.util.WithClasses; import org.hibernate.processor.test.util.WithMappingFiles; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor; /** * @author Hardy Ferentschik */ -public class IgnoreInvalidXmlTest extends CompilationTest { +@CompilationTest +class IgnoreInvalidXmlTest { @Test @WithClasses(Superhero.class) @WithMappingFiles({ "orm.xml", "jpa1-orm.xml", "malformed-mapping.xml", "non-existend-class.xml" }) - public void testInvalidXmlFilesGetIgnored() { + void testInvalidXmlFilesGetIgnored() { // this is only a indirect test, but if the invalid xml files would cause the processor to abort the // meta class would not have been generated assertMetamodelClassGeneratedFor( Superhero.class ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/XmlMappingTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/XmlMappingTest.java index f72636cc952b..8b58ccd11bbf 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/XmlMappingTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/XmlMappingTest.java @@ -9,8 +9,9 @@ import org.hibernate.processor.test.util.TestForIssue; import org.hibernate.processor.test.util.WithClasses; import org.hibernate.processor.test.util.WithProcessorOption; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.hibernate.processor.test.util.TestUtil.assertAttributeTypeInMetaModelFor; import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor; import static org.hibernate.processor.test.util.TestUtil.assertPresenceOfFieldInMetamodelFor; @@ -20,6 +21,7 @@ * @author Hardy Ferentschik */ // TODO - differentiate needed classes per test better. Right now all test classes are processed for each test (HF) +@CompilationTest @WithClasses({ Address.class, Boy.class, @@ -31,21 +33,21 @@ }) @WithProcessorOption(key = HibernateProcessor.PERSISTENCE_XML_OPTION, value = "org/hibernate/processor/test/xmlmapped/persistence.xml") -public class XmlMappingTest extends CompilationTest { +class XmlMappingTest { @Test - public void testXmlConfiguredEmbeddedClassGenerated() { + void testXmlConfiguredEmbeddedClassGenerated() { assertMetamodelClassGeneratedFor( Address.class ); } @Test - public void testXmlConfiguredMappedSuperclassGenerated() { + void testXmlConfiguredMappedSuperclassGenerated() { assertMetamodelClassGeneratedFor( Building.class ); assertPresenceOfFieldInMetamodelFor( Building.class, "address", "address field should exist" ); } @Test @TestForIssue(jiraKey = "METAGEN-17") - public void testTargetEntityOnOneToOne() { + void testTargetEntityOnOneToOne() { assertMetamodelClassGeneratedFor( Boy.class ); assertPresenceOfFieldInMetamodelFor( Boy.class, "favoriteSuperhero", "favoriteSuperhero field should exist" ); assertAttributeTypeInMetaModelFor( @@ -55,7 +57,7 @@ public void testTargetEntityOnOneToOne() { @Test @TestForIssue(jiraKey = "METAGEN-17") - public void testTargetEntityOnOneToMany() { + void testTargetEntityOnOneToMany() { assertMetamodelClassGeneratedFor( Boy.class ); assertPresenceOfFieldInMetamodelFor( Boy.class, "knowsHeroes", "knowsHeroes field should exist" ); assertAttributeTypeInMetaModelFor( @@ -65,7 +67,7 @@ public void testTargetEntityOnOneToMany() { @Test @TestForIssue(jiraKey = "METAGEN-17") - public void testTargetEntityOnManyToMany() { + void testTargetEntityOnManyToMany() { assertMetamodelClassGeneratedFor( Boy.class ); assertPresenceOfFieldInMetamodelFor( Boy.class, "savedBy", "savedBy field should exist" ); assertAttributeTypeInMetaModelFor( @@ -74,21 +76,22 @@ public void testTargetEntityOnManyToMany() { } @Test - public void testXmlConfiguredElementCollection() { + void testXmlConfiguredElementCollection() { assertMetamodelClassGeneratedFor( Boy.class ); assertPresenceOfFieldInMetamodelFor( Boy.class, "nickNames", "nickNames field should exist" ); assertAttributeTypeInMetaModelFor( Boy.class, "nickNames", String.class, "target class overridden in xml" ); } @Test - public void testClassHierarchy() { + void testClassHierarchy() { assertMetamodelClassGeneratedFor( Mammal.class ); assertMetamodelClassGeneratedFor( LivingBeing.class ); assertSuperclassRelationshipInMetamodel( Mammal.class, LivingBeing.class ); } - @Test(expected = ClassNotFoundException.class) - public void testNonExistentMappedClassesGetIgnored() throws Exception { - Class.forName( "org.hibernate.processor.test.model.Dummy_" ); + @Test + void testNonExistentMappedClassesGetIgnored() throws Exception { + assertThatThrownBy( () -> Class.forName( "org.hibernate.processor.test.model.Dummy_" )) + .isInstanceOf( ClassNotFoundException.class ); } } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmetacomplete/multiplepus/XmlMetaDataCompleteMultiplePersistenceUnitsTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmetacomplete/multiplepus/XmlMetaDataCompleteMultiplePersistenceUnitsTest.java index e9d4f8e1367c..9832a95b54a5 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmetacomplete/multiplepus/XmlMetaDataCompleteMultiplePersistenceUnitsTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmetacomplete/multiplepus/XmlMetaDataCompleteMultiplePersistenceUnitsTest.java @@ -9,21 +9,22 @@ import org.hibernate.processor.test.util.TestForIssue; import org.hibernate.processor.test.util.WithClasses; import org.hibernate.processor.test.util.WithProcessorOption; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor; /** * @author Hardy Ferentschik */ +@CompilationTest @TestForIssue(jiraKey = "METAGEN-86") -public class XmlMetaDataCompleteMultiplePersistenceUnitsTest extends CompilationTest { +class XmlMetaDataCompleteMultiplePersistenceUnitsTest { @Test @WithClasses(Dummy.class) @WithProcessorOption(key = HibernateProcessor.PERSISTENCE_XML_OPTION, value = "org/hibernate/processor/test/xmlmetacomplete/multiplepus/persistence.xml") - public void testMetaModelGenerated() { + void testMetaModelGenerated() { // only one of the xml files in the example uses 'xml-mapping-metadata-complete', hence annotation processing // kicks in assertMetamodelClassGeneratedFor( Dummy.class ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmetacomplete/singlepu/XmlMetaDataCompleteSinglePersistenceUnitTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmetacomplete/singlepu/XmlMetaDataCompleteSinglePersistenceUnitTest.java index fe435a593086..b4afc27e0150 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmetacomplete/singlepu/XmlMetaDataCompleteSinglePersistenceUnitTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmetacomplete/singlepu/XmlMetaDataCompleteSinglePersistenceUnitTest.java @@ -8,19 +8,20 @@ import org.hibernate.processor.test.util.CompilationTest; import org.hibernate.processor.test.util.WithClasses; import org.hibernate.processor.test.util.WithProcessorOption; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hibernate.processor.test.util.TestUtil.assertNoSourceFileGeneratedFor; /** * @author Hardy Ferentschik */ -public class XmlMetaDataCompleteSinglePersistenceUnitTest extends CompilationTest { +@CompilationTest +class XmlMetaDataCompleteSinglePersistenceUnitTest { @Test @WithClasses(org.hibernate.processor.test.xmlmetacomplete.multiplepus.Dummy.class) @WithProcessorOption(key = HibernateProcessor.PERSISTENCE_XML_OPTION, value = "org/hibernate/processor/test/xmlmetacomplete/singlepu/persistence.xml") - public void testNoMetaModelGenerated() { + void testNoMetaModelGenerated() { // the xml mapping files used in the example say that the xml data is meta complete. For that // reason there should be no meta model source file for the annotated Dummy entity assertNoSourceFileGeneratedFor( Dummy.class ); diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/XmlOnlyTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/XmlOnlyTest.java index 065f03086437..c32a50e55b23 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/XmlOnlyTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/XmlOnlyTest.java @@ -8,7 +8,7 @@ import org.hibernate.processor.test.util.CompilationTest; import org.hibernate.processor.test.util.WithClasses; import org.hibernate.processor.test.util.WithProcessorOption; -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.assertPresenceOfFieldInMetamodelFor; @@ -16,29 +16,30 @@ /** * @author Hardy Ferentschik */ +@CompilationTest @WithClasses({ Car.class, Course.class, Option.class, Period.class, Teacher.class, Tire.class, XmlOnly.class }) @WithProcessorOption(key = HibernateProcessor.PERSISTENCE_XML_OPTION, value = "org/hibernate/processor/test/xmlonly/persistence.xml") -public class XmlOnlyTest extends CompilationTest { +public class XmlOnlyTest { @Test - public void testMetaModelGeneratedForXmlConfiguredEntity() { + void testMetaModelGeneratedForXmlConfiguredEntity() { assertMetamodelClassGeneratedFor( XmlOnly.class ); } @Test - public void testMetaModelGeneratedForManyToManyFieldAccessWithoutTargetEntity() { + void testMetaModelGeneratedForManyToManyFieldAccessWithoutTargetEntity() { assertPresenceOfFieldInMetamodelFor( Course.class, "qualifiedTeachers", "Type should be inferred from field" ); assertPresenceOfFieldInMetamodelFor( Teacher.class, "qualifiedFor", "Type should be inferred from field" ); } @Test - public void testMetaModelGeneratedForOneToManyPropertyAccessWithoutTargetEntity() { + void testMetaModelGeneratedForOneToManyPropertyAccessWithoutTargetEntity() { assertPresenceOfFieldInMetamodelFor( Car.class, "tires", "Type should be inferred from field" ); assertPresenceOfFieldInMetamodelFor( Tire.class, "car", "Type should be inferred from field" ); } @Test - public void testMetaModelGeneratedForEmbeddable() { + void testMetaModelGeneratedForEmbeddable() { assertPresenceOfFieldInMetamodelFor( Option.class, "period", "Embedded expected" ); assertPresenceOfFieldInMetamodelFor( Period.class, "start", "Embedded expected" ); assertPresenceOfFieldInMetamodelFor( Period.class, "end", "Embedded expected" ); diff --git a/tooling/metamodel-generator/src/test/resources/log4j2.properties b/tooling/metamodel-generator/src/test/resources/log4j2.properties index 56496ed574c1..949b4c074e97 100644 --- a/tooling/metamodel-generator/src/test/resources/log4j2.properties +++ b/tooling/metamodel-generator/src/test/resources/log4j2.properties @@ -21,6 +21,6 @@ appender.file.layout.pattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n rootLogger.level=warn rootLogger.appenderRef.stdout.ref=STDOUT -logger.compilation-test.name=org.hibernate.processor.test.util.CompilationTest +logger.compilation-test.name=org.hibernate.processor.test #logger.compilation-test.level=trace