Skip to content

Commit b744e85

Browse files
jrenaatjrenaat
committed
HHH-19846 - Remove JUnit4: org.hibernate.orm.test.mapping.collections
Signed-off-by: Jan Schatteman <[email protected]>
1 parent e804b21 commit b744e85

26 files changed

+317
-507
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ArrayTest.java‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,35 +7,27 @@
77
import jakarta.persistence.Entity;
88
import jakarta.persistence.Id;
99

10-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
11-
12-
import org.junit.Test;
13-
14-
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
10+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
11+
import org.hibernate.testing.orm.junit.Jpa;
12+
import org.junit.jupiter.api.Test;
1513

1614
/**
1715
* @author Vlad Mihalcea
1816
*/
19-
public class ArrayTest extends BaseEntityManagerFunctionalTestCase {
20-
21-
@Override
22-
protected Class<?>[] getAnnotatedClasses() {
23-
return new Class<?>[] {
24-
Person.class
25-
};
26-
}
17+
@Jpa( annotatedClasses = {ArrayTest.Person.class} )
18+
public class ArrayTest {
2719

2820
@Test
29-
public void testLifecycle() {
30-
doInJPA(this::entityManagerFactory, entityManager -> {
21+
public void testLifecycle(EntityManagerFactoryScope scope) {
22+
scope.inTransaction( entityManager -> {
3123
Person person = new Person(1L);
3224
String[] phones = new String[2];
3325
phones[0] = "028-234-9876";
3426
phones[1] = "072-122-9876";
3527
person.setPhones(phones);
3628
entityManager.persist(person);
3729
});
38-
doInJPA(this::entityManagerFactory, entityManager -> {
30+
scope.inTransaction( entityManager -> {
3931
Person person = entityManager.find(Person.class, 1L);
4032
String[] phones = new String[1];
4133
phones[0] = "072-122-9876";

‎hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BasicTypeElementCollectionTest.java‎

Lines changed: 31 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,22 @@
1111
import jakarta.persistence.Id;
1212
import jakarta.persistence.OrderColumn;
1313

14-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
15-
16-
import org.junit.Test;
17-
18-
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
14+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
15+
import org.hibernate.testing.orm.junit.Jpa;
16+
import org.junit.jupiter.api.AfterEach;
17+
import org.junit.jupiter.api.Assertions;
18+
import org.junit.jupiter.api.BeforeEach;
19+
import org.junit.jupiter.api.Test;
1920

2021
/**
2122
* @author Vlad Mihalcea
2223
*/
23-
public class BasicTypeElementCollectionTest extends BaseEntityManagerFunctionalTestCase {
24-
25-
@Override
26-
protected Class<?>[] getAnnotatedClasses() {
27-
return new Class<?>[] {
28-
Person.class
29-
};
30-
}
24+
@Jpa( annotatedClasses = {BasicTypeElementCollectionTest.Person.class} )
25+
public class BasicTypeElementCollectionTest {
3126

32-
@Override
33-
public void buildEntityManagerFactory() {
34-
super.buildEntityManagerFactory();
35-
doInJPA(this::entityManagerFactory, entityManager -> {
27+
@BeforeEach
28+
public void setup(EntityManagerFactoryScope scope) {
29+
scope.inTransaction( entityManager -> {
3630
Person person = new Person();
3731
person.id = 1L;
3832
person.phones.add("027-123-4567");
@@ -41,36 +35,39 @@ public void buildEntityManagerFactory() {
4135
});
4236
}
4337

38+
@AfterEach
39+
public void tearDown(EntityManagerFactoryScope scope) {
40+
scope.getEntityManagerFactory().getSchemaManager().truncate();
41+
}
42+
4443
@Test
45-
public void testProxies() {
46-
doInJPA(this::entityManagerFactory, entityManager -> {
47-
try {
48-
//tag::collections-collection-proxy-usage-example[]
49-
Person person = entityManager.find(Person.class, 1L);
50-
//Throws java.lang.ClassCastException: org.hibernate.collection.internal.PersistentBag cannot be cast to java.util.ArrayList
51-
ArrayList<String> phones = (ArrayList<String>) person.getPhones();
52-
//end::collections-collection-proxy-usage-example[]
53-
}
54-
catch (Exception expected) {
55-
log.error("Failure", expected);
56-
}
44+
public void testProxies(EntityManagerFactoryScope scope) {
45+
scope.inTransaction( entityManager -> {
46+
Assertions.assertThrows(
47+
ClassCastException.class,
48+
() -> {
49+
//tag::collections-collection-proxy-usage-example[]
50+
Person person = entityManager.find(Person.class, 1L);
51+
//Throws java.lang.ClassCastException: org.hibernate.collection.internal.PersistentBag cannot be cast to java.util.ArrayList
52+
ArrayList<String> phones = (ArrayList<String>) person.getPhones();
53+
//end::collections-collection-proxy-usage-example[]
54+
}
55+
);
5756
});
5857
}
5958

6059
@Test
61-
public void testLifecycle() {
62-
doInJPA(this::entityManagerFactory, entityManager -> {
60+
public void testLifecycle(EntityManagerFactoryScope scope) {
61+
scope.inTransaction( entityManager -> {
6362
Person person = entityManager.find(Person.class, 1L);
64-
log.info("Clear element collection and add element");
6563
//tag::ex-collection-elemental-lifecycle[]
6664
person.getPhones().clear();
6765
person.getPhones().add("123-456-7890");
6866
person.getPhones().add("456-000-1234");
6967
//end::ex-collection-elemental-lifecycle[]
7068
});
71-
doInJPA(this::entityManagerFactory, entityManager -> {
69+
scope.inTransaction( entityManager -> {
7270
Person person = entityManager.find(Person.class, 1L);
73-
log.info("Remove one element");
7471
//tag::collections-value-type-collection-remove-example[]
7572
person.getPhones().remove(0);
7673
//end::collections-value-type-collection-remove-example[]

‎hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BasicTypeOrderColumnElementCollectionTest.java‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,36 +11,27 @@
1111
import jakarta.persistence.Id;
1212
import jakarta.persistence.OrderColumn;
1313

14-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
15-
16-
import org.junit.Test;
17-
18-
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
14+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
15+
import org.hibernate.testing.orm.junit.Jpa;
16+
import org.junit.jupiter.api.Test;
1917

2018
/**
2119
* @author Vlad Mihalcea
2220
*/
23-
public class BasicTypeOrderColumnElementCollectionTest extends BaseEntityManagerFunctionalTestCase {
24-
25-
@Override
26-
protected Class<?>[] getAnnotatedClasses() {
27-
return new Class<?>[] {
28-
Person.class
29-
};
30-
}
21+
@Jpa( annotatedClasses = {BasicTypeOrderColumnElementCollectionTest.Person.class} )
22+
public class BasicTypeOrderColumnElementCollectionTest {
3123

3224
@Test
33-
public void testLifecycle() {
34-
doInJPA(this::entityManagerFactory, entityManager -> {
25+
public void testLifecycle(EntityManagerFactoryScope scope) {
26+
scope.inTransaction( entityManager -> {
3527
Person person = new Person();
3628
person.id = 1L;
3729
person.getPhones().add("123-456-7890");
3830
person.getPhones().add("456-000-1234");
3931
entityManager.persist(person);
4032
});
41-
doInJPA(this::entityManagerFactory, entityManager -> {
33+
scope.inTransaction( entityManager -> {
4234
Person person = entityManager.find(Person.class, 1L);
43-
log.info("Remove one element");
4435
//tag::collections-value-type-collection-order-column-remove-example[]
4536
person.getPhones().remove(0);
4637
//end::collections-value-type-collection-order-column-remove-example[]

‎hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalBagOrphanRemovalTest.java‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,20 @@
1515
import jakarta.persistence.OneToMany;
1616

1717
import org.hibernate.annotations.NaturalId;
18-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
1918

20-
import org.junit.Test;
21-
22-
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
19+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
20+
import org.hibernate.testing.orm.junit.Jpa;
21+
import org.junit.jupiter.api.Test;
2322

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

3729
@Test
38-
public void testLifecycle() {
39-
doInJPA(this::entityManagerFactory, entityManager -> {
30+
public void testLifecycle(EntityManagerFactoryScope scope) {
31+
scope.inTransaction( entityManager -> {
4032
Person person = new Person(1L);
4133
entityManager.persist(person);
4234
person.addPhone(new Phone(1L, "landline", "028-234-9876"));

‎hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalBagTest.java‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,20 @@
1515
import jakarta.persistence.OneToMany;
1616

1717
import org.hibernate.annotations.NaturalId;
18-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
1918

20-
import org.junit.Test;
21-
22-
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
19+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
20+
import org.hibernate.testing.orm.junit.Jpa;
21+
import org.junit.jupiter.api.Test;
2322

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

3729
@Test
38-
public void testLifecycle() {
39-
doInJPA(this::entityManagerFactory, entityManager -> {
30+
public void testLifecycle(EntityManagerFactoryScope scope) {
31+
scope.inTransaction( entityManager -> {
4032
Person person = new Person(1L);
4133
entityManager.persist(person);
4234
//tag::collections-bidirectional-bag-lifecycle-example[]

‎hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalComparatorSortedSetTest.java‎

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,46 +18,38 @@
1818

1919
import org.hibernate.annotations.NaturalId;
2020
import org.hibernate.annotations.SortComparator;
21-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
2221

23-
import org.junit.Assert;
24-
import org.junit.Test;
22+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
23+
import org.hibernate.testing.orm.junit.Jpa;
24+
import org.junit.jupiter.api.Test;
2525

26-
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
26+
import static org.junit.jupiter.api.Assertions.assertEquals;
2727

2828
/**
2929
* @author Vlad Mihalcea
3030
*/
31-
public class BidirectionalComparatorSortedSetTest extends BaseEntityManagerFunctionalTestCase {
32-
33-
@Override
34-
protected Class<?>[] getAnnotatedClasses() {
35-
return new Class<?>[] {
36-
Person.class,
37-
Phone.class,
38-
};
39-
}
31+
@Jpa( annotatedClasses = {BidirectionalComparatorSortedSetTest.Person.class, BidirectionalComparatorSortedSetTest.Phone.class} )
32+
public class BidirectionalComparatorSortedSetTest {
4033

4134
@Test
42-
public void testLifecycle() {
43-
doInJPA(this::entityManagerFactory, entityManager -> {
35+
public void testLifecycle(EntityManagerFactoryScope scope) {
36+
scope.inTransaction( entityManager -> {
4437
Person person = new Person(1L);
4538
entityManager.persist(person);
4639
person.addPhone(new Phone(1L, "landline", "028-234-9876"));
4740
person.addPhone(new Phone(2L, "mobile", "072-122-9876"));
4841
});
49-
doInJPA(this::entityManagerFactory, entityManager -> {
42+
scope.inTransaction( entityManager -> {
5043
Person person = entityManager.find(Person.class, 1L);
5144
Set<Phone> phones = person.getPhones();
52-
Assert.assertEquals(2, phones.size());
53-
phones.stream().forEach(phone -> log.infov("Phone number %s", phone.getNumber()));
45+
assertEquals(2, phones.size());
5446
person.removePhone(phones.iterator().next());
55-
Assert.assertEquals(1, phones.size());
47+
assertEquals(1, phones.size());
5648
});
57-
doInJPA(this::entityManagerFactory, entityManager -> {
49+
scope.inTransaction( entityManager -> {
5850
Person person = entityManager.find(Person.class, 1L);
5951
Set<Phone> phones = person.getPhones();
60-
Assert.assertEquals(1, phones.size());
52+
assertEquals(1, phones.size());
6153
});
6254
}
6355

‎hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalMapTest.java‎

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,39 +19,30 @@
1919
import jakarta.persistence.MapKeyEnumerated;
2020
import jakarta.persistence.OneToMany;
2121

22-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
23-
24-
import org.junit.Assert;
25-
import org.junit.Test;
26-
27-
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
22+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
23+
import org.hibernate.testing.orm.junit.Jpa;
24+
import org.junit.jupiter.api.Test;
25+
import org.junit.jupiter.api.Assertions;
2826

2927
/**
3028
* @author Vlad Mihalcea
3129
*/
32-
public class BidirectionalMapTest extends BaseEntityManagerFunctionalTestCase {
33-
34-
@Override
35-
protected Class<?>[] getAnnotatedClasses() {
36-
return new Class<?>[] {
37-
Person.class,
38-
Phone.class,
39-
};
40-
}
30+
@Jpa( annotatedClasses = {BidirectionalMapTest.Person.class, BidirectionalMapTest.Phone.class} )
31+
public class BidirectionalMapTest {
4132

4233
@Test
43-
public void testLifecycle() {
44-
doInJPA(this::entityManagerFactory, entityManager -> {
34+
public void testLifecycle(EntityManagerFactoryScope scope) {
35+
scope.inTransaction( entityManager -> {
4536
Person person = new Person(1L);
4637
LocalDateTime now = LocalDateTime.now();
4738
person.addPhone(new Phone(PhoneType.LAND_LINE, "028-234-9876", Timestamp.valueOf(now)));
4839
person.addPhone(new Phone(PhoneType.MOBILE, "072-122-9876", Timestamp.valueOf(now.minusDays(1))));
4940
entityManager.persist(person);
5041
});
51-
doInJPA(this::entityManagerFactory, entityManager -> {
42+
scope.inTransaction( entityManager -> {
5243
Person person = entityManager.find(Person.class, 1L);
5344
Map<PhoneType, Phone> phones = person.getPhoneRegister();
54-
Assert.assertEquals(2, phones.size());
45+
Assertions.assertEquals(2, phones.size());
5546
});
5647
}
5748

0 commit comments

Comments
 (0)