HHH-19846 Drop JUnit 4 usage

Author: dreab8

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/Bid.java

@@ -3,6 +3,7 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.subselect;
+
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 
@@ -21,18 +22,23 @@ public class Bid {
 	public int getId() {
 		return id;
 	}
+
 	public void setId(int id) {
 		this.id = id;
 	}
+
 	public long getItemId() {
 		return itemId;
 	}
+
 	public void setItemId(long itemId) {
 		this.itemId = itemId;
 	}
+
 	public double getAmount() {
 		return amount;
 	}
+
 	public void setAmount(double val) {
 		this.amount = val;
 	}

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/HighestBid.java

@@ -3,6 +3,7 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.subselect;
+
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 
@@ -25,12 +26,15 @@ public class HighestBid {
 	public String getName() {
 		return name;
 	}
+
 	public void setName(String val) {
 		this.name = val;
 	}
+
 	public double getAmount() {
 		return amount;
 	}
+
 	public void setAmount(double amount) {
 		this.amount = amount;
 	}

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/Item.java

@@ -3,6 +3,7 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.subselect;
+
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 
@@ -19,12 +20,15 @@ public class Item {
 	public long getId() {
 		return id;
 	}
+
 	public void setId(long id) {
 		this.id = id;
 	}
+
 	public String getName() {
 		return name;
 	}
+
 	public void setName(String name) {
 		this.name = name;
 	}

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/SubselectTest.java

@@ -4,62 +4,60 @@
  */
 package org.hibernate.orm.test.annotations.subselect;
 
-import org.junit.Assert;
-import org.junit.Test;
-
-import org.hibernate.Session;
-import org.hibernate.Transaction;
-import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.type.StandardBasicTypes;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author Sharath Reddy
  */
-public class SubselectTest extends BaseCoreFunctionalTestCase {
-	@Test
-	public void testSubselectWithSynchronize() {
-
-		Session s = openSession();
-		Transaction tx = s.beginTransaction();
-
-		//We don't use auto-generated ids because these seem to cause the session to flush.
-		//We want to test that the session flushes because of the 'synchronize' annotation
-		long itemId = 1;
-		Item item = new Item();
-		item.setName("widget");
-		item.setId(itemId);
-		s.persist(item);
-
-		Bid bid1 = new Bid();
-		bid1.setAmount(100.0);
-		bid1.setItemId(itemId);
-		bid1.setId(1);
-		s.persist(bid1);
-
-		Bid bid2 = new Bid();
-		bid2.setAmount(200.0);
-		bid2.setItemId(itemId);
-		bid2.setId(2);
-		s.persist(bid2);
-
-		//Because we use 'synchronize' annotation, this query should trigger session flush
-		var query = s.createQuery("from HighestBid b where b.name = :name", HighestBid.class);
-		query.setParameter( "name", "widget", StandardBasicTypes.STRING );
-		HighestBid highestBid = query.list().iterator().next();
-
-		Assert.assertEquals( 200.0, highestBid.getAmount(), 0.01 );
-		tx.rollback();
-		s.close();
-	}
-
-	@Override
-	protected Class<?>[] getAnnotatedClasses() {
-		return new Class[]{
+@DomainModel(
+		annotatedClasses = {
 				Item.class,
 				Bid.class,
 				HighestBid.class
-		};
+		}
+)
+@SessionFactory
+public class SubselectTest {
+
+	@Test
+	public void testSubselectWithSynchronize(SessionFactoryScope scope) {
+		//We don't use auto-generated ids because these seem to cause the session to flush.
+		//We want to test that the session flushes because of the 'synchronize' annotation
+		scope.inTransaction(
+				session -> {
+					long itemId = 1;
+					Item item = new Item();
+					item.setName( "widget" );
+					item.setId( itemId );
+					session.persist( item );
+
+					Bid bid1 = new Bid();
+					bid1.setAmount( 100.0 );
+					bid1.setItemId( itemId );
+					bid1.setId( 1 );
+					session.persist( bid1 );
+
+					Bid bid2 = new Bid();
+					bid2.setAmount( 200.0 );
+					bid2.setItemId( itemId );
+					bid2.setId( 2 );
+					session.persist( bid2 );
+
+					//Because we use 'synchronize' annotation, this query should trigger session flush
+					var query = session.createQuery( "from HighestBid b where b.name = :name", HighestBid.class );
+					query.setParameter( "name", "widget", StandardBasicTypes.STRING );
+					HighestBid highestBid = query.list().iterator().next();
+
+					assertEquals( 200.0, highestBid.getAmount(), 0.01 );
+				}
+		);
 	}
 
 }