Various code cleanup

Author: sebersole

hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/JoinedSubclassNativeQueryTest.java

@@ -4,75 +4,77 @@
  */
 package org.hibernate.orm.test.hql.joinedSubclass;
 
-import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.type.SqlTypes;
-
-import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.orm.junit.DomainModel;
-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.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-
 import jakarta.persistence.Basic;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.Inheritance;
 import jakarta.persistence.InheritanceType;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+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.hibernate.type.SqlTypes;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.Locale;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Jan Schatteman
  */
-@DomainModel(
-		annotatedClasses = {
-				JoinedSubclassNativeQueryTest.Person.class,
-				JoinedSubclassNativeQueryTest.Employee.class
-		}
-)
+@DomainModel( annotatedClasses = {
+		JoinedSubclassNativeQueryTest.Person.class,
+		JoinedSubclassNativeQueryTest.Employee.class
+} )
 @SessionFactory
+@SuppressWarnings("JUnitMalformedDeclaration")
 public class JoinedSubclassNativeQueryTest {
 
-	@BeforeAll
-	public void setup(SessionFactoryScope scope) {
-		scope.inTransaction(
-				session -> {
-					Person p = new Person();
-					p.setFirstName( "Jan" );
-					session.persist( p );
-				}
+	@Test
+	@JiraKey( value = "HHH-16180")
+	public void testJoinedInheritanceNativeQuery(SessionFactoryScope scope) {
+		final SessionFactoryImplementor sessionFactory = scope.getSessionFactory();
+		final String nullColumnString = sessionFactory
+				.getJdbcServices()
+				.getDialect()
+				.getSelectClauseNullString( SqlTypes.VARCHAR, sessionFactory.getTypeConfiguration() );
+
+		final String qry = String.format(
+				Locale.ROOT,
+				"select p.*, %s as company_name, 0 as clazz_  from Person p",
+				nullColumnString
 		);
+
+		scope.inTransaction( (session) -> {
+			// PostgreSQLDialect#getSelectClauseNullString produces e.g. `null::text` which we interpret as parameter,
+			// so workaround this problem by configuring to ignore JDBC parameters
+			session.setProperty( AvailableSettings.NATIVE_IGNORE_JDBC_PARAMETERS, true );
+
+			Person p = session.createNativeQuery( qry, Person.class ).getSingleResult();
+			assertThat( p ).isNotNull();
+			assertThat( p.getFirstName() ).isEqualTo( "Jan" );
+		} );
 	}
 
-	@AfterAll
-	public void tearDown(SessionFactoryScope scope) {
-		scope.inTransaction(
-				session -> session.createMutationQuery( "delete from Person" ).executeUpdate()
-		);
+	@BeforeEach
+	public void setup(SessionFactoryScope scope) {
+		scope.inTransaction( (session) -> {
+			Person p = new Person();
+			p.setFirstName( "Jan" );
+			session.persist( p );
+		} );
 	}
 
-	@Test
-	@JiraKey( value = "HHH-16180")
-	public void testJoinedInheritanceNativeQuery(SessionFactoryScope scope) {
-		scope.inTransaction(
-				session -> {
-					final SessionFactoryImplementor sessionFactory = scope.getSessionFactory();
-					final String nullColumnString = sessionFactory
-							.getJdbcServices()
-							.getDialect()
-							.getSelectClauseNullString( SqlTypes.VARCHAR, sessionFactory.getTypeConfiguration() );
-					// PostgreSQLDialect#getSelectClauseNullString produces e.g. `null::text` which we interpret as parameter,
-					// so workaround this problem by configuring to ignore JDBC parameters
-					session.setProperty( AvailableSettings.NATIVE_IGNORE_JDBC_PARAMETERS, true );
-					Person p = (Person) session.createNativeQuery( "select p.*, " + nullColumnString + " as company_name, 0 as clazz_  from Person p", Person.class ).getSingleResult();
-					Assertions.assertNotNull( p );
-					Assertions.assertEquals( p.getFirstName(), "Jan" );
-				}
-		);
+	@AfterEach
+	public void tearDown(SessionFactoryScope scope) {
+		scope.getSessionFactory().getSchemaManager().truncate();
 	}
 
 	@Entity(name = "Person")