use truncate() in more tests

Author: gavinking

hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/PolymorphicCacheTest.java

@@ -37,12 +37,8 @@ public void prepareTestData(SessionFactoryScope scope) {
 
 	@AfterEach
 	public void dropTestData(SessionFactoryScope scope) {
-		scope.inTransaction(
-				session -> {
-					session.createMutationQuery("delete from CacheHolder").executeUpdate();
-					session.createMutationQuery( "delete Cacheable" ).executeUpdate();
-				}
-		);
+		scope.getSessionFactory().getSchemaManager().truncate();
+		scope.getSessionFactory().getCache().evictAll();
 	}
 
 	@Test

hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MergeCollectionEventTest.java

@@ -63,20 +63,7 @@ protected void prepareBootstrapRegistryBuilder(BootstrapServiceRegistryBuilder b
 
 	@Override
 	protected void cleanupTestData() throws Exception {
-		Session s = openSession();
-		s.beginTransaction();
-		List<Alias> aliases = s.createQuery( "from Alias" ).list();
-		for ( Alias alias : aliases ) {
-			for ( Character character : alias.getCharacters() ) {
-				character.getAliases().clear();
-			}
-			alias.getCharacters().clear();
-		}
-		s.flush();
-		s.createQuery( "delete Alias" ).executeUpdate();
-		s.createQuery( "delete Character" ).executeUpdate();
-		s.getTransaction().commit();
-		s.close();
+		sessionFactory().getSchemaManager().truncate();
 	}
 
 	@Test

hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableMultiLevelInheritance.java

@@ -117,14 +117,7 @@ public void testBatchingAmongstSubClasses() {
 
 	@After
 	protected void cleanupTestData() {
-		sessionFactoryScope().inTransaction( session -> {
-			session.createMutationQuery( "delete Address" ).executeUpdate();
-			session.createMutationQuery( "delete Person" ).executeUpdate();
-			session.createMutationQuery( "delete SpecialPerson" ).executeUpdate();
-			session.createMutationQuery( "delete AnotherPerson" ).executeUpdate();
-			session.createMutationQuery( "delete Office" ).executeUpdate();
-			session.createMutationQuery( "delete President" ).executeUpdate();
-		} );
+		sessionFactoryScope().getSessionFactory().getSchemaManager().truncate();
 	}
 
 	@Entity(name = "Address")

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ExpressionsTest.java

@@ -13,6 +13,7 @@
 import java.util.List;
 
 import org.hibernate.Session;
+import org.hibernate.SessionFactory;
 import org.hibernate.community.dialect.AltibaseDialect;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.community.dialect.DerbyDialect;
@@ -78,12 +79,7 @@ public void prepareTestData() {
 
 	@AfterEach
 	public void cleanupTestData() {
-		doInJPA(
-				this::entityManagerFactory,
-				entityManager -> {
-					entityManager.createQuery( "delete from Product" ).executeUpdate();
-				}
-		);
+		entityManagerFactory().unwrap(SessionFactory.class).getSchemaManager().truncate();
 	}
 
 	@Test

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/CharEnumerateValueTests.java

@@ -39,7 +39,6 @@
  *
  * @author Steve Ebersole
  */
-@SuppressWarnings("JUnitMalformedDeclaration")
 public class CharEnumerateValueTests {
 	@Test
 	@DomainModel(annotatedClasses = Person.class)
@@ -122,7 +121,7 @@ void verifyCheckConstraints2(SessionFactoryScope scope) {
 
 	@AfterEach
 	void dropTestData(SessionFactoryScope scope) {
-		scope.inTransaction( (session) -> session.createMutationQuery( "delete Person" ).executeUpdate() );
+		scope.getSessionFactory().getSchemaManager().truncate();
 	}
 
 	public enum Gender {

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/EnumeratedValueTests.java

@@ -112,7 +112,7 @@ void verifyCheckConstraints(SessionFactoryScope scope) {
 
 	@AfterEach
 	void dropTestData(SessionFactoryScope scope) {
-		scope.inTransaction( (session) -> session.createMutationQuery( "delete Person" ).executeUpdate() );
+		scope.getSessionFactory().getSchemaManager().truncate();
 	}
 
 	public enum Gender {

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/NamedEnumEnumerateValueTests.java

@@ -129,7 +129,7 @@ void verifyCheckConstraints2(SessionFactoryScope scope) {
 
 	@AfterEach
 	void dropTestData(SessionFactoryScope scope) {
-		scope.inTransaction( (session) -> session.createMutationQuery( "delete Person" ).executeUpdate() );
+		scope.getSessionFactory().getSchemaManager().truncate();
 	}
 
 	public enum Gender {

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/batch/SimpleBatchFetchBaselineTests.java

@@ -90,10 +90,7 @@ public void prepareTestData(SessionFactoryScope scope) {
 
 	@AfterEach
 	public void dropTestData(SessionFactoryScope scope) {
-		scope.inTransaction( (session) -> {
-			session.createQuery( "delete EmployeeGroup" ).executeUpdate();
-			session.createQuery( "delete Employee" ).executeUpdate();
-		} );
+		scope.getSessionFactory().getSchemaManager().truncate();
 	}
 
 	@Entity( name="EmployeeGroup")

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/batch/SimpleBatchFetchTests.java

@@ -95,10 +95,7 @@ public void prepareTestData(SessionFactoryScope scope) {
 
 	@AfterEach
 	public void dropTestData(SessionFactoryScope scope) {
-		scope.inTransaction( (session) -> {
-			session.createQuery( "delete EmployeeGroup" ).executeUpdate();
-			session.createQuery( "delete Employee" ).executeUpdate();
-		} );
+		scope.getSessionFactory().getSchemaManager().truncate();
 	}
 
 	@Entity( name="EmployeeGroup")

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleEagerSubSelectFetchTests.java

@@ -119,10 +119,7 @@ public void prepareTestData(SessionFactoryScope scope) {
 
 	@AfterEach
 	public void dropTestData(SessionFactoryScope scope) {
-		scope.inTransaction( (session) -> {
-			session.createQuery( "delete Thing" ).executeUpdate();
-			session.createQuery( "delete Owner" ).executeUpdate();
-		} );
+		scope.getSessionFactory().getSchemaManager().truncate();
 	}
 
 	@Entity(name = "Owner")