HHH-19424 Continue switching tests using hbm.xml to use mapping.xml

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullFalseDelayedInsertTest.java

@@ -20,7 +20,7 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.hbm.xml"
+				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.orm.xml"
 		}
 )
 @ServiceRegistry(

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullTrueDelayedInsertTest.java

@@ -20,7 +20,7 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.hbm.xml"
+				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.orm.xml"
 		}
 )
 @ServiceRegistry(

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullibilityFalseTest.java

@@ -20,7 +20,7 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.hbm.xml"
+				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.orm.xml"
 		}
 )
 @ServiceRegistry(

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullibilityTrueTest.java

@@ -20,7 +20,7 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.hbm.xml"
+				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.orm.xml"
 		}
 )
 @ServiceRegistry(

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeDelayedInsertTest.java

@@ -20,7 +20,7 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.hbm.xml"
+				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.orm.xml"
 		}
 )
 @ServiceRegistry(

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeTest.java

@@ -39,7 +39,7 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.hbm.xml"
+				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.orm.xml"
 		}
 )
 @ServiceRegistry(

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultiPathCascadeTest.java

@@ -30,7 +30,7 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/MultiPathCascade.hbm.xml"
+				"org/hibernate/orm/test/cascade/MultiPathCascade.orm.xml"
 		}
 )
 @SessionFactory

hibernate-core/src/test/java/org/hibernate/orm/test/cascade/BidirectionalOneToManyCascadeTest.java

@@ -25,9 +25,9 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/Child.hbm.xml",
-				"org/hibernate/orm/test/cascade/DeleteOrphanChild.hbm.xml",
-				"org/hibernate/orm/test/cascade/Parent.hbm.xml"
+				"org/hibernate/orm/test/cascade/Child.orm.xml",
+				"org/hibernate/orm/test/cascade/DeleteOrphanChild.orm.xml",
+				"org/hibernate/orm/test/cascade/Parent.orm.xml"
 		}
 )
 @SessionFactory

hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeTestWithAssignedParentIdTest.java

@@ -23,8 +23,8 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/ChildForParentWithAssignedId.hbm.xml",
-				"org/hibernate/orm/test/cascade/ParentWithAssignedId.hbm.xml"
+				"org/hibernate/orm/test/cascade/ChildForParentWithAssignedId.orm.xml",
+				"org/hibernate/orm/test/cascade/ParentWithAssignedId.orm.xml"
 		}
 )
 @SessionFactory

hibernate-core/src/test/java/org/hibernate/orm/test/cascade/MultiPathCascadeTest.java

@@ -24,7 +24,7 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/MultiPathCascade.hbm.xml"
+				"org/hibernate/orm/test/cascade/MultiPathCascade.orm.xml"
 		}
 )
 @SessionFactory

hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/CascadeMergeToChildBeforeParentTest.java

@@ -38,7 +38,7 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/circle/CascadeMergeToChildBeforeParent.hbm.xml"
+				"org/hibernate/orm/test/cascade/circle/CascadeMergeToChildBeforeParent.orm.xml"
 		}
 )
 @SessionFactory

hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullFalseDelayedInsertTest.java

@@ -16,7 +16,7 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.hbm.xml"
+				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.orm.xml"
 		}
 )
 @SessionFactory

hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullTrueDelayedInsertTest.java

@@ -16,7 +16,7 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.hbm.xml"
+				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.orm.xml"
 		}
 )
 @SessionFactory

hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullibilityFalseTest.java

@@ -16,7 +16,7 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.hbm.xml"
+				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.orm.xml"
 		}
 )
 @SessionFactory

hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullibilityTrueTest.java

@@ -16,7 +16,7 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.hbm.xml"
+				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.orm.xml"
 		}
 )
 @SessionFactory

hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsertTest.java

@@ -16,7 +16,7 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.hbm.xml"
+				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.orm.xml"
 		}
 )
 @SessionFactory

hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeTest.java

@@ -35,7 +35,7 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.hbm.xml"
+				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.orm.xml"
 		}
 )
 @SessionFactory

hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneFetchModeJoinWhereTest.java

@@ -52,7 +52,7 @@ void dropTestData(SessionFactoryScope factoryScope) {
 
 	@Test
 	@JiraKey(value = "HHH-12104")
-	@FailureExpected
+	@FailureExpected(jiraKey = "HHH-2737")
 	public void testAssociatedWhereClause(SessionFactoryScope factoryScope) {
 		var product = new Product();
 		var category = new Category();

hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerManyToOneFetchModeJoinWhereTest.java → hibernate-core/src/test/java/org/hibernate/orm/test/where/xml/EagerManyToOneFetchModeJoinWhereTest.java

@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.where.hbm;
+package org.hibernate.orm.test.where.xml;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -23,18 +23,17 @@
 /**
  * @author Gail Badner
  */
-@SuppressWarnings("JUnitMalformedDeclaration")
-@DomainModel(xmlMappings = "hbm/where/EagerManyToOneFetchModeJoinWhereTest.hbm.xml")
-@SessionFactory(exportSchema = false)
+@DomainModel(xmlMappings = "mappings/where/EagerManyToOneFetchModeJoinWhereTest.orm.xml")
+@SessionFactory
 public class EagerManyToOneFetchModeJoinWhereTest {
 	@AfterEach
 	void dropTestData(SessionFactoryScope factoryScope) {
 		factoryScope.dropData();
 	}
 
 	@Test
-	@JiraKey( value = "HHH-12104" )
-	@FailureExpected( jiraKey = "HHH-12104")
+	@JiraKey( value = "HHH-2737" )
+	@FailureExpected( jiraKey = "HHH-2737")
 	public void testAssociatedWhereClause(SessionFactoryScope factoryScope) {
 		var product = new Product();
 		var category = new Category();
@@ -44,9 +43,9 @@ public void testAssociatedWhereClause(SessionFactoryScope factoryScope) {
 		product.containedCategory.category = category;
 		product.containedCategories.add( new ContainedCategory( category ) );
 
-		factoryScope.inTransaction( (session) -> {
-			session.persist( product );
-		} );
+		factoryScope.inTransaction( (session) ->
+				session.persist( product )
+		);
 
 		factoryScope.inTransaction( (session) -> {
 			var p = session.find( Product.class, product.id );

hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerManyToOneFetchModeSelectWhereTest.java → hibernate-core/src/test/java/org/hibernate/orm/test/where/xml/EagerManyToOneFetchModeSelectWhereTest.java

@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.where.hbm;
+package org.hibernate.orm.test.where.xml;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -28,7 +28,7 @@
  */
 @SuppressWarnings("JUnitMalformedDeclaration")
 @ServiceRegistry(settings = @Setting(name=IMPLICIT_NAMING_STRATEGY, value = "legacy-jpa"))
-@DomainModel(xmlMappings = "hbm/where/EagerManyToOneFetchModeSelectWhereTest.hbm.xml")
+@DomainModel(xmlMappings = "mappings/where/EagerManyToOneFetchModeSelectWhereTest.orm.xml")
 @SessionFactory
 public class EagerManyToOneFetchModeSelectWhereTest {
 	@AfterEach
@@ -47,9 +47,9 @@ public void testAssociatedWhereClause(SessionFactoryScope factoryScope) {
 		product.containedCategory.category = category;
 		product.containedCategories.add( new ContainedCategory( category ) );
 
-		factoryScope.inTransaction( (session) -> {
-			session.persist( product );
-		} );
+		factoryScope.inTransaction( (session) ->
+				session.persist( product )
+		);
 
 		factoryScope.inTransaction( (session) -> {
 			var p = session.find( Product.class, product.id );

hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerToManyWhereTest.java → hibernate-core/src/test/java/org/hibernate/orm/test/where/xml/EagerToManyWhereTest.java

@@ -2,8 +2,10 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.where.hbm;
+package org.hibernate.orm.test.where.xml;
 
+import org.hibernate.orm.test.where.hbm.Category;
+import org.hibernate.orm.test.where.hbm.Product;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.SessionFactory;
@@ -27,7 +29,7 @@
  * @author Gail Badner
  */
 @SuppressWarnings("JUnitMalformedDeclaration")
-@DomainModel(xmlMappings = "hbm/where/EagerToManyWhere.hbm.xml")
+@DomainModel(xmlMappings = "mappings/where/EagerToManyWhere.orm.xml")
 @SessionFactory
 public class EagerToManyWhereTest {
 	@AfterEach