HHH-19324 - Switch tests using hbm.xml to use mapping.xml

HHH-19433 - Deprecate @PropertyRef

Author: sebersole

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/deletetransient/DeleteTransientEntityTest.java

@@ -24,19 +24,16 @@
 /**
  * @author Steve Ebersole
  */
-@DomainModel(
-		xmlMappings = {
-				"org/hibernate/orm/test/deletetransient/Person.hbm.xml"
-		}
-)
+@SuppressWarnings("JUnitMalformedDeclaration")
+@DomainModel(xmlMappings = "org/hibernate/orm/test/deletetransient/Person.xml")
 @SessionFactory
 @BytecodeEnhanced
 @CustomEnhancementContext({ NoDirtyCheckingContext.class, DirtyCheckEnhancementContext.class })
 public class DeleteTransientEntityTest {
 
 	@AfterEach
 	void tearDown(SessionFactoryScope scope) {
-		scope.inTransaction( session -> session.createQuery( "from java.lang.Object", Object.class ).list().forEach( session::remove ) );
+		scope.dropData();
 	}
 
 	@Test

hibernate-core/src/test/java/org/hibernate/orm/test/connections/ConnectionManagementTestCase.java

@@ -31,15 +31,9 @@
  */
 
 public abstract class ConnectionManagementTestCase extends BaseNonConfigCoreFunctionalTestCase {
-
-	@Override
-	protected String getBaseForMappings() {
-		return "org/hibernate/orm/test/";
-	}
-
 	@Override
-	public final String[] getMappings() {
-		return new String[] { "connections/Silly.hbm.xml" };
+	protected Class<?>[] getAnnotatedClasses() {
+		return new Class<?>[] { Silly.class, Other.class };
 	}
 
 

hibernate-core/src/test/java/org/hibernate/orm/test/connections/HibernateCreateBlobFailedCase.java

@@ -4,45 +4,37 @@
  */
 package org.hibernate.orm.test.connections;
 
+import org.hibernate.Session;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.Test;
+
 import java.sql.Blob;
 import java.sql.Clob;
 import java.sql.SQLException;
 
-import org.junit.Test;
-
-import org.hibernate.Session;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.cfg.Environment;
-import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
-
-import static org.junit.Assert.assertFalse;
+import static org.hibernate.cfg.AvailableSettings.CURRENT_SESSION_CONTEXT_CLASS;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 /**
  * Test originally developed to verify and fix HHH-5550
  *
  * @author Steve Ebersole
  */
-public class HibernateCreateBlobFailedCase extends BaseCoreFunctionalTestCase {
-
-	@Override
-	protected String getBaseForMappings() {
-		return "org/hibernate/orm/test/";
-	}
-
-	@Override
-	public String[] getMappings() {
-		return new String[] { "connections/Silly.hbm.xml" };
-	}
-
-	@Override
-	public void configure(Configuration cfg) {
-		super.configure( cfg );
-		cfg.setProperty( Environment.CURRENT_SESSION_CONTEXT_CLASS, "thread" );
-	}
+@SuppressWarnings("JUnitMalformedDeclaration")
+@ServiceRegistry(settings = @Setting( name=CURRENT_SESSION_CONTEXT_CLASS, value = "thread"))
+@DomainModel(annotatedClasses = { Silly.class, Other.class })
+@SessionFactory
+public class HibernateCreateBlobFailedCase {
 
 	@Test
-	public void testLobCreation() throws SQLException {
-		Session session = sessionFactory().getCurrentSession();
+	public void testLobCreation(SessionFactoryScope factoryScope) throws SQLException {
+		final SessionFactoryImplementor sessionFactory = factoryScope.getSessionFactory();
+		Session session = sessionFactory.getCurrentSession();
 		session.beginTransaction();
 		Blob blob = session.getLobHelper().createBlob( new byte[] {} );
 		blob.free();

hibernate-core/src/test/java/org/hibernate/orm/test/connections/Other.java

@@ -5,10 +5,17 @@
 package org.hibernate.orm.test.connections;
 
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+
 /**
  * @author Steve Ebersole
  */
+@Entity
 public class Other {
+	@Id
+	@GeneratedValue(generator = "increment")
 	private Long id;
 	private String name;
 

hibernate-core/src/test/java/org/hibernate/orm/test/connections/Silly.java

@@ -3,16 +3,25 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.connections;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+
 import java.io.Serializable;
 
 /**
- * Implementation of Silly.
- *
  * @author Steve Ebersole
  */
+@Entity
 public class Silly implements Serializable {
+	@Id
+	@GeneratedValue(generator = "increment")
 	private Long id;
 	private String name;
+	@ManyToOne
+	@JoinColumn
 	private Other other;
 
 	public Silly() {

hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Address.java

@@ -14,7 +14,7 @@
 public class Address {
 	private Long id;
 	private String info;
-	private Set suites = new HashSet();
+	private Set<Suite> suites = new HashSet<>();
 
 	public Address() {
 	}
@@ -39,11 +39,11 @@ public void setInfo(String info) {
 		this.info = info;
 	}
 
-	public Set getSuites() {
+	public Set<Suite> getSuites() {
 		return suites;
 	}
 
-	public void setSuites(Set suites) {
+	public void setSuites(Set<Suite> suites) {
 		this.suites = suites;
 	}
 }

hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Person.java

@@ -16,8 +16,8 @@
 public class Person {
 	private Long id;
 	private String name;
-	private Set addresses = new HashSet();
-	private Collection friends = new ArrayList();
+	private Set<Address> addresses = new HashSet<>();
+	private Collection<Person> friends = new ArrayList<>();
 
 	public Person() {
 	}
@@ -42,19 +42,19 @@ public void setName(String name) {
 		this.name = name;
 	}
 
-	public Set getAddresses() {
+	public Set<Address> getAddresses() {
 		return addresses;
 	}
 
-	public void setAddresses(Set addresses) {
+	public void setAddresses(Set<Address> addresses) {
 		this.addresses = addresses;
 	}
 
-	public Collection getFriends() {
+	public Collection<Person> getFriends() {
 		return friends;
 	}
 
-	public void setFriends(Collection friends) {
+	public void setFriends(Collection<Person> friends) {
 		this.friends = friends;
 	}
 }

hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Suite.java

@@ -13,7 +13,7 @@
 public class Suite {
 	private Long id;
 	private String location;
-	private Set notes = new HashSet();
+	private Set<Note> notes = new HashSet<>();
 
 	public Suite() {
 	}
@@ -38,11 +38,11 @@ public void setLocation(String location) {
 		this.location = location;
 	}
 
-	public Set getNotes() {
+	public Set<Note> getNotes() {
 		return notes;
 	}
 
-	public void setNotes(Set notes) {
+	public void setNotes(Set<Note> notes) {
 		this.notes = notes;
 	}
 }

hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/Product.java

@@ -3,21 +3,39 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.function;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- *
  * @author Strong Liu
- *
  */
+@Entity
 public class Product {
+	@Id
 	private Long id;
 	private int length;
 	private long weight;
 	private BigDecimal price;
 	private Date date;
 
+	public Product() {
+	}
+
+	public Product(Long id) {
+		this.id = id;
+	}
+
+	public Product(Long id, int length, long weight, BigDecimal price, Date date) {
+		this.id = id;
+		this.length = length;
+		this.weight = weight;
+		this.price = price;
+		this.date = date;
+	}
+
 	public Long getId() {
 		return id;
 	}

hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/SybaseASEFunctionTest.java

@@ -25,23 +25,20 @@
 import org.junit.jupiter.api.Test;
 
 /**
- *
  * @author Richard H. Tingstad
  */
-@DomainModel(
-		xmlMappings = "org/hibernate/orm/test/dialect/function/Product.hbm.xml"
-)
+@DomainModel(annotatedClasses = Product.class)
 @SessionFactory
 @RequiresDialect(value = SybaseASEDialect.class)
-@SuppressWarnings("rawtypes")
+@SuppressWarnings({"rawtypes", "JUnitMalformedDeclaration"})
 public class SybaseASEFunctionTest {
 
 	@BeforeAll
 	protected void prepareTest(SessionFactoryScope scope) throws Exception {
 		scope.inTransaction(
 				session -> {
-					Product product = new Product();
-					product.setPrice(new BigDecimal("0.5"));
+					Product product = new Product( 1L );
+					product.setPrice( new BigDecimal("0.5") );
 					product.setDate( Calendar.getInstance().getTime() );
 					session.persist( product );
 				}
@@ -50,9 +47,7 @@ protected void prepareTest(SessionFactoryScope scope) throws Exception {
 
 	@AfterAll
 	protected void cleanupTest(SessionFactoryScope scope) throws Exception {
-		scope.inTransaction(
-				session -> session.createQuery( "delete from Product" ).executeUpdate()
-		);
+		scope.dropData();
 	}
 
 	@Test