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

Author: sebersole

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/InvocationTargetExceptionTest.java

@@ -4,56 +4,48 @@
  */
 package org.hibernate.orm.test.bytecode;
 
-import java.text.ParseException;
-
 import org.hibernate.Hibernate;
-import org.hibernate.Session;
-
-import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.fail;
-
-public class InvocationTargetExceptionTest extends BaseCoreFunctionalTestCase {
+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;
 
-	@Override
-	protected String getBaseForMappings() {
-		return "org/hibernate/orm/test/";
-	}
+import java.text.ParseException;
 
-	@Override
-	public String[] getMappings() {
-		return new String[] { "bytecode/Bean.hbm.xml" };
-	}
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.fail;
 
+@SuppressWarnings("JUnitMalformedDeclaration")
+@DomainModel(xmlMappings = "org/hibernate/orm/test/bytecode/Bean.xml")
+@SessionFactory
+public class InvocationTargetExceptionTest {
 	@Test
-	public void testProxiedInvocationException() {
-		Session s = openSession();
-		s.beginTransaction();
-		Bean bean = new Bean();
-		bean.setSomeString( "my-bean" );
-		s.persist( bean );
-		s.getTransaction().commit();
-		s.close();
-
-		s = openSession();
-		s.beginTransaction();
-		bean = ( Bean ) s.getReference( Bean.class, bean.getSomeString() );
-		assertFalse( Hibernate.isInitialized( bean ) );
-		try {
-			bean.throwException();
-			fail( "exception not thrown" );
-		}
-		catch ( ParseException e ) {
-			// expected behavior
-		}
-		catch ( Throwable t ) {
-			fail( "unexpected exception type : " + t );
-		}
+	public void testProxiedInvocationException(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (s) -> {
+			Bean bean = new Bean();
+			bean.setSomeString( "my-bean" );
+			s.persist( bean );
+		} );
+
+		factoryScope.inTransaction( (s) -> {
+			Bean bean = s.getReference( Bean.class, "my-bean" );
+			assertThat( Hibernate.isInitialized( bean ) ).isFalse();
+			try {
+				bean.throwException();
+				fail( "exception not thrown" );
+			}
+			catch ( ParseException e ) {
+				// expected behavior
+			}
+			catch ( Throwable t ) {
+				fail( "unexpected exception type : " + t );
+			}
+		} );
+	}
 
-		s.remove( bean );
-		s.getTransaction().commit();
-		s.close();
+	@AfterEach
+	public void dropTestData(SessionFactoryScope factoryScope) throws Exception {
+		factoryScope.dropData();
 	}
 }

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/ProxyBean.java

@@ -15,8 +15,8 @@
 				<generated-value generator="increment"/>
 			</id>
 			<one-to-many name="bs" target-entity="B" fetch-mode="JOIN">
-				<join-column name="a_fk"/>
 				<order-column name="idx"/>
+				<join-column name="a_fk"/>
 				<cascade>
 					<cascade-all/>
 				</cascade>

hibernate-core/src/test/resources/org/hibernate/orm/test/array/A.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!--
+  ~ SPDX-License-Identifier: Apache-2.0
+  ~ Copyright Red Hat Inc. and Hibernate Authors
+  -->
+<entity-mappings xmlns="http://www.hibernate.org/xsd/orm/mapping"
+				 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+				 version="7.0">
+	<package>org.hibernate.orm.test.bytecode</package>
+
+	<entity class="Bean">
+		<attributes>
+			<id name="someString"/>
+			<basic name="someLong">
+				<column name="some_long"/>
+			</basic>
+			<basic name="someInteger">
+				<column name="some_integer"/>
+			</basic>
+			<basic name="someDate">
+				<column name="some_date"/>
+				<temporal>TIMESTAMP</temporal>
+			</basic>
+			<basic name="somelong">
+				<column name="some_long2"/>
+			</basic>
+			<basic name="someint">
+				<column name="some_integer2"/>
+			</basic>
+			<basic name="someObject">
+				<column name="some_obj"/>
+				<jdbc-type-code>2004</jdbc-type-code>
+			</basic>
+		</attributes>
+	</entity>
+</entity-mappings>