HHH-18829 Test - order of record components must match order of properties in entity class

Author: cigaly

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh18829/HHH18829Test.java

@@ -41,7 +41,7 @@ void setUp(SessionFactoryScope sessionFactoryScope) {
 	public void test(SessionFactoryScope sessionFactoryScope)
 			throws ClassNotFoundException, InvocationTargetException, InstantiationException, IllegalAccessException {
 		final var idClass = Class.forName( EmployeeWithoutIdClass.class.getName() + "_$Id" );
-		final var id = idClass.getConstructors()[0].newInstance( 1, "John Doe" );
+		final var id = idClass.getConstructors()[0].newInstance( "John Doe", 1 );
 		final var employees = sessionFactoryScope.fromSession(
 				sess -> sess.createQuery( "from EmployeeWithoutIdClass where id=:id", EmployeeWithoutIdClass.class ).setParameter( "id", id )
 						.getResultList()

tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh18829/AnotherEmployee.java

@@ -9,18 +9,9 @@
 
 @Entity
 public class AnotherEmployee extends Address {
-	String empName;
-
 	Integer empId;
 
-	@Id
-	public String getEmpName() {
-		return empName;
-	}
-
-	public void setEmpName(String empName) {
-		this.empName = empName;
-	}
+	String empName;
 
 	@Id
 	public Integer getEmpId() {
@@ -30,4 +21,13 @@ public Integer getEmpId() {
 	public void setEmpId(Integer empId) {
 		this.empId = empId;
 	}
+
+	@Id
+	public String getEmpName() {
+		return empName;
+	}
+
+	public void setEmpName(String empName) {
+		this.empName = empName;
+	}
 }

tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh18829/HHH18829Test.java

@@ -10,9 +10,11 @@
 import org.hibernate.processor.test.util.WithClasses;
 import org.junit.Test;
 
+import java.lang.reflect.RecordComponent;
 import java.util.Arrays;
 
 import static org.hibernate.processor.test.util.TestUtil.getMetamodelClassFor;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @TestForIssue(jiraKey = " HHH-18829")
@@ -27,23 +29,25 @@ public void test() {
 		System.out.println( TestUtil.getMetaModelSourceAsString( Address.class ) );
 		System.out.println( TestUtil.getMetaModelSourceAsString( EmployeeWithIdClass.class ) );
 
-		checkIfIdClassIsGenerated( Employee.class );
-		checkIfIdClassIsGenerated( AnotherEmployee.class );
+		checkIfIdClassIsGenerated( Employee.class, new String[] {"empName", "empId"} );
+		checkIfIdClassIsGenerated( AnotherEmployee.class, new String[] {"empId", "empName"} );
 
 		final var clazz = getMetamodelClassFor( EmployeeWithIdClass.class );
 		assertTrue( Arrays.stream( clazz.getClasses() ).map( Class::getSimpleName )
 						.noneMatch( "Id"::equals ),
 				"EmployeeWithIdClass_ should not have inner class Id" );
 	}
 
-	private static void checkIfIdClassIsGenerated(Class<?> entityClass) {
+	private static void checkIfIdClassIsGenerated(Class<?> entityClass, String[] idComponentNames) {
 		final var clazz = getMetamodelClassFor( entityClass );
 		final var maybeIdClass = Arrays.stream( clazz.getClasses() )
 				.filter( c -> c.getSimpleName().equals( "Id" ) ).findAny();
 		assertTrue( maybeIdClass.isPresent(), () -> clazz.getSimpleName() + "_ should have inner class Id" );
 		final Class<?> idClass = maybeIdClass.get();
 		assertTrue( idClass.isRecord(), "Generated ID class should be a record" );
-		final var recordComponents = idClass.getRecordComponents();
-		// TODO : Check record components
+		assertArrayEquals(
+				idComponentNames,
+				Arrays.stream( idClass.getRecordComponents() ).map( RecordComponent::getName ).toArray( String[]::new )
+		);
 	}
 }