HHH-19846 - Remove JUnit4: org.hibernate.orm.test.jpa.jointable

Signed-off-by: Jan Schatteman <[email protected]>

Author: jrenaat

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jointable/ManyToOneJoinTableTest.java

@@ -4,25 +4,22 @@
  */
 package org.hibernate.orm.test.jpa.jointable;
 
-import java.util.LinkedList;
+import java.util.List;
 
-import org.hibernate.boot.SessionFactoryBuilder;
-import org.hibernate.boot.spi.MetadataImplementor;
 import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
 
-import org.hibernate.testing.jdbc.SQLStatementInterceptor;
+import org.hibernate.testing.jdbc.SQLStatementInspector;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
-import org.hibernate.testing.orm.junit.SessionFactoryProducer;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 /**
  * @author Christian Beikov
@@ -38,32 +35,31 @@
 				@Setting(name = AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION, value = "create-drop")
 		}
 )
-@SessionFactory
-public class ManyToOneJoinTableTest implements SessionFactoryProducer {
-	private SQLStatementInterceptor sqlStatementInterceptor;
+@SessionFactory(useCollectingStatementInspector = true)
+public class ManyToOneJoinTableTest {
+	private SQLStatementInspector sqlStatementInspector;
 
-	@Override
-	public SessionFactoryImplementor produceSessionFactory(MetadataImplementor model) {
-		final SessionFactoryBuilder sessionFactoryBuilder = model.getSessionFactoryBuilder();
-		sqlStatementInterceptor = new SQLStatementInterceptor( sessionFactoryBuilder );
-		return (SessionFactoryImplementor) sessionFactoryBuilder.build();
+	@BeforeEach
+	public void setup(SessionFactoryScope scope) {
+		sqlStatementInspector = scope.getCollectingStatementInspector();
+		sqlStatementInspector.clear();
 	}
 
 	@Test
 	public void testAvoidJoin(SessionFactoryScope scope) {
 		final String queryString = "SELECT e.id FROM Person e";
 		scope.inTransaction(
 				session -> {
-					final LinkedList<String> sqlQueries = sqlStatementInterceptor.getSqlQueries();
+					final List<String> sqlQueries = sqlStatementInspector.getSqlQueries();
 					sqlQueries.clear();
 					session.createQuery( queryString ).list();
 					assertThat( sqlQueries.size(), is( 1 ) );
 					// Ideally, we could detect that *ToOne join tables aren't used, but that requires tracking the uses of properties
 					// Since *ToOne join tables are treated like secondary or subclass/superclass tables, the proper fix will allow many more optimizations
-					String generatedSQl = sqlQueries.getFirst();
+					String generatedSQl = sqlQueries.get( 0 );
 					assertFalse(
-							"The generated sql contains a useless join: " + generatedSQl,
-							generatedSQl.contains( "join" )
+							generatedSQl.contains( "join" ),
+							"The generated sql contains a useless join: " + generatedSQl
 					);
 				}
 		);