Skip to content

Commit bd5de61

Browse files
dreab8dreab8
committed
HHH-19846 Drop JUnit 4 usage
1 parent 3ff52f7 commit bd5de61

17 files changed

+843
-909
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/pc/BytecodeEnhancementTest.java‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,43 +4,40 @@
44
*/
55
package org.hibernate.orm.test.pc;
66

7-
import java.sql.Blob;
8-
import java.util.ArrayList;
9-
import java.util.List;
10-
import java.util.UUID;
117
import jakarta.persistence.Basic;
128
import jakarta.persistence.Entity;
139
import jakarta.persistence.FetchType;
1410
import jakarta.persistence.Id;
1511
import jakarta.persistence.Lob;
1612
import jakarta.persistence.ManyToOne;
1713
import jakarta.persistence.OneToMany;
18-
1914
import org.hibernate.annotations.LazyGroup;
2015
import org.hibernate.annotations.NaturalId;
21-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
16+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
17+
import org.hibernate.testing.orm.junit.Jpa;
18+
import org.junit.jupiter.api.Test;
2219

23-
import org.junit.Test;
20+
import java.sql.Blob;
21+
import java.util.ArrayList;
22+
import java.util.List;
23+
import java.util.UUID;
2424

25-
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
2625

2726
/**
2827
* @author Vlad Mihalcea
2928
*/
30-
public class BytecodeEnhancementTest extends BaseEntityManagerFunctionalTestCase {
31-
32-
@Override
33-
protected Class<?>[] getAnnotatedClasses() {
34-
return new Class<?>[] {
35-
Person.class,
36-
Book.class,
37-
Customer.class
38-
};
39-
}
29+
@Jpa(
30+
annotatedClasses = {
31+
BytecodeEnhancementTest.Person.class,
32+
BytecodeEnhancementTest.Book.class,
33+
BytecodeEnhancementTest.Customer.class
34+
}
35+
)
36+
public class BytecodeEnhancementTest {
4037

4138
@Test
42-
public void test() {
43-
doInJPA(this::entityManagerFactory, entityManager -> {
39+
public void test(EntityManagerFactoryScope scope) {
40+
scope.inTransaction( entityManager -> {
4441
//tag::BytecodeEnhancement-dirty-tracking-bidirectional-incorrect-usage-example[]
4542
Person person = new Person();
4643
person.setName("John Doe");
@@ -55,7 +52,7 @@ public void test() {
5552
}
5653
//end::BytecodeEnhancement-dirty-tracking-bidirectional-incorrect-usage-example[]
5754
});
58-
doInJPA(this::entityManagerFactory, entityManager -> {
55+
scope.inTransaction( entityManager -> {
5956
//tag::BytecodeEnhancement-dirty-tracking-bidirectional-correct-usage-example[]
6057
Person person = new Person();
6158
person.setName("John Doe");

‎hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadeDetachTest.java‎

Lines changed: 28 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,60 +4,56 @@
44
*/
55
package org.hibernate.orm.test.pc;
66

7-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
87

9-
import org.junit.Test;
8+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
9+
import org.hibernate.testing.orm.junit.Jpa;
10+
import org.junit.jupiter.api.Test;
1011

11-
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
12-
import static org.junit.Assert.assertEquals;
13-
import static org.junit.Assert.assertFalse;
14-
import static org.junit.Assert.assertTrue;
12+
import static org.assertj.core.api.Assertions.assertThat;
1513

1614
/**
1715
* @author Fábio Takeo Ueno
1816
*/
19-
public class CascadeDetachTest extends BaseEntityManagerFunctionalTestCase {
20-
21-
@Override
22-
protected Class<?>[] getAnnotatedClasses() {
23-
return new Class<?>[] {
17+
@Jpa(
18+
annotatedClasses = {
2419
Person.class,
2520
Phone.class
26-
};
27-
}
21+
}
22+
)
23+
public class CascadeDetachTest {
2824

2925
@Test
30-
public void detachTest() {
31-
doInJPA(this::entityManagerFactory, entityManager -> {
26+
public void detachTest(EntityManagerFactoryScope scope) {
27+
scope.inTransaction( entityManager -> {
3228
Person person = new Person();
33-
person.setId(1L);
34-
person.setName("John Doe");
29+
person.setId( 1L );
30+
person.setName( "John Doe" );
3531

3632
Phone phone = new Phone();
37-
phone.setId(1L);
38-
phone.setNumber("123-456-7890");
33+
phone.setId( 1L );
34+
phone.setNumber( "123-456-7890" );
3935

40-
person.addPhone(phone);
41-
entityManager.persist(person);
36+
person.addPhone( phone );
37+
entityManager.persist( person );
4238

43-
});
39+
} );
4440

45-
doInJPA(this::entityManagerFactory, entityManager -> {
41+
scope.inTransaction( entityManager -> {
4642

4743
//tag::pc-cascade-detach-example[]
48-
Person person = entityManager.find(Person.class, 1L);
49-
assertEquals(1, person.getPhones().size());
50-
Phone phone = person.getPhones().get(0);
44+
Person person = entityManager.find( Person.class, 1L );
45+
assertThat( person.getPhones() ).hasSize( 1 );
46+
Phone phone = person.getPhones().get( 0 );
5147

52-
assertTrue(entityManager.contains(person));
53-
assertTrue(entityManager.contains(phone));
48+
assertThat( entityManager.contains( person ) ).isTrue();
49+
assertThat( entityManager.contains( phone ) ).isTrue();
5450

55-
entityManager.detach(person);
51+
entityManager.detach( person );
5652

57-
assertFalse(entityManager.contains(person));
58-
assertFalse(entityManager.contains(phone));
53+
assertThat( entityManager.contains( person ) ).isFalse();
54+
assertThat( entityManager.contains( phone ) ).isFalse();
5955

6056
//end::pc-cascade-detach-example[]
61-
});
57+
} );
6258
}
6359
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadeMergeTest.java‎

Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,55 +4,50 @@
44
*/
55
package org.hibernate.orm.test.pc;
66

7-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
8-
9-
import org.junit.Test;
10-
11-
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
7+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
8+
import org.hibernate.testing.orm.junit.Jpa;
9+
import org.junit.jupiter.api.Test;
1210

1311
/**
1412
* @author Fábio Takeo Ueno
1513
*/
16-
public class CascadeMergeTest extends BaseEntityManagerFunctionalTestCase {
17-
18-
@Override
19-
protected Class<?>[] getAnnotatedClasses() {
20-
return new Class<?>[] {
14+
@Jpa(
15+
annotatedClasses = {
2116
Person.class,
2217
Phone.class
23-
};
24-
}
18+
}
19+
)
20+
public class CascadeMergeTest {
2521

2622
@Test
27-
public void mergeTest() {
28-
doInJPA(this::entityManagerFactory, entityManager -> {
23+
public void mergeTest(EntityManagerFactoryScope scope) {
24+
scope.inTransaction( entityManager -> {
2925
Person person = new Person();
30-
person.setId(1L);
31-
person.setName("John Doe");
26+
person.setId( 1L );
27+
person.setName( "John Doe" );
3228

3329
Phone phone = new Phone();
34-
phone.setId(1L);
35-
phone.setNumber("123-456-7890");
36-
37-
person.addPhone(phone);
30+
phone.setId( 1L );
31+
phone.setNumber( "123-456-7890" );
3832

39-
entityManager.persist(person);
33+
person.addPhone( phone );
4034

41-
});
35+
entityManager.persist( person );
4236

43-
doInJPA(this::entityManagerFactory, entityManager -> {
37+
} );
4438

39+
scope.inTransaction( entityManager -> {
4540
//tag::pc-cascade-merge-example[]
46-
Phone phone = entityManager.find(Phone.class, 1L);
41+
Phone phone = entityManager.find( Phone.class, 1L );
4742
Person person = phone.getOwner();
4843

49-
person.setName("John Doe Jr.");
50-
phone.setNumber("987-654-3210");
44+
person.setName( "John Doe Jr." );
45+
phone.setNumber( "987-654-3210" );
5146

5247
entityManager.clear();
5348

54-
entityManager.merge(person);
49+
entityManager.merge( person );
5550
//end::pc-cascade-merge-example[]
56-
});
51+
} );
5752
}
5853
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadeOnDeleteCollectionTest.java‎

Lines changed: 32 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4,65 +4,60 @@
44
*/
55
package org.hibernate.orm.test.pc;
66

7-
import java.util.ArrayList;
8-
import java.util.List;
97
import jakarta.persistence.CascadeType;
108
import jakarta.persistence.Column;
119
import jakarta.persistence.Entity;
1210
import jakarta.persistence.FetchType;
1311
import jakarta.persistence.Id;
1412
import jakarta.persistence.ManyToOne;
1513
import jakarta.persistence.OneToMany;
16-
1714
import org.hibernate.annotations.OnDelete;
1815
import org.hibernate.annotations.OnDeleteAction;
19-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
16+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
17+
import org.hibernate.testing.orm.junit.Jpa;
18+
import org.junit.jupiter.api.Test;
2019

21-
import org.junit.Test;
22-
23-
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
20+
import java.util.ArrayList;
21+
import java.util.List;
2422

2523
/**
2624
* @author Vlad Mihalcea
2725
*/
28-
public class CascadeOnDeleteCollectionTest extends BaseEntityManagerFunctionalTestCase {
29-
30-
@Override
31-
protected Class<?>[] getAnnotatedClasses() {
32-
return new Class<?>[] {
33-
Person.class,
34-
Phone.class
35-
};
36-
}
26+
@Jpa(
27+
annotatedClasses = {
28+
CascadeOnDeleteCollectionTest.Person.class,
29+
CascadeOnDeleteCollectionTest.Phone.class
30+
}
31+
)
32+
public class CascadeOnDeleteCollectionTest {
3733

3834
@Test
39-
public void test() {
40-
doInJPA(this::entityManagerFactory, entityManager -> {
35+
public void test(EntityManagerFactoryScope scope) {
36+
scope.inTransaction( entityManager -> {
4137
Person person = new Person();
42-
person.setId(1L);
43-
person.setName("John Doe");
44-
entityManager.persist(person);
38+
person.setId( 1L );
39+
person.setName( "John Doe" );
40+
entityManager.persist( person );
4541

4642
Phone phone1 = new Phone();
47-
phone1.setId(1L);
48-
phone1.setNumber("123-456-7890");
49-
phone1.setOwner(person);
50-
person.addPhone(phone1);
43+
phone1.setId( 1L );
44+
phone1.setNumber( "123-456-7890" );
45+
phone1.setOwner( person );
46+
person.addPhone( phone1 );
5147

5248
Phone phone2 = new Phone();
53-
phone2.setId(2L);
54-
phone2.setNumber("101-010-1234");
55-
phone2.setOwner(person);
56-
person.addPhone(phone2);
57-
});
49+
phone2.setId( 2L );
50+
phone2.setNumber( "101-010-1234" );
51+
phone2.setOwner( person );
52+
person.addPhone( phone2 );
53+
} );
5854

59-
doInJPA(this::entityManagerFactory, entityManager -> {
55+
scope.inTransaction( entityManager -> {
6056
//tag::pc-cascade-on-delete-collection-example[]
61-
Person person = entityManager.find(Person.class, 1L);
62-
entityManager.remove(person);
57+
Person person = entityManager.find( Person.class, 1L );
58+
entityManager.remove( person );
6359
//end::pc-cascade-on-delete-collection-example[]
64-
});
65-
60+
} );
6661
}
6762

6863
//tag::pc-cascade-on-delete-collection-mapping-Person-example[]
@@ -99,8 +94,8 @@ public void setName(String name) {
9994
}
10095

10196
public void addPhone(Phone phone) {
102-
phone.setOwner(this);
103-
phones.add(phone);
97+
phone.setOwner( this );
98+
phones.add( phone );
10499
}
105100

106101
//tag::pc-cascade-on-delete-collection-mapping-Person-example[]

0 commit comments

Comments
 (0)