Various code cleanup

Author: sebersole

hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InterceptorTest.java

@@ -4,7 +4,6 @@
  */
 package org.hibernate.orm.test.interceptor;
 
-import jakarta.persistence.PersistenceException;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaQuery;
 import java.util.LinkedList;
@@ -26,13 +25,11 @@
 import org.hibernate.resource.jdbc.spi.StatementInspector;
 import org.hibernate.type.Type;
 
-import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 /**
  * @author Gavin King
@@ -139,37 +136,6 @@ public boolean onFlushDirty(
 
 	}
 
-	/**
-	 * Test that setting a transaction timeout will cause an Exception to occur
-	 * if the transaction timeout is exceeded.
-	 */
-	@Test
-	public void testTimeout() throws Exception {
-		final int TIMEOUT = 2;
-		final int WAIT = TIMEOUT + 1;
-		Session s = openSession();
-		// Get the transaction and set the timeout BEFORE calling begin()
-		Transaction t = s.getTransaction();
-		t.setTimeout( TIMEOUT );
-		t.begin();
-		// Sleep for an amount of time that exceeds the transaction timeout
-		Thread.sleep( WAIT * 1000 );
-		try {
-			// Do something with the transaction and try to commit it
-			s.persist( new User( "john", "test" ) );
-			t.commit();
-			fail( "Transaction should have timed out" );
-		}
-		catch (PersistenceException e) {
-			assertTyping( TransactionException.class, e );
-			assertTrue(
-					"Transaction failed for the wrong reason.  Expecting transaction timeout, but found [" +
-							e.getMessage() + "]",
-					e.getMessage().contains( "transaction timeout expired" )
-			);
-		}
-	}
-
 	@Test
 	public void testComponentInterceptor() {
 		final int checkPerm = 500;

hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/TransactionTimeoutTests.java

@@ -0,0 +1,65 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.resource.transaction;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.PersistenceException;
+import jakarta.persistence.Table;
+import org.hibernate.Transaction;
+import org.hibernate.TransactionException;
+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.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.fail;
+
+/**
+ * Test behavior of transaction timeouts
+ *
+ * @author Steve Ebersole
+ */
+@SuppressWarnings("JUnitMalformedDeclaration")
+@DomainModel(annotatedClasses = TransactionTimeoutTests.Person.class)
+@SessionFactory
+public class TransactionTimeoutTests {
+	@Test
+	void testJdbcTxn(SessionFactoryScope sessions) {
+		sessions.inSession( (session) -> {
+			final Transaction transaction = session.getTransaction();
+			// timeout in 2 seconds
+			transaction.setTimeout( 2 );
+
+			// start the transaction and sleep for 3 seconds to exceed the transaction timeout
+			transaction.begin();
+			try {
+				Thread.sleep( 3 * 1000 );
+			}
+			catch (InterruptedException e) {
+				throw new RuntimeException( "Thread#sleep error", e );
+			}
+			try {
+				// perform an operation against the db and try to commit the transaction
+				session.createSelectionQuery( "from Person", Person.class ).list();
+				transaction.commit();
+				fail( "Transaction should have timed out" );
+			}
+			catch (PersistenceException e) {
+				assertThat( e ).isInstanceOf( TransactionException.class );
+				assertThat( e ).hasMessageContaining( "transaction timeout expired" );
+			}
+		} );
+	}
+
+	@Entity(name="Person")
+	@Table(name="persons")
+	public static class Person {
+		@Id
+		private Integer id;
+		private String name;
+	}
+}

hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportTest.java

@@ -30,7 +30,6 @@
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
 
 /**
  * @author Gail Badner