Skip to content

Commit aea1310

Browse files
gavinkinggavinking
committed
use truncate() in more tests
1 parent bcce1ba commit aea1310

File tree

52 files changed

+52
-210
lines changed

Some content is hidden

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

52 files changed

+52
-210
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/InheritedNaturalIdCacheTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,5 +128,6 @@ public void createTestData(SessionFactoryScope scope) {
128128
@AfterEach
129129
public void cleanUpTestData(SessionFactoryScope scope) {
130130
scope.getSessionFactory().getSchemaManager().truncate();
131+
scope.getSessionFactory().getCache().evictAllRegions();
131132
}
132133
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyOrphanRemovalTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class OneToOneLazyOrphanRemovalTest {
3434

3535
@AfterEach
3636
public void tearDown(SessionFactoryScope scope){
37-
scope.getSessionFactory().getSchemaManager().truncate();;
37+
scope.getSessionFactory().getSchemaManager().truncate();
3838
}
3939

4040
@Test

‎hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java

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

6363
@AfterEach
6464
public void cleanupData(SessionFactoryScope scope) {
65-
scope.inTransaction(
66-
session -> {
67-
session.createQuery( "delete Tranche" ).executeUpdate();
68-
session.createQuery( "delete Preisregelung" ).executeUpdate();
69-
session.createQuery( "delete Tranchenmodell" ).executeUpdate();
70-
}
71-
);
65+
scope.getSessionFactory().getSchemaManager().truncate();
7266
}
7367

7468
@Test

‎hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java

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

4141
@AfterEach
4242
public void cleanupData(SessionFactoryScope scope) {
43-
scope.inTransaction(
44-
session -> {
45-
session.createQuery( "delete Employee" ).executeUpdate();
46-
session.createQuery( "delete EmployeeInfo" ).executeUpdate();
47-
}
48-
);
43+
scope.getSessionFactory().getSchemaManager().truncate();
4944
}
5045

5146
@Test

‎hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/bidirectional/DeleteOneToOneOrphansTest.java

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

4040
@AfterEach
4141
public void cleanupData(SessionFactoryScope scope) {
42-
scope.inTransaction(
43-
session -> {
44-
session.createQuery( "delete EmployeeInfo" ).executeUpdate();
45-
session.createQuery( "delete Employee" ).executeUpdate();
46-
}
47-
);
42+
scope.getSessionFactory().getSchemaManager().truncate();
4843
}
4944

5045
@Test

‎hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/unidirectional/DeleteOneToOneOrphansTest.java

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

4141
@AfterEach
4242
public void cleanupData(SessionFactoryScope scope) {
43-
scope.inTransaction(
44-
session -> {
45-
session.createQuery( "delete EmployeeInfo" ).executeUpdate();
46-
session.createQuery( "delete Employee" ).executeUpdate();
47-
}
48-
);
43+
scope.getSessionFactory().getSchemaManager().truncate();
4944
}
5045

5146
@Test

‎hibernate-core/src/test/java/org/hibernate/orm/test/orphan/onetomany/DeleteOneToManyOrphansTest.java

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

4747
@AfterEach
4848
public void cleanupData(SessionFactoryScope scope) {
49-
scope.inTransaction(
50-
session -> {
51-
session.createQuery( "delete Feature" ).executeUpdate();
52-
session.createQuery( "delete Product" ).executeUpdate();
53-
}
54-
);
49+
scope.getSessionFactory().getSchemaManager().truncate();
5550
}
5651

5752
@Test

‎hibernate-core/src/test/java/org/hibernate/orm/test/pagination/FetchClausePaginationTest.java

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

6161
@AfterEach
6262
public void dropTestData(SessionFactoryScope scope) {
63-
scope.inTransaction(
64-
session -> {
65-
session.createQuery( "delete from EntityOfLists" ).executeUpdate();
66-
session.createQuery( "delete from SimpleEntity" ).executeUpdate();
67-
}
68-
);
63+
scope.getSessionFactory().getSchemaManager().truncate();
6964
}
7065

7166
@Test

‎hibernate-core/src/test/java/org/hibernate/orm/test/pagination/OraclePaginationWithLocksTest.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,7 @@ public void setUp(SessionFactoryScope scope) {
5656

5757
@AfterEach
5858
public void tearDown(SessionFactoryScope scope) {
59-
scope.inTransaction(
60-
session ->
61-
session.createQuery( "delete from Person" ).executeUpdate()
62-
63-
);
59+
scope.getSessionFactory().getSchemaManager().truncate();
6460
}
6561

6662
@Test

‎hibernate-core/src/test/java/org/hibernate/orm/test/pagination/PaginationTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,6 @@ public void prepareTestData(SessionFactoryScope scope) {
217217

218218
@AfterEach
219219
public void cleanupTestData(SessionFactoryScope scope) {
220-
scope.inTransaction(
221-
session -> session.createMutationQuery( "delete from DataPoint" ).executeUpdate()
222-
);
220+
scope.getSessionFactory().getSchemaManager().truncate();
223221
}
224222
}

0 commit comments

Comments
 (0)