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

HHH-19433 - Deprecate @PropertyRef

Author: sebersole

gradle.properties

@@ -1,4 +1,4 @@
-db=pgsql_ci
+db=h2
 
 # Keep all these properties in sync unless you know what you are doing!
 # We set '-Dlog4j2.disableJmx=true' to prevent classloader leaks triggered by the logger.

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/AggressiveReleaseTest.java

@@ -4,27 +4,24 @@
  */
 package org.hibernate.orm.test.connections;
 
-import java.sql.Connection;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 import org.hibernate.ScrollableResults;
 import org.hibernate.Session;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Environment;
-import org.hibernate.dialect.H2Dialect;
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
 import org.hibernate.internal.util.SerializationHelper;
 import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
 import org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorBuilderImpl;
 import org.hibernate.stat.Statistics;
-
-import org.hibernate.testing.RequiresDialect;
 import org.hibernate.testing.jta.TestingJtaBootstrap;
 import org.hibernate.testing.jta.TestingJtaPlatformImpl;
 import org.junit.Test;
 
+import java.sql.Connection;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -34,7 +31,6 @@
  *
  * @author Steve Ebersole
  */
-@RequiresDialect(H2Dialect.class)
 public class AggressiveReleaseTest extends ConnectionManagementTestCase {
 	@Override
 	protected void addSettings(Map<String,Object> settings) {

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 };
 	}
 
 
@@ -151,8 +145,11 @@ public final void testConnectedSerialization() throws Throwable {
 	}
 
 	/**
-	 * Tests to validate that a session holding JDBC resources will not
+	 * Tests to validate that a session holding an enabled filter will not
 	 * be allowed to serialize.
+	 *
+	 * @apiNote This test is really misplaced as it has nothing to do with
+	 * connection-management nor even JDBC at all.
 	 */
 	@Test
 	public final void testEnabledFilterSerialization() throws Throwable {

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,28 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.connections;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import org.hibernate.annotations.FilterDef;
+
 import java.io.Serializable;
 
 /**
- * Implementation of Silly.
- *
  * @author Steve Ebersole
  */
+@Entity
+@FilterDef(name = "nameIsNull", defaultCondition = "name is null")
 public class Silly implements Serializable {
+	@Id
+	@GeneratedValue(generator = "increment")
 	private Long id;
 	private String name;
+	@ManyToOne(cascade = CascadeType.ALL)
+	@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;
 	}
 }