Various code cleanup

Author: sebersole

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedSubclassDuplicateFieldsWithTreatTest.java

@@ -5,90 +5,67 @@
 package org.hibernate.orm.test.mapping.inheritance.joined;
 
 import java.util.List;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Inheritance;
-import jakarta.persistence.InheritanceType;
 
+
+import org.hibernate.testing.orm.domain.StandardDomainModel;
+import org.hibernate.testing.orm.domain.retail.CardPayment;
+import org.hibernate.testing.orm.domain.retail.CashPayment;
+import org.hibernate.testing.orm.domain.retail.DomesticVendor;
+import org.hibernate.testing.orm.domain.retail.ForeignVendor;
+import org.hibernate.testing.orm.domain.retail.Payment;
+import org.hibernate.testing.orm.domain.retail.Vendor;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
 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.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-/**
- * @author pholvs
- */
-@DomainModel(
-		annotatedClasses = {
-				JoinedSubclassDuplicateFieldsWithTreatTest.Account.class,
-				JoinedSubclassDuplicateFieldsWithTreatTest.Deposit.class,
-				JoinedSubclassDuplicateFieldsWithTreatTest.Loan.class
-		}
-)
-@SessionFactory
+@SuppressWarnings("JUnitMalformedDeclaration")
 @JiraKey( "HHH-11686" )
+@DomainModel(standardModels = StandardDomainModel.RETAIL)
+@SessionFactory
 public class JoinedSubclassDuplicateFieldsWithTreatTest {
-
 	@Test
-	public void queryConstrainedSubclass(SessionFactoryScope scope) {
+	public void testRestrictedTreat(SessionFactoryScope scope) {
+		// SINGLE_TABLE
 		scope.inTransaction( (session) -> {
-			Deposit deposit1 = new Deposit();
-			deposit1.id = 1L;
-			deposit1.interest = 10;
-
-			Loan loan1 = new Loan();
-			loan1.id = 2L;
-			loan1.interest = 10;
-
-			Deposit deposit2 = new Deposit();
-			deposit2.id = 3L;
-			deposit2.interest = 20;
-
-			Loan loan2 = new Loan();
-			loan2.id = 4L;
-			loan2.interest = 30;
-
-			session.persist(deposit1);
-			session.persist(loan1);
-			session.persist(deposit2);
-			session.persist(loan2);
+			final String qry = "from Vendor v where treat(v as DomesticVendor).name = 'Spacely'";
+			final List<Vendor> vendors = session.createQuery( qry, Vendor.class ).getResultList();
+			assertThat( vendors ).isEmpty();
 		} );
 
+		// JOINED
 		scope.inTransaction( (session) -> {
-			List<Account> accounts = session
-			.createQuery(
-					"select a from Account a where treat(a as Loan).interest = 10",
-					Account.class
-			).getResultList();
-			assertThat( accounts ).hasSize( 1 );
+			final String qry = "from Payment p where treat(p as CardPayment).transactionId = 123";
+			final List<Payment> payments = session.createQuery( qry, Payment.class ).getResultList();
+			assertThat( payments ).hasSize( 1 );
+			assertThat( payments.get( 0 ) ).isInstanceOf( CardPayment.class );
 		} );
 	}
 
-	@Entity(name = "Account")
-	@Inheritance(strategy = InheritanceType.JOINED)
-	public static class Account
-	{
-		@Id
-		public Long id;
-	}
-
+	@BeforeEach
+	void createTestData(SessionFactoryScope sessions) {
+		sessions.inTransaction( (session) -> {
+			// SINGLE_TABLE
+			final DomesticVendor acme = new DomesticVendor( 1, "Acme", "Acme, LLC" );
+			final ForeignVendor spacely = new ForeignVendor( 2, "Spacely", "Spacely Space Sprockets, Inc" );
+			session.persist( acme );
+			session.persist( spacely );
 
-	@Entity(name = "Deposit")
-	public static class Deposit extends Account {
-		@Column
-		public Integer interest;
+			// JOINED
+			final CardPayment cardPayment = new CardPayment( 1, 123, 123L, "USD" );
+			final CashPayment cashPayment = new CashPayment( 2, 789L, "USD" );
+			session.persist( cardPayment );
+			session.persist( cashPayment );
+		} );
 	}
 
-	@Entity(name = "Loan")
-	public static class Loan extends Account {
-		@Column
-		public Integer interest;
-
-		@Column
-		public Integer rate;
+	@AfterEach
+	void dropTestData(SessionFactoryScope sessions) {
+		sessions.dropData();
 	}
 }

hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/CashPayment.java

@@ -4,6 +4,7 @@
  */
 package org.hibernate.testing.orm.domain.retail;
 
+import javax.money.Monetary;
 import javax.money.MonetaryAmount;
 import jakarta.persistence.Entity;
 
@@ -18,4 +19,8 @@ public CashPayment() {
 	public CashPayment(Integer id, MonetaryAmount amount) {
 		super( id, amount );
 	}
+
+	public CashPayment(Integer id, Long amount, String currencyCode) {
+		super( id, Monetary.getDefaultAmountFactory().setNumber( amount ).setCurrency( currencyCode ).create() );
+	}
 }