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

Author: sebersole

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/Hammer.java

@@ -4,21 +4,30 @@
  */
 package org.hibernate.orm.test.annotations.bytecode;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
 
 /**
  * @author Emmanuel Bernard
  */
+@Entity
 public class Hammer implements Tool {
 	private Long id;
 
+	@Id
+	@GeneratedValue(generator = "increment")
+	@Override
 	public Long getId() {
 		return id;
 	}
 
+	@Override
 	public void setId(Long id) {
 		this.id = id;
 	}
 
+	@Override
 	public Integer usage() {
 		return 0;
 	}

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/ProxyBreakingTest.java

@@ -5,39 +5,39 @@
 package org.hibernate.orm.test.annotations.bytecode;
 
 import org.hibernate.Hibernate;
-import org.hibernate.Session;
-import org.hibernate.Transaction;
+import org.hibernate.testing.orm.junit.DomainModel;
+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.Test;
 
-import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Emmanuel Bernard
  */
-public class ProxyBreakingTest extends BaseCoreFunctionalTestCase {
+@SuppressWarnings("JUnitMalformedDeclaration")
+@DomainModel(annotatedClasses = {Tool.class, Hammer.class})
+@SessionFactory
+public class ProxyBreakingTest {
 	@Test
-	public void testProxiedBridgeMethod() throws Exception {
-		//bridge methods should not be proxied
-		Session s = openSession();
-		Transaction tx = s.beginTransaction();
-		Hammer h = new Hammer();
-		s.persist(h);
-		s.flush();
-		s.clear();
-		assertNotNull( "The proxy creation failure is breaking things", h.getId() );
-		h = (Hammer) s.getReference( Hammer.class, h.getId() );
-		assertFalse( Hibernate.isInitialized( h ) );
-		tx.rollback();
-		s.close();
+	public void testProxiedBridgeMethod(SessionFactoryScope factoryScope) {
+		final Hammer persisted = factoryScope.fromTransaction( (session) -> {
+			final Hammer hammer = new Hammer();
+			session.persist( hammer );
+			return hammer;
+		} );
+
+		assertThat( persisted.getId() ).isNotNull();
+
+		factoryScope.inTransaction( (session) -> {
+			final Hammer reference = session.getReference( Hammer.class, persisted.getId() );
+			assertThat( Hibernate.isInitialized( reference ) ).isFalse();
+		} );
 	}
 
-	@Override
-	protected String[] getOrmXmlFiles() {
-		return new String[] {
-				"org/hibernate/orm/test/annotations/bytecode/Hammer.hbm.xml"
-		};
+	@AfterEach
+	void dropTestData(SessionFactoryScope factoryScope) {
+		factoryScope.dropData();
 	}
 }

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/Tool.java

@@ -4,14 +4,12 @@
  */
 package org.hibernate.orm.test.annotations.bytecode;
 
-
 /**
  * @author Emmanuel Bernard
  */
 public interface Tool {
-	public Long getId();
-
-	public void setId(Long id);
+	Long getId();
+	void setId(Long id);
 
-	public Number usage();
+	Number usage();
 }