Skip to content

Commit 562c5c6

Browse files
gavinkinggavinking
committed
use truncate() in many tests
1 parent 21b3f70 commit 562c5c6

File tree

596 files changed

+621
-3399
lines changed

Some content is hidden

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

596 files changed

+621
-3399
lines changed

‎hibernate-core/src/main/java/org/hibernate/sql/model/PreparableMutationOperation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ default boolean canBeBatched(BatchKey batchKey, int batchSize) {
5757

5858
// This should already be guaranteed by the batchKey being null
5959
assert !getTableDetails().isIdentifierTable()
60-
|| !(getMutationTarget() instanceof EntityMutationTarget entityMutationTarget
60+
|| !( getMutationTarget() instanceof EntityMutationTarget entityMutationTarget
6161
&& entityMutationTarget.getMutationDelegate( getMutationType() ) != null );
6262

6363
if ( getMutationType() == MutationType.UPDATE ) {

‎hibernate-core/src/test/java/org/hibernate/event/service/internal/NewlyInstantiatdCollectionSkipDeleteOrphanTest.java‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -88,17 +88,7 @@ public void setup() {
8888

8989
@AfterEach
9090
public void cleanup(SessionFactoryScope scope) {
91-
scope.inTransaction( s -> {
92-
if ( up.getId() != null ) {
93-
s.remove( up );
94-
}
95-
if ( vp.getId() != null ) {
96-
s.remove( vp );
97-
}
98-
if ( c.getId() != null ) {
99-
s.remove( c );
100-
}
101-
} );
91+
scope.getSessionFactory().getSchemaManager().truncate();
10292
}
10393

10494
@Test

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/CreationUpdatedTimestampInEmbeddableTest.java‎

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

4040
@AfterEach
4141
void tearDown(SessionFactoryScope scope) {
42-
scope.inTransaction( session -> {
43-
session.createMutationQuery( "delete Event" ).executeUpdate();
44-
} );
42+
scope.getSessionFactory().getSchemaManager().truncate();
4543
}
4644

4745
@Test

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/EntityTest.java‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import java.time.LocalDate;
1010
import java.time.ZoneId;
1111
import java.util.Date;
12-
import java.util.EnumSet;
1312
import java.util.GregorianCalendar;
1413
import java.util.List;
1514
import java.util.TimeZone;
@@ -24,8 +23,6 @@
2423
import org.hibernate.dialect.MySQLDialect;
2524
import org.hibernate.dialect.OracleDialect;
2625
import org.hibernate.query.Query;
27-
import org.hibernate.tool.hbm2ddl.SchemaExport;
28-
import org.hibernate.tool.schema.TargetType;
2926
import org.hibernate.type.StandardBasicTypes;
3027

3128
import org.hibernate.testing.orm.junit.DomainModel;
@@ -37,7 +34,6 @@
3734
import org.hibernate.testing.orm.junit.SkipForDialect;
3835

3936
import org.junit.jupiter.api.AfterEach;
40-
import org.junit.jupiter.api.BeforeEach;
4137
import org.junit.jupiter.api.Test;
4238

4339
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -435,16 +431,8 @@ public void testBasic(SessionFactoryScope scope) throws Exception {
435431
);
436432
}
437433

438-
// tests are leaving data around, so drop/recreate schema for now. this is what the old tests did
439-
440-
@BeforeEach
441-
public void runCreateSchema(DomainModelScope domainModelScope) {
442-
new SchemaExport().create( EnumSet.of( TargetType.DATABASE ), domainModelScope.getDomainModel() );
443-
}
444-
445434
@AfterEach
446-
public void runDropSchema(DomainModelScope domainModelScope) {
447-
new SchemaExport().drop( EnumSet.of( TargetType.DATABASE ), domainModelScope.getDomainModel() );
435+
public void runDropSchema(SessionFactoryScope scope) {
436+
scope.getSessionFactory().getSchemaManager().truncate();
448437
}
449-
450438
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimeStampInheritanceTest.java‎

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

7575
@AfterEach
7676
public void tearDown(EntityManagerFactoryScope scope) {
77-
scope.inTransaction( entityManager -> {
78-
entityManager.createQuery( "delete Customer" ).executeUpdate();
79-
entityManager.createQuery( "delete Address" ).executeUpdate();
80-
} );
77+
scope.getEntityManagerFactory().getSchemaManager().truncate();
8178
}
8279

8380
@Test

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/CollectionActionsValidationTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import jakarta.validation.constraints.NotBlank;
1818
import jakarta.validation.constraints.NotEmpty;
1919
import jakarta.validation.constraints.Size;
20-
import org.hibernate.SessionFactory;
2120
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
2221
import org.hibernate.testing.orm.junit.Jira;
2322
import org.hibernate.testing.orm.junit.Jpa;
@@ -179,7 +178,7 @@ public void setUp(EntityManagerFactoryScope scope) {
179178

180179
@AfterEach
181180
public void tearDown(EntityManagerFactoryScope scope) {
182-
scope.getEntityManagerFactory().unwrap( SessionFactory.class ).getSchemaManager().truncateMappedObjects();
181+
scope.getEntityManagerFactory().getSchemaManager().truncate();
183182
}
184183

185184
@Entity(name = "TestEntity")

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CascadeToEmbeddedManyToOneTest.java‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
package org.hibernate.orm.test.annotations.cascade;
66

77
import java.util.HashSet;
8-
import java.util.List;
98
import java.util.Set;
109

1110
import org.hibernate.testing.orm.junit.DomainModel;
@@ -28,19 +27,7 @@ public class CascadeToEmbeddedManyToOneTest {
2827

2928
@AfterEach
3029
public void teaDown(SessionFactoryScope scope) {
31-
scope.inTransaction(
32-
session -> {
33-
List<CodedPairHolder> pairHolders = session.createQuery( "select p from CodedPairHolder p" ).list();
34-
pairHolders.forEach(
35-
pairHolder -> {
36-
PersonPair pair = pairHolder.getPair();
37-
session.remove( pairHolder );
38-
session.remove(pair.getLeft());
39-
session.remove(pair.getRight());
40-
}
41-
);
42-
}
43-
);
30+
scope.getSessionFactory().getSchemaManager().truncate();
4431
}
4532

4633
@Test

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/MultiCircleJpaCascadeIdentityTest.java‎

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -117,44 +117,7 @@ public void setup(SessionFactoryScope scope) {
117117

118118
@AfterEach
119119
public void cleanup(SessionFactoryScope scope) {
120-
b.setC( null );
121-
b.setD( null );
122-
b.getGCollection().remove( g );
123-
124-
c.getBCollection().remove( b );
125-
c.getDCollection().remove( d );
126-
127-
d.getBCollection().remove( b );
128-
d.setC( null );
129-
d.setE( null );
130-
d.getFCollection().remove( f );
131-
132-
e.getDCollection().remove( d );
133-
e.setF( null );
134-
135-
f.setD( null );
136-
f.getECollection().remove( e );
137-
f.setG( null );
138-
139-
g.setB( null );
140-
g.getFCollection().remove( f );
141-
142-
scope.inTransaction(
143-
session -> {
144-
b = session.merge( b );
145-
c = session.merge( c );
146-
d = session.merge( d );
147-
e = session.merge( e );
148-
f = session.merge( f );
149-
g = session.merge( g );
150-
session.remove( f );
151-
session.remove( g );
152-
session.remove( b );
153-
session.remove( d );
154-
session.remove( e );
155-
session.remove( c );
156-
}
157-
);
120+
scope.getSessionFactory().getSchemaManager().truncate();
158121
}
159122

160123
@Test

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/MultiCircleJpaCascadeSequenceTest.java‎

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -115,44 +115,7 @@ public void setup(SessionFactoryScope scope) {
115115

116116
@AfterEach
117117
public void cleanup(SessionFactoryScope scope) {
118-
b.setC( null );
119-
b.setD( null );
120-
b.getGCollection().remove( g );
121-
122-
c.getBCollection().remove( b );
123-
c.getDCollection().remove( d );
124-
125-
d.getBCollection().remove( b );
126-
d.setC( null );
127-
d.setE( null );
128-
d.getFCollection().remove( f );
129-
130-
e.getDCollection().remove( d );
131-
e.setF( null );
132-
133-
f.setD( null );
134-
f.getECollection().remove( e );
135-
f.setG( null );
136-
137-
g.setB( null );
138-
g.getFCollection().remove( f );
139-
140-
scope.inTransaction(
141-
session -> {
142-
b = (B) session.merge( b );
143-
c = (C) session.merge( c );
144-
d = (D) session.merge( d );
145-
e = (E) session.merge( e );
146-
f = (F) session.merge( f );
147-
g = (G) session.merge( g );
148-
session.remove( f );
149-
session.remove( g );
150-
session.remove( b );
151-
session.remove( d );
152-
session.remove( e );
153-
session.remove( c );
154-
}
155-
);
118+
scope.getSessionFactory().getSchemaManager().truncate();
156119
}
157120

158121
@Test

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/MultiCircleNonJpaCascadeIdentityTest.java‎

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -119,44 +119,7 @@ public void setup(SessionFactoryScope scope) {
119119

120120
@AfterEach
121121
public void cleanup(SessionFactoryScope scope) {
122-
b.setC( null );
123-
b.setD( null );
124-
b.getGCollection().remove( g );
125-
126-
c.getBCollection().remove( b );
127-
c.getDCollection().remove( d );
128-
129-
d.getBCollection().remove( b );
130-
d.setC( null );
131-
d.setE( null );
132-
d.getFCollection().remove( f );
133-
134-
e.getDCollection().remove( d );
135-
e.setF( null );
136-
137-
f.setD( null );
138-
f.getECollection().remove( e );
139-
f.setG( null );
140-
141-
g.setB( null );
142-
g.getFCollection().remove( f );
143-
144-
scope.inTransaction(
145-
session -> {
146-
b = session.merge( b );
147-
c = session.merge( c );
148-
d = session.merge( d );
149-
e = session.merge( e );
150-
f = session.merge( f );
151-
g = session.merge( g );
152-
session.remove( f );
153-
session.remove( g );
154-
session.remove( b );
155-
session.remove( d );
156-
session.remove( e );
157-
session.remove( c );
158-
}
159-
);
122+
scope.getSessionFactory().getSchemaManager().truncate();
160123
}
161124

162125
@Test

0 commit comments

Comments
 (0)