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

Author: sebersole

hibernate-core/src/main/resources/org/hibernate/xsd/mapping/mapping-7.0.xsd

@@ -3302,7 +3302,10 @@
                     </xsd:choice>
                     <xsd:choice>
                         <xsd:sequence>
-                            <xsd:element name="map-key-column" type="orm:map-key-column" minOccurs="0"/>
+                            <xsd:choice minOccurs="0">
+                                <xsd:element name="map-key-column" type="orm:map-key-column" minOccurs="0"/>
+                                <xsd:element name="map-key-formula" type="xsd:string" minOccurs="0"/>
+                            </xsd:choice>
                             <xsd:element name="map-key-type" type="orm:user-type" minOccurs="0"/>
                         </xsd:sequence>
                         <xsd:sequence>

hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/IterateOverListInTheSetMethodTest.java

@@ -19,20 +19,16 @@
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
+@SuppressWarnings("JUnitMalformedDeclaration")
 @DomainModel(
-		xmlMappings = "org/hibernate/orm/test/collection/list/ParentChildMapping.hbm.xml"
+		xmlMappings = "org/hibernate/orm/test/collection/list/ParentChildMapping.xml"
 )
 @SessionFactory
 public class IterateOverListInTheSetMethodTest {
 
 	@AfterEach
 	public void tearDown(SessionFactoryScope scope) {
-		scope.inTransaction(
-				session -> {
-					session.createMutationQuery( "delete from Child" ).executeUpdate();
-					session.createMutationQuery( "delete from Parent" ).executeUpdate();
-				}
-		);
+		scope.dropData();
 	}
 
 

hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/PersistentListTest.java

@@ -32,9 +32,8 @@
  *
  * @author Steve Ebersole
  */
-@DomainModel(
-		xmlMappings = "org/hibernate/orm/test/collection/list/Mappings.hbm.xml"
-)
+@SuppressWarnings("JUnitMalformedDeclaration")
+@DomainModel(xmlMappings = "org/hibernate/orm/test/collection/list/Mappings.xml")
 @SessionFactory
 public class PersistentListTest {
 
@@ -131,9 +130,9 @@ public void testInverseListIndex2(SessionFactoryScope scope) {
 							connection -> {
 								SimpleSelect select = new SimpleSelect( sessionFactory )
 										.setTableName( collectionPersister.getTableName() )
-										.addColumn( "order_id" )
-										.addColumn( "INDX" )
-										.addColumn( "PRD_CODE" );
+										.addColumn( "order_fk" )
+										.addColumn( "list_index" )
+										.addColumn( "prod_code" );
 								final String sql = select.toStatementString();
 								PreparedStatement preparedStatement = ( (SessionImplementor) session2 ).getJdbcCoordinator()
 										.getStatementPreparer()

hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/Parent.java

@@ -13,7 +13,7 @@
  */
 public class Parent {
 	private String name;
-	private Map children = new HashMap();
+	private Map<String,Child> children = new HashMap<>();
 
 	public Parent() {
 	}
@@ -30,11 +30,11 @@ public void setName(String name) {
 		this.name = name;
 	}
 
-	public Map getChildren() {
+	public Map<String,Child> getChildren() {
 		return children;
 	}
 
-	public void setChildren(Map children) {
+	public void setChildren(Map<String,Child> children) {
 		this.children = children;
 	}
 

hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/PersistentMapTest.java

@@ -43,7 +43,7 @@
  * @author Gail Badner
  */
 @DomainModel(
-		xmlMappings = "org/hibernate/orm/test/collection/map/Mappings.hbm.xml",
+		xmlMappings = "org/hibernate/orm/test/collection/map/Mappings.xml",
 		annotatedClasses = {
 				PersistentMapTest.User.class,
 				PersistentMapTest.UserData.class,

hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/CollectionTest.java

@@ -28,10 +28,11 @@
 /**
  * @author Gavin King
  */
+@SuppressWarnings("JUnitMalformedDeclaration")
 @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsNoColumnInsert.class)
 @DomainModel(xmlMappings = {
 		"org/hibernate/orm/test/collection/original/UserPermissions.hbm.xml",
-		"org/hibernate/orm/test/collection/original/Zoo.hbm.xml",
+		"org/hibernate/orm/test/collection/original/Zoo.xml",
 })
 @SessionFactory
 public class CollectionTest {

hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/Zoo.java

@@ -8,18 +8,18 @@
 
 public class Zoo {
 	long id;
-	List animals = new ArrayList();
+	List<Animal> animals = new ArrayList<>();
 
 	public long getId() {
 		return id;
 	}
 	public void setId( long id ) {
 		this.id = id;
 	}
-	public List getAnimals() {
+	public List<Animal> getAnimals() {
 		return animals;
 	}
-	public void setAnimals(List animals) {
+	public void setAnimals(List<Animal> animals) {
 		this.animals = animals;
 	}
 

hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/Parent.java

@@ -13,7 +13,7 @@
  */
 public class Parent {
 	private String name;
-	private Set children = new HashSet();
+	private Set<Child> children = new HashSet<>();
 
 	public Parent() {
 	}
@@ -30,11 +30,11 @@ public void setName(String name) {
 		this.name = name;
 	}
 
-	public Set getChildren() {
+	public Set<Child> getChildren() {
 		return children;
 	}
 
-	public void setChildren(Set children) {
+	public void setChildren(Set<Child> children) {
 		this.children = children;
 	}
 }

hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/PersistentSetNonLazyTest.java

@@ -10,22 +10,23 @@
  */
 
 import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.FailureExpected;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.Test;
 
+@SuppressWarnings("JUnitMalformedDeclaration")
 @DomainModel(
-		xmlMappings = "org/hibernate/orm/test/collection/set/Mappings.hbm.xml",
+		xmlMappings = "org/hibernate/orm/test/collection/set/MappingsNonLazy.xml",
 		concurrencyStrategy = "nonstrict-read-write"
 )
 @SessionFactory(generateStatistics = true)
 public class PersistentSetNonLazyTest extends PersistentSetTest {
 
 	@Test
-//	@FailureExpected(
-//			jiraKey = "HHH-3799",
-//			reason = "known to fail with non-lazy collection using query cache"
-//	)
+	@JiraKey("HHH-3799")
+	@FailureExpected(reason = "known to fail with non-lazy collection using query cache")
 	public void testLoadChildCheckParentContainsChildCache(SessionFactoryScope scope) {
 		super.testLoadChildCheckParentContainsChildCache( scope );
 	}

hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/PersistentSetTest.java

@@ -31,20 +31,17 @@
 /**
  * @author Steve Ebersole
  */
-@DomainModel(
-		xmlMappings = "org/hibernate/orm/test/collection/set/Mappings.hbm.xml"
-)
+@SuppressWarnings("JUnitMalformedDeclaration")
+@DomainModel(xmlMappings = "org/hibernate/orm/test/collection/set/Mappings.xml")
 @SessionFactory(generateStatistics = true)
-@ServiceRegistry(
-		settings = {
-				@Setting(
-						name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "true"
-				),
-				@Setting(
-						name = AvailableSettings.USE_QUERY_CACHE, value = "true"
-				)
-		}
-)
+@ServiceRegistry(settings = {
+	@Setting(
+			name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "true"
+	),
+	@Setting(
+			name = AvailableSettings.USE_QUERY_CACHE, value = "true"
+	)
+})
 public class PersistentSetTest {
 
 	@Test