HHH-19916 More drop JUnit 4 usage work

Author: dreab8

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/EntityNonEntityTest.java

@@ -4,104 +4,98 @@
  */
 package org.hibernate.orm.test.annotations.entitynonentity;
 
-import org.hibernate.Session;
-import org.hibernate.Transaction;
 import org.hibernate.UnknownEntityTypeException;
-
+import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
-import org.junit.Test;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  * @author Emmanuel Bernard
  */
-public class EntityNonEntityTest extends BaseCoreFunctionalTestCase {
-	@Test
-	public void testMix() {
-		GSM gsm = new GSM();
-		gsm.brand = "Sony";
-		gsm.frequency = 900;
-		gsm.isNumeric = true;
-		gsm.number = 2;
-		gsm.species = "human";
-		Session s = openSession();
-		Transaction tx = s.beginTransaction();
-		s.persist( gsm );
-		tx.commit();
-		s.clear();
-		tx = s.beginTransaction();
-		gsm = s.get( GSM.class, gsm.id );
-		assertEquals( "top mapped superclass", 2, gsm.number );
-		assertNull( "non entity between mapped superclass and entity", gsm.species );
-		assertTrue( "mapped superclass under entity", gsm.isNumeric );
-		assertNull( "non entity under entity", gsm.brand );
-		assertEquals( "leaf entity", 900, gsm.frequency );
-		s.remove( gsm );
-		tx.commit();
-		s.close();
+@DomainModel(
+		annotatedClasses = {
+				Phone.class,
+				Voice.class,
+				// Adding Cellular here is a test for HHH-9855
+				Cellular.class,
+				GSM.class
+		}
+)
+@SessionFactory
+public class EntityNonEntityTest {
+
+	@AfterEach
+	public void tearDown(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session ->
+						scope.getSessionFactory().getSchemaManager().truncateMappedObjects()
+		);
 	}
 
 	@Test
-	@JiraKey( value = "HHH-9856" )
-	public void testGetAndFindNonEntityThrowsIllegalArgumentException() {
-		try {
-			sessionFactory().getMappingMetamodel().findEntityDescriptor(Cellular.class);
-			sessionFactory().getMappingMetamodel().getEntityDescriptor( Cellular.class );
+	public void testMix(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					GSM gsm = new GSM();
+					gsm.brand = "Sony";
+					gsm.frequency = 900;
+					gsm.isNumeric = true;
+					gsm.number = 2;
+					gsm.species = "human";
+					session.persist( gsm );
+					session.getTransaction().commit();
+					session.clear();
+					session.beginTransaction();
+					gsm = session.get( GSM.class, gsm.id );
 
-		}
-		catch (UnknownEntityTypeException ignore) {
-			// expected
-		}
+					assertThat( gsm.number )
+							.describedAs( "top mapped superclass" )
+							.isEqualTo( 2 );
+					assertThat( gsm.species )
+							.describedAs( "non entity between mapped superclass and entity" )
+							.isNull();
+					assertThat( gsm.isNumeric )
+							.describedAs( "mapped superclass under entity" )
+							.isTrue();
+					assertThat( gsm.brand )
+							.describedAs( "non entity under entity" )
+							.isNull();
+					assertThat( gsm.frequency )
+							.describedAs( "leaf entity" )
+							.isEqualTo( 900 );
 
-		try {
-			sessionFactory().getRuntimeMetamodels().getMappingMetamodel().getEntityDescriptor( Cellular.class.getName() );
-		}
-		catch (UnknownEntityTypeException ignore) {
-			// expected
-		}
+					session.remove( gsm );
+				}
+		);
+	}
 
-		Session s = openSession();
-		s.beginTransaction();
-		try {
-			s.get( Cellular.class, 1 );
-			fail( "Expecting a failure" );
-		}
-		catch (UnknownEntityTypeException ignore) {
-			// expected
-		}
-		finally {
-			s.getTransaction().commit();
-			s.close();
-		}
+	@Test
+	@JiraKey(value = "HHH-9856")
+	public void testGetAndFindNonEntityThrowsIllegalArgumentException(SessionFactoryScope scope) {
+		assertThrows( UnknownEntityTypeException.class, () -> {
+			scope.getSessionFactory().getMappingMetamodel().findEntityDescriptor( Cellular.class );
+			scope.getSessionFactory().getMappingMetamodel().getEntityDescriptor( Cellular.class );
+		} );
 
-		s = openSession();
-		s.beginTransaction();
-		try {
-			s.get( Cellular.class.getName(), 1 );
-			fail( "Expecting a failure" );
-		}
-		catch (UnknownEntityTypeException ignore) {
-			// expected
-		}
-		finally {
-			s.getTransaction().commit();
-			s.close();
-		}
-	}
+		assertThrows( UnknownEntityTypeException.class, () ->
+				scope.getSessionFactory().getMappingMetamodel().getMappingMetamodel()
+						.getEntityDescriptor( Cellular.class.getName() )
+		);
 
-	@Override
-	protected Class[] getAnnotatedClasses() {
-		return new Class[]{
-				Phone.class,
-				Voice.class,
-				// Adding Cellular here is a test for HHH-9855
-				Cellular.class,
-				GSM.class
-		};
+		assertThrows( UnknownEntityTypeException.class, () -> scope.inTransaction(
+				session ->
+						session.get( Cellular.class, 1 )
+		) );
+
+		assertThrows( UnknownEntityTypeException.class, () -> scope.inTransaction(
+				session ->
+						session.get( Cellular.class.getName(), 1 )
+		) );
 	}
 }

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/GSM.java

@@ -3,6 +3,7 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.entitynonentity;
+
 import jakarta.persistence.Entity;
 
 /**

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Phone.java

@@ -3,6 +3,7 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.entitynonentity;
+
 import jakarta.persistence.MappedSuperclass;
 
 /**

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Voice.java

@@ -3,6 +3,7 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.entitynonentity;
+
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/A.java

@@ -32,7 +32,7 @@ public class A {
 	@OneToMany( cascade = CascadeType.ALL)
 	@Cascade(org.hibernate.annotations.CascadeType.ALL)
 	@OrderBy("name")
-	java.util.List<B> bs = new ArrayList<B>();
+	java.util.List<B> bs = new ArrayList<>();
 
 
 

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/B.java

@@ -33,7 +33,7 @@ public class B {
 	@OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
 	@Cascade(org.hibernate.annotations.CascadeType.ALL)
 	@OrderBy("name")
-	java.util.List<C> cs = new ArrayList<C>();
+	java.util.List<C> cs = new ArrayList<>();
 
 	public Long getId() {
 		return id;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/BankAccount.java

@@ -46,7 +46,7 @@ public void setTransactions(List<Transaction> transactions) {
 
 	public void addTransaction(String code) {
 		if ( transactions == null ) {
-			transactions = new ArrayList<Transaction>();
+			transactions = new ArrayList<>();
 		}
 		Transaction transaction = new Transaction();
 		transaction.setCode( code );

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Box.java

@@ -22,7 +22,7 @@ public class Box implements Serializable {
 
 	@OneToMany( mappedBy = "box" )
 	@OrderBy( "sortField DESC, code" ) // Sorting by @Formula calculated field.
-	private List<Item> items = new ArrayList<Item>();
+	private List<Item> items = new ArrayList<>();
 
 	public Box() {
 	}

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Comment.java

@@ -18,9 +18,9 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 
-@Entity(name="CommentTable") // "Comment" reserved in Oracle
+@Entity(name = "CommentTable") // "Comment" reserved in Oracle
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
-@DiscriminatorColumn(name = "DTYPE", discriminatorType= DiscriminatorType.STRING, length = 3)
+@DiscriminatorColumn(name = "DTYPE", discriminatorType = DiscriminatorType.STRING, length = 3)
 @DiscriminatorValue(value = "WPT")
 public class Comment {
 
@@ -40,8 +40,8 @@ public void setId(Long id) {
 		this.id = id;
 	}
 
-	@ManyToOne(optional=true,fetch=FetchType.LAZY)
-	@JoinColumn(name="FK_PostId", nullable=true, insertable=true,updatable=false)
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "FK_PostId", updatable = false)
 	public Post getPost() {
 		return post;
 	}
@@ -50,8 +50,8 @@ public void setPost(Post family) {
 		this.post = family;
 	}
 
-	@ManyToOne(optional=true,fetch=FetchType.LAZY)
-	@JoinColumn(name="FK_ForumId", nullable=true, insertable=true,updatable=false)
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "FK_ForumId", updatable = false)
 	public Forum getForum() {
 		return forum;
 	}

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Employee.java

@@ -13,7 +13,7 @@ public class Employee {
 
 	@OneToMany(cascade = CascadeType.ALL, mappedBy = "employee", orphanRemoval = true)
 	@OrderBy // order by PK
-	private final List<Asset> assets = new ArrayList<Asset>();
+	private final List<Asset> assets = new ArrayList<>();
 
 	@Id
 	@Column(name = "id")