From 7d9b425a891f47be571ac1400dd1735ec1caab74 Mon Sep 17 00:00:00 2001
From: Steve Ebersole <steve@hibernate.org>
Date: Tue, 26 Mar 2024 17:57:38 -0500
Subject: [PATCH] HHH-17460 - Ongoing JPA 32 work

---
 .../ManyToOneWithFormulaTest.java             | 42 ++++++++++---------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java
index 2d1d953052..90d3c17f38 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java
@@ -24,25 +24,11 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * @author Sharath Reddy
  */
-@DomainModel( annotatedClasses = {
-		Menu.class,
-		FoodItem.class,
-		Company.class,
-		Person.class,
-		Message.class,
-		Language.class,
-		Contract.class,
-		ContractId.class,
-		Model.class,
-		ModelId.class,
-		Manufacturer.class,
-		ManufacturerId.class,
-		Product.class,
-		ProductSqlServer.class
-} )
-@SessionFactory
+@SuppressWarnings("JUnitMalformedDeclaration")
 public class ManyToOneWithFormulaTest {
 	@Test
+	@DomainModel( annotatedClasses = { Menu.class, FoodItem.class } )
+	@SessionFactory
 	public void testManyToOneFromNonPk(SessionFactoryScope scope) {
 		scope.inTransaction( (session) -> {
 			Menu menu = new Menu();
@@ -65,6 +51,8 @@ public class ManyToOneWithFormulaTest {
 	}
 
 	@Test
+	@DomainModel( annotatedClasses = { Company.class, Person.class } )
+	@SessionFactory
 	public void testManyToOneFromPk(SessionFactoryScope scope) {
 		scope.inTransaction( (session) -> {
 			Company company = new Company();
@@ -87,6 +75,8 @@ public class ManyToOneWithFormulaTest {
 	}
 
 	@Test
+	@DomainModel( annotatedClasses = { Message.class, Language.class } )
+	@SessionFactory
 	@SkipForDialect( dialectClass = HSQLDialect.class, reason = "The used join conditions does not work in HSQLDB. See HHH-4497" )
 	public void testManyToOneToPkWithOnlyFormula(SessionFactoryScope scope) {
 		scope.inTransaction( (session) -> {
@@ -112,11 +102,21 @@ public class ManyToOneWithFormulaTest {
 	}
 
 	@Test
+	@DomainModel( annotatedClasses = {
+			Contract.class,
+			ContractId.class,
+			Model.class,
+			ModelId.class,
+			Manufacturer.class,
+			ManufacturerId.class,
+	} )
+	@SessionFactory
 	public void testReferencedColumnNameBelongsToEmbeddedIdOfReferencedEntity(SessionFactoryScope scope) {
-		scope.inTransaction( (session) -> {		Integer companyCode = 10;
+		scope.inTransaction( (session) -> {
+			Integer companyCode = 10;
 			Integer mfgCode = 100;
 			String contractNumber = "NSAR97841";
-			ContractId contractId = new ContractId(companyCode, 12457l, 1);
+			ContractId contractId = new ContractId(companyCode, 12457L, 1);
 
 			Manufacturer manufacturer = new Manufacturer(new ManufacturerId(
 					companyCode, mfgCode), "FORD");
@@ -148,6 +148,8 @@ public class ManyToOneWithFormulaTest {
 	}
 
 	@Test
+	@DomainModel( annotatedClasses = Product.class )
+	@SessionFactory
 	@SkipForDialect( dialectClass =HSQLDialect.class, reason = "The used join conditions does not work in HSQLDB. See HHH-4497." )
 	@SkipForDialect( dialectClass = OracleDialect.class, reason = "Oracle do not support 'substring' function" )
 	@SkipForDialect( dialectClass = AltibaseDialect.class, reason = " Altibase char type returns with trailing spaces")
@@ -185,6 +187,8 @@ public class ManyToOneWithFormulaTest {
     }
 
     @Test
+	@DomainModel( annotatedClasses = ProductSqlServer.class )
+	@SessionFactory
 	@RequiresDialect( SQLServerDialect.class )
     public void testManyToOneFromNonPkToNonPkSqlServer(SessionFactoryScope scope) {
         // also tests usage of the stand-alone @JoinFormula annotation