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

Author: sebersole

hibernate-core/src/test/java/org/hibernate/orm/test/cfg/CacheableFileTest.java

@@ -0,0 +1,50 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.cfg;
+
+import org.hibernate.metamodel.mapping.AttributeMapping;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.testing.orm.junit.DomainModel;
+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;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Chris Cranford
+ */
+@SuppressWarnings("JUnitMalformedDeclaration")
+@JiraKey(value ="HHH-12199")
+@DomainModel(xmlMappings = "org/hibernate/orm/test/cfg/FooEntity.xml")
+@SessionFactory
+public class PropertyAccessTypeDetectionTest {
+	public static class FooEntity {
+		public static final String intValue = "intValue";
+
+		private Long id;
+		private Integer _intValue;
+
+		public Long getId() { return id; }
+		public void setId(Long id) { this.id = id; }
+
+		public Integer getIntValue() { return _intValue; }
+		public void setIntValue(Integer intValue) { this._intValue = intValue; }
+	}
+
+	@Test
+	public void testPropertyAccessIgnoresStaticFields(SessionFactoryScope factoryScope) {
+		// verify that the entity persister is configured with property intValue as an Integer rather than
+		// using the static field reference and determining the type to be String.
+		final EntityPersister entityDescriptor = factoryScope
+				.getSessionFactory()
+				.getMappingMetamodel()
+				.getEntityDescriptor( FooEntity.class );
+		final AttributeMapping attributeMapping = entityDescriptor.findAttributeMapping( "intValue" );
+		assertThat( attributeMapping ).isNotNull();
+		assertThat( attributeMapping.getJavaType().getJavaTypeClass() ).isAssignableFrom( Integer.class );
+	}
+}

hibernate-core/src/test/java/org/hibernate/orm/test/cfg/PropertyAccessTypeDetectionTest.java

@@ -0,0 +1,19 @@
+<?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.cfg</package>
+
+    <entity class="PropertyAccessTypeDetectionTest$FooEntity">
+        <table name="foo_entity"/>
+        <attributes>
+            <id name="id"/>
+            <basic name="intValue" />
+        </attributes>
+    </entity>
+
+</entity-mappings>