Skip to content

Commit bcce1ba

Browse files
committed
use truncate() in more tests
1 parent 9ac6da8 commit bcce1ba

File tree

92 files changed

+94
-582
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+94
-582
lines changed

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

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,7 @@ protected void prepareBootstrapRegistryBuilder(BootstrapServiceRegistryBuilder b
6363

6464
@Override
6565
protected void cleanupTestData() throws Exception {
66-
Session s = openSession();
67-
s.beginTransaction();
68-
List<Alias> aliases = s.createQuery( "from Alias" ).list();
69-
for ( Alias alias : aliases ) {
70-
for ( Character character : alias.getCharacters() ) {
71-
character.getAliases().clear();
72-
}
73-
alias.getCharacters().clear();
74-
}
75-
s.flush();
76-
s.createQuery( "delete Alias" ).executeUpdate();
77-
s.createQuery( "delete Character" ).executeUpdate();
78-
s.getTransaction().commit();
79-
s.close();
66+
sessionFactory().getSchemaManager().truncate();
8067
}
8168

8269
@Test

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,7 @@ public void testBatchingAmongstSubClasses() {
117117

118118
@After
119119
protected void cleanupTestData() {
120-
sessionFactoryScope().inTransaction( session -> {
121-
session.createMutationQuery( "delete Address" ).executeUpdate();
122-
session.createMutationQuery( "delete Person" ).executeUpdate();
123-
session.createMutationQuery( "delete SpecialPerson" ).executeUpdate();
124-
session.createMutationQuery( "delete AnotherPerson" ).executeUpdate();
125-
session.createMutationQuery( "delete Office" ).executeUpdate();
126-
session.createMutationQuery( "delete President" ).executeUpdate();
127-
} );
120+
sessionFactoryScope().getSessionFactory().getSchemaManager().truncate();
128121
}
129122

130123
@Entity(name = "Address")

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import java.util.List;
1414

1515
import org.hibernate.Session;
16+
import org.hibernate.SessionFactory;
1617
import org.hibernate.community.dialect.AltibaseDialect;
1718
import org.hibernate.dialect.DB2Dialect;
1819
import org.hibernate.community.dialect.DerbyDialect;
@@ -78,12 +79,7 @@ public void prepareTestData() {
7879

7980
@AfterEach
8081
public void cleanupTestData() {
81-
doInJPA(
82-
this::entityManagerFactory,
83-
entityManager -> {
84-
entityManager.createQuery( "delete from Product" ).executeUpdate();
85-
}
86-
);
82+
entityManagerFactory().unwrap(SessionFactory.class).getSchemaManager().truncate();
8783
}
8884

8985
@Test

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/LazyToOneTest.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,7 @@ protected void prepareTest() throws Exception {
5353

5454
@Override
5555
protected void cleanupTestData() throws Exception {
56-
inTransaction(
57-
(session) -> {
58-
session.createQuery( "delete Flight" ).executeUpdate();
59-
session.createQuery( "delete Airport" ).executeUpdate();
60-
}
61-
);
56+
sessionFactory().getSchemaManager().truncate();
6257
}
6358

6459
@Test

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyBidirectionalTest.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,7 @@ public void setUp(SessionFactoryScope scope) {
6767

6868
@AfterEach
6969
public void tearDown(SessionFactoryScope scope) {
70-
scope.inTransaction( session -> {
71-
session.createQuery( "delete from Author" ).executeUpdate();
72-
session.createQuery( "delete from Book" ).executeUpdate();
73-
} );
70+
scope.getSessionFactory().getSchemaManager().truncate();
7471
}
7572

7673
@Test

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyHqlMemberOfQueryTest.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,7 @@ public void setUp(SessionFactoryScope scope) {
106106

107107
@AfterEach
108108
public void tearDown(SessionFactoryScope scope) {
109-
scope.inTransaction(
110-
session -> {
111-
session.createQuery( "delete from Call" ).executeUpdate();
112-
session.createQuery( "delete from Person" ).executeUpdate();
113-
session.createQuery( "delete from Phone" ).executeUpdate();
114-
}
115-
);
109+
scope.getSessionFactory().getSchemaManager().truncate();
116110
}
117111

118112
@Test

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyUnidirectionalFetchTest.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,7 @@ public void setup(SessionFactoryScope scope) {
5050

5151
@AfterEach
5252
public void tearDown(SessionFactoryScope scope) {
53-
scope.inTransaction(
54-
session -> {
55-
Event event = session.get( Event.class, 1L );
56-
session.remove( event );
57-
}
58-
);
53+
scope.getSessionFactory().getSchemaManager().truncate();
5954
}
6055

6156
@Test

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/BasicAttributeMutabilityTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ public void testMutableMerge(SessionFactoryScope scope) {
219219

220220
@AfterEach
221221
void dropTestData(SessionFactoryScope scope) {
222-
scope.inTransaction( (session) -> session.createMutationQuery( "delete TheEntity" ).executeUpdate() );
222+
scope.getSessionFactory().getSchemaManager().truncate();
223223
}
224224

225225
@Entity( name = "TheEntity" )

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/ImmutabilityMapAsBasicTests.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,7 @@ void createTestData(SessionFactoryScope scope) {
163163

164164
@AfterEach
165165
void dropTestData(SessionFactoryScope scope) {
166-
scope.inTransaction( (session) -> {
167-
session.createMutationQuery( "delete TestEntity" ).executeUpdate();
168-
} );
166+
scope.getSessionFactory().getSchemaManager().truncate();
169167
}
170168

171169
@Entity( name = "TestEntity" )

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/ImmutableMapAsBasicTests.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,7 @@ void createTestData(SessionFactoryScope scope) {
180180

181181
@AfterEach
182182
void dropTestData(SessionFactoryScope scope) {
183-
scope.inTransaction( (session) -> {
184-
session.createMutationQuery( "delete TestEntity" ).executeUpdate();
185-
} );
183+
scope.getSessionFactory().getSchemaManager().truncate();
186184
}
187185

188186
@Entity( name = "TestEntity" )

0 commit comments

Comments
 (0)