From 343eda7b141ea6245a002f9712adae50f5db7532 Mon Sep 17 00:00:00 2001
From: Marco Belladelli <marco@hibernate.org>
Date: Tue, 14 Mar 2023 12:03:41 +0100
Subject: [PATCH] HHH-16234 Add test for issue

---
 .../loading/EntityLoadingLoggingTest.java     | 132 ++++++++++++++++++
 1 file changed, 132 insertions(+)
 create mode 100644 hibernate-core/src/test/java/org/hibernate/orm/test/loading/EntityLoadingLoggingTest.java

diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/EntityLoadingLoggingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/EntityLoadingLoggingTest.java
new file mode 100644
index 0000000000..b68a4a501a
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/EntityLoadingLoggingTest.java
@@ -0,0 +1,132 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later
+ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ */
+
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later
+ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ */
+package org.hibernate.orm.test.loading;
+
+import org.hibernate.sql.results.graph.entity.EntityLoadingLogging;
+
+import org.hibernate.testing.logger.LogInspectionHelper;
+import org.hibernate.testing.logger.TriggerOnPrefixLogListener;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@SessionFactory
+@DomainModel( annotatedClasses = {
+		EntityLoadingLoggingTest.Parent.class,
+		EntityLoadingLoggingTest.Child.class
+} )
+@Jira( "https://hibernate.atlassian.net/browse/HHH-16234" )
+public class EntityLoadingLoggingTest {
+	private TriggerOnPrefixLogListener trigger;
+
+	@BeforeAll
+	public void setUp(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final Parent parent = new Parent( "parent_1" );
+			final Child child = new Child( parent );
+			session.persist( parent );
+			session.persist( child );
+		} );
+	}
+
+	@BeforeEach
+	public void setUp() {
+		trigger = new TriggerOnPrefixLogListener( "(EntityResultInitializer) Created new entity instance" );
+		LogInspectionHelper.registerListener( trigger, EntityLoadingLogging.ENTITY_LOADING_LOGGER );
+	}
+
+	@AfterEach
+	public void reset() {
+		trigger.reset();
+	}
+
+	@AfterAll
+	public static void tearDown(SessionFactoryScope scope) {
+		LogInspectionHelper.clearAllListeners( EntityLoadingLogging.ENTITY_LOADING_LOGGER );
+		scope.inTransaction( session -> {
+			session.createMutationQuery( "delete from Child" ).executeUpdate();
+			session.createMutationQuery( "delete from Parent" ).executeUpdate();
+		} );
+	}
+
+	@Test
+	public void test(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final Child child = session.find( Child.class, 1L );
+			assertThat( child.getParent().getId() ).isEqualTo( "parent_1" );
+			// uncomment logger.results-loading-entity.name in log4j2.properties to verify log
+			// assertThat( trigger.wasTriggered() ).as( "Log should be triggered" ).isTrue();
+		} );
+	}
+
+	@Entity( name = "Parent" )
+	public static class Parent {
+		@Id
+		private String id;
+
+		public Parent() {
+		}
+
+		public Parent(String id) {
+			this.id = id;
+		}
+
+		public String getId() {
+			return id;
+		}
+	}
+
+	@Entity( name = "Child" )
+	public static class Child {
+		@Id
+		@GeneratedValue
+		private Long id;
+
+		@ManyToOne( optional = false )
+		private Parent parent;
+
+		public Child() {
+		}
+
+		public Child(Parent parent) {
+			this.parent = parent;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public Parent getParent() {
+			return parent;
+		}
+
+		@Override
+		public String toString() {
+			return id + "-" + parent.getId();
+		}
+	}
+}