Skip to content

Commit f24699d

Browse files
dreab8dreab8
committed
HHH-19846 Drop JUnit 4 usage
1 parent 405b202 commit f24699d

18 files changed

+614
-683
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/associations/DerivedIdentifierPrimaryKeyJoinColumnTest.java‎

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,45 +9,42 @@
99
import jakarta.persistence.Id;
1010
import jakarta.persistence.ManyToOne;
1111
import jakarta.persistence.PrimaryKeyJoinColumn;
12-
1312
import org.hibernate.annotations.NaturalId;
14-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
13+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
14+
import org.hibernate.testing.orm.junit.Jpa;
15+
import org.junit.jupiter.api.Test;
1516

16-
import org.junit.Assert;
17-
import org.junit.Test;
17+
import static org.assertj.core.api.Assertions.assertThat;
1818

19-
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
2019

2120
/**
2221
* @author Vlad Mihalcea
2322
*/
24-
public class DerivedIdentifierPrimaryKeyJoinColumnTest extends BaseEntityManagerFunctionalTestCase {
25-
26-
@Override
27-
protected Class<?>[] getAnnotatedClasses() {
28-
return new Class<?>[] {
29-
Person.class,
30-
PersonDetails.class
31-
};
32-
}
23+
@Jpa(
24+
annotatedClasses = {
25+
DerivedIdentifierPrimaryKeyJoinColumnTest.Person.class,
26+
DerivedIdentifierPrimaryKeyJoinColumnTest.PersonDetails.class
27+
}
28+
)
29+
public class DerivedIdentifierPrimaryKeyJoinColumnTest {
3330

3431
@Test
35-
public void testLifecycle() {
36-
Long personId = doInJPA(this::entityManagerFactory, entityManager -> {
37-
Person person = new Person("ABC-123");
38-
entityManager.persist(person);
32+
public void testLifecycle(EntityManagerFactoryScope scope) {
33+
Long personId = scope.fromTransaction( entityManager -> {
34+
Person person = new Person( "ABC-123" );
35+
entityManager.persist( person );
3936

4037
PersonDetails details = new PersonDetails();
41-
details.setPerson(person);
38+
details.setPerson( person );
4239

43-
entityManager.persist(details);
40+
entityManager.persist( details );
4441
return person.getId();
45-
});
42+
} );
4643

47-
doInJPA(this::entityManagerFactory, entityManager -> {
48-
PersonDetails details = entityManager.find(PersonDetails.class, personId);
49-
Assert.assertNotNull(details);
50-
});
44+
scope.inTransaction( entityManager -> {
45+
PersonDetails details = entityManager.find( PersonDetails.class, personId );
46+
assertThat( details ).isNotNull();
47+
} );
5148
}
5249

5350
@Entity(name = "Person")

‎hibernate-core/src/test/java/org/hibernate/orm/test/associations/DerivedIdentifierTest.java‎

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,46 +9,43 @@
99
import jakarta.persistence.Id;
1010
import jakarta.persistence.ManyToOne;
1111
import jakarta.persistence.MapsId;
12-
1312
import org.hibernate.annotations.NaturalId;
14-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
13+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
14+
import org.hibernate.testing.orm.junit.Jpa;
15+
import org.junit.jupiter.api.Test;
1516

16-
import org.junit.Assert;
17-
import org.junit.Test;
17+
import static org.assertj.core.api.Assertions.assertThat;
1818

19-
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
2019

2120
/**
2221
* @author Vlad Mihalcea
2322
*/
24-
public class DerivedIdentifierTest extends BaseEntityManagerFunctionalTestCase {
25-
26-
@Override
27-
protected Class<?>[] getAnnotatedClasses() {
28-
return new Class<?>[] {
29-
Person.class,
30-
PersonDetails.class
31-
};
32-
}
23+
@Jpa(
24+
annotatedClasses = {
25+
DerivedIdentifierTest.Person.class,
26+
DerivedIdentifierTest.PersonDetails.class
27+
}
28+
)
29+
public class DerivedIdentifierTest {
3330

3431
@Test
35-
public void testLifecycle() {
36-
Long personId = doInJPA(this::entityManagerFactory, entityManager -> {
37-
Person person = new Person("ABC-123");
32+
public void testLifecycle(EntityManagerFactoryScope scope) {
33+
Long personId = scope.fromTransaction( entityManager -> {
34+
Person person = new Person( "ABC-123" );
3835

3936
PersonDetails details = new PersonDetails();
40-
details.setPerson(person);
37+
details.setPerson( person );
4138

42-
entityManager.persist(person);
43-
entityManager.persist(details);
39+
entityManager.persist( person );
40+
entityManager.persist( details );
4441

4542
return person.getId();
46-
});
43+
} );
4744

48-
doInJPA(this::entityManagerFactory, entityManager -> {
49-
PersonDetails details = entityManager.find(PersonDetails.class, personId);
50-
Assert.assertNotNull(details);
51-
});
45+
scope.inTransaction( entityManager -> {
46+
PersonDetails details = entityManager.find( PersonDetails.class, personId );
47+
assertThat( details ).isNotNull();
48+
} );
5249
}
5350

5451
@Entity(name = "Person")

‎hibernate-core/src/test/java/org/hibernate/orm/test/associations/JoinColumnOrFormulaTest.java‎

Lines changed: 56 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -4,85 +4,80 @@
44
*/
55
package org.hibernate.orm.test.associations;
66

7-
import java.io.Serializable;
8-
import java.util.Objects;
97
import jakarta.persistence.Column;
108
import jakarta.persistence.Entity;
119
import jakarta.persistence.Id;
1210
import jakarta.persistence.JoinColumn;
1311
import jakarta.persistence.ManyToOne;
1412
import jakarta.persistence.Table;
15-
1613
import org.hibernate.annotations.JoinColumnOrFormula;
1714
import org.hibernate.annotations.JoinFormula;
18-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
15+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
16+
import org.hibernate.testing.orm.junit.Jpa;
17+
import org.junit.jupiter.api.Test;
1918

20-
import org.junit.Test;
19+
import java.io.Serializable;
20+
import java.util.Objects;
2121

22-
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
23-
import static org.junit.Assert.assertEquals;
22+
import static org.assertj.core.api.Assertions.assertThat;
2423

2524
/**
2625
* @author Vlad Mihalcea
2726
*/
28-
public class JoinColumnOrFormulaTest extends BaseEntityManagerFunctionalTestCase {
29-
30-
@Override
31-
protected Class<?>[] getAnnotatedClasses() {
32-
return new Class<?>[] {
33-
Country.class,
34-
User.class
35-
};
36-
}
27+
@Jpa(
28+
annotatedClasses = {
29+
JoinColumnOrFormulaTest.Country.class,
30+
JoinColumnOrFormulaTest.User.class
31+
}
32+
)
33+
public class JoinColumnOrFormulaTest {
3734

3835
@Test
39-
public void testLifecycle() {
36+
public void testLifecycle(EntityManagerFactoryScope scope) {
4037
//tag::associations-JoinColumnOrFormula-persistence-example[]
4138
Country US = new Country();
42-
US.setId(1);
43-
US.setDefault(true);
44-
US.setPrimaryLanguage("English");
45-
US.setName("United States");
39+
US.setId( 1 );
40+
US.setDefault( true );
41+
US.setPrimaryLanguage( "English" );
42+
US.setName( "United States" );
4643

4744
Country Romania = new Country();
48-
Romania.setId(40);
49-
Romania.setDefault(true);
50-
Romania.setName("Romania");
51-
Romania.setPrimaryLanguage("Romanian");
45+
Romania.setId( 40 );
46+
Romania.setDefault( true );
47+
Romania.setName( "Romania" );
48+
Romania.setPrimaryLanguage( "Romanian" );
5249

53-
doInJPA(this::entityManagerFactory, entityManager -> {
54-
entityManager.persist(US);
55-
entityManager.persist(Romania);
56-
});
50+
scope.inTransaction( entityManager -> {
51+
entityManager.persist( US );
52+
entityManager.persist( Romania );
53+
} );
5754

58-
doInJPA(this::entityManagerFactory, entityManager -> {
55+
scope.inTransaction( entityManager -> {
5956
User user1 = new User();
60-
user1.setId(1L);
61-
user1.setFirstName("John");
62-
user1.setLastName("Doe");
63-
user1.setLanguage("English");
64-
entityManager.persist(user1);
57+
user1.setId( 1L );
58+
user1.setFirstName( "John" );
59+
user1.setLastName( "Doe" );
60+
user1.setLanguage( "English" );
61+
entityManager.persist( user1 );
6562

6663
User user2 = new User();
67-
user2.setId(2L);
68-
user2.setFirstName("Vlad");
69-
user2.setLastName("Mihalcea");
70-
user2.setLanguage("Romanian");
71-
entityManager.persist(user2);
64+
user2.setId( 2L );
65+
user2.setFirstName( "Vlad" );
66+
user2.setLastName( "Mihalcea" );
67+
user2.setLanguage( "Romanian" );
68+
entityManager.persist( user2 );
7269

73-
});
70+
} );
7471
//end::associations-JoinColumnOrFormula-persistence-example[]
7572

7673
//tag::associations-JoinColumnOrFormula-fetching-example[]
77-
doInJPA(this::entityManagerFactory, entityManager -> {
78-
log.info("Fetch User entities");
74+
scope.inTransaction( entityManager -> {
75+
User john = entityManager.find( User.class, 1L );
76+
assertThat( john.getCountry() ).isEqualTo( US );
7977

80-
User john = entityManager.find(User.class, 1L);
81-
assertEquals(US, john.getCountry());
82-
83-
User vlad = entityManager.find(User.class, 2L);
84-
assertEquals(Romania, vlad.getCountry());
85-
});
78+
User vlad = entityManager.find( User.class, 2L );
79+
assertThat( vlad.getCountry() ).isEqualTo( Romania );
80+
} );
8681
//end::associations-JoinColumnOrFormula-fetching-example[]
8782
}
8883

@@ -102,24 +97,24 @@ public static class User {
10297

10398
@ManyToOne
10499
@JoinColumnOrFormula(column =
105-
@JoinColumn(
100+
@JoinColumn(
106101
name = "language",
107102
referencedColumnName = "primaryLanguage",
108103
insertable = false,
109104
updatable = false
110-
)
105+
)
111106
)
112107
@JoinColumnOrFormula(formula =
113-
@JoinFormula(
108+
@JoinFormula(
114109
value = "true",
115110
referencedColumnName = "is_default"
116-
)
111+
)
117112
)
118113
private Country country;
119114

120115
//Getters and setters omitted for brevity
121116

122-
//end::associations-JoinColumnOrFormula-example[]
117+
//end::associations-JoinColumnOrFormula-example[]
123118
public Long getId() {
124119
return id;
125120
}
@@ -160,7 +155,7 @@ public void setCountry(Country country) {
160155
this.country = country;
161156
}
162157

163-
//tag::associations-JoinColumnOrFormula-example[]
158+
//tag::associations-JoinColumnOrFormula-example[]
164159
}
165160
//end::associations-JoinColumnOrFormula-example[]
166161

@@ -182,7 +177,7 @@ public static class Country implements Serializable {
182177

183178
//Getters and setters, equals and hashCode methods omitted for brevity
184179

185-
//end::associations-JoinColumnOrFormula-example[]
180+
//end::associations-JoinColumnOrFormula-example[]
186181

187182
public int getId() {
188183
return id;
@@ -218,21 +213,21 @@ public void setDefault(boolean _default) {
218213

219214
@Override
220215
public boolean equals(Object o) {
221-
if (this == o) {
216+
if ( this == o ) {
222217
return true;
223218
}
224-
if (!(o instanceof Country)) {
219+
if ( !(o instanceof Country) ) {
225220
return false;
226221
}
227222
Country country = (Country) o;
228-
return Objects.equals(getId(), country.getId());
223+
return Objects.equals( getId(), country.getId() );
229224
}
230225

231226
@Override
232227
public int hashCode() {
233-
return Objects.hash(getId());
228+
return Objects.hash( getId() );
234229
}
235-
//tag::associations-JoinColumnOrFormula-example[]
230+
//tag::associations-JoinColumnOrFormula-example[]
236231
}
237232
//end::associations-JoinColumnOrFormula-example[]
238233
}

0 commit comments

Comments
 (0)