Skip to content

Commit 18f301e

Browse files
jrenaatjrenaat
committed
HHH-19846 - Drop JUnit 4 usage: org.hibernate.orm.test.jpa.spi/test/userguide
Signed-off-by: Jan Schatteman <jschatte@redhat.com>
1 parent 73f5531 commit 18f301e

File tree

7 files changed

+153
-192
lines changed

7 files changed

+153
-192
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/jpa/spi/NativeQueryTupleTransformerTest.java‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
*/
55
package org.hibernate.orm.test.jpa.spi;
66

7-
import static org.junit.Assert.assertEquals;
8-
import static org.junit.Assert.assertNull;
9-
107
import jakarta.persistence.Tuple;
118

129
import org.hibernate.jpa.spi.NativeQueryTupleTransformer;
1310

14-
import org.junit.Test;
11+
import org.junit.jupiter.api.Test;
12+
13+
import static org.junit.jupiter.api.Assertions.assertEquals;
14+
import static org.junit.jupiter.api.Assertions.assertNull;
15+
import static org.junit.jupiter.api.Assertions.assertThrows;
1516

1617
/**
1718
* @author Maksym Symonov
@@ -22,20 +23,25 @@ public class NativeQueryTupleTransformerTest {
2223

2324
@Test
2425
public void nullValueIsExtractedFromTuple() {
25-
final Tuple tuple = (Tuple) nativeQueryTupleTransformer.transformTuple(
26+
final Tuple tuple = nativeQueryTupleTransformer.transformTuple(
2627
new Object[] { 1L, null },
2728
new String[] { "id", "value" }
2829
);
2930
assertEquals(1L, tuple.get("id"));
3031
assertNull(tuple.get("value"));
3132
}
3233

33-
@Test(expected = IllegalArgumentException.class)
34+
@Test
3435
public void missingAliasCausesExceptionWhenIsExtractedFromTuple() {
35-
final Tuple tuple = (Tuple) nativeQueryTupleTransformer.transformTuple(
36-
new Object[] { 1L, null },
37-
new String[] { "id", "value" }
36+
assertThrows(
37+
IllegalArgumentException.class,
38+
() -> {
39+
final Tuple tuple = nativeQueryTupleTransformer.transformTuple(
40+
new Object[] {1L, null},
41+
new String[] {"id", "value"}
42+
);
43+
tuple.get( "unknownAlias" );
44+
}
3845
);
39-
tuple.get("unknownAlias");
4046
}
4147
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/ComponentCriteriaTest.java‎

Lines changed: 41 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -12,121 +12,116 @@
1212
import jakarta.persistence.criteria.Root;
1313

1414
import org.hibernate.Hibernate;
15-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
1615

16+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
1717
import org.hibernate.testing.orm.junit.JiraKey;
18-
import org.junit.Assert;
19-
import org.junit.Test;
18+
import org.hibernate.testing.orm.junit.Jpa;
19+
import org.junit.jupiter.api.AfterEach;
20+
import org.junit.jupiter.api.Test;
2021

21-
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
22-
import static org.junit.Assert.assertTrue;
22+
import static org.junit.jupiter.api.Assertions.assertTrue;
23+
import static org.junit.jupiter.api.Assertions.assertEquals;
2324

2425
/**
2526
* @author alan.oleary
2627
*/
27-
public class ComponentCriteriaTest extends BaseEntityManagerFunctionalTestCase {
28-
@Override
29-
public Class[] getAnnotatedClasses() {
30-
return new Class[] { Client.class, Alias.class };
28+
@Jpa(annotatedClasses = {Client.class, Alias.class})
29+
public class ComponentCriteriaTest {
30+
31+
@AfterEach
32+
public void tearDown(EntityManagerFactoryScope scope) {
33+
scope.getEntityManagerFactory().getSchemaManager().truncate();
3134
}
3235

3336
@Test
34-
public void testEmbeddableInPath() {
37+
public void testEmbeddableInPath(EntityManagerFactoryScope scope) {
3538
Client client = new Client( 111, "steve", "ebersole" );
36-
doInJPA( this::entityManagerFactory, em -> {
37-
em.persist( client );
38-
} );
39+
scope.inTransaction( entityManager -> entityManager.persist( client ) );
3940

40-
doInJPA( this::entityManagerFactory, em -> {
41-
CriteriaBuilder cb = em.getCriteriaBuilder();
41+
scope.inTransaction( entityManager -> {
42+
CriteriaBuilder cb = entityManager.getCriteriaBuilder();
4243
CriteriaQuery<Client> cq = cb.createQuery( Client.class );
4344
Root<Client> root = cq.from( Client.class );
4445
cq.where( cb.equal( root.get( "name" ).get( "firstName" ), client.getName().getFirstName() ) );
45-
List<Client> list = em.createQuery( cq ).getResultList();
46-
Assert.assertEquals( 1, list.size() );
46+
List<Client> list = entityManager.createQuery( cq ).getResultList();
47+
assertEquals( 1, list.size() );
4748
} );
4849

4950
// HHH-5792
50-
doInJPA( this::entityManagerFactory, em -> {
51-
TypedQuery<Client> q = em.createQuery(
51+
scope.inTransaction( entityManager -> {
52+
TypedQuery<Client> q = entityManager.createQuery(
5253
"SELECT c FROM Client c JOIN c.name n WHERE n.firstName = '"
5354
+ client.getName().getFirstName() + "'",
5455
Client.class
5556
);
56-
Assert.assertEquals( 1, q.getResultList().size() );
57-
} );
58-
59-
doInJPA( this::entityManagerFactory, em -> {
60-
em.createQuery( "delete Client" ).executeUpdate();
57+
assertEquals( 1, q.getResultList().size() );
6158
} );
6259
}
6360

6461
@Test
6562
@JiraKey(value = "HHH-9642")
66-
public void testOneToManyJoinFetchedInEmbeddable() {
63+
public void testOneToManyJoinFetchedInEmbeddable(EntityManagerFactoryScope scope) {
6764
Client client = new Client( 111, "steve", "ebersole" );
6865
Alias alias = new Alias( "a", "guy", "work" );
6966
client.getName().getAliases().add( alias );
70-
doInJPA( this::entityManagerFactory, em -> {
71-
em.persist( client );
72-
} );
67+
scope.inTransaction( entityManager -> entityManager.persist( client ) );
7368

7469
List<Client> list = new ArrayList<>();
75-
doInJPA( this::entityManagerFactory, em -> {
76-
CriteriaBuilder cb = em.getCriteriaBuilder();
70+
scope.inTransaction( entityManager -> {
71+
CriteriaBuilder cb = entityManager.getCriteriaBuilder();
7772
CriteriaQuery<Client> cq = cb.createQuery( Client.class );
7873
Root<Client> root = cq.from( Client.class );
7974
root.fetch( Client_.name ).fetch( Name_.aliases );
8075
cq.where( cb.equal( root.get( "name" ).get( "firstName" ), client.getName().getFirstName() ) );
81-
list.addAll( em.createQuery( cq ).getResultList() );
82-
Assert.assertEquals( 1, list.size() );
76+
list.addAll( entityManager.createQuery( cq ).getResultList() );
77+
assertEquals( 1, list.size() );
8378
Client c = list.get( 0 );
8479
assertTrue( Hibernate.isInitialized( c.getName().getAliases() ) );
8580
} );
8681

87-
doInJPA( this::entityManagerFactory, em -> {
88-
TypedQuery<Client> q = em.createQuery(
82+
scope.inTransaction( entityManager -> {
83+
TypedQuery<Client> q = entityManager.createQuery(
8984
"SELECT c FROM Client c JOIN FETCH c.name.aliases WHERE c.name.firstName = '"
9085
+ client.getName().getFirstName() + "'",
9186
Client.class
9287
);
93-
Assert.assertEquals( 1, q.getResultList().size() );
88+
assertEquals( 1, q.getResultList().size() );
9489
Client c = list.get( 0 );
9590
assertTrue( Hibernate.isInitialized( c.getName().getAliases() ) );
9691
} );
9792

98-
doInJPA( this::entityManagerFactory, em -> {
99-
TypedQuery<Client> q = em.createQuery(
93+
scope.inTransaction( entityManager -> {
94+
TypedQuery<Client> q = entityManager.createQuery(
10095
"SELECT c FROM Client c JOIN c.name n join FETCH n.aliases WHERE c.name.firstName = '"
10196
+ client.getName().getFirstName() + "'",
10297
Client.class
10398
);
104-
Assert.assertEquals( 1, q.getResultList().size() );
99+
assertEquals( 1, q.getResultList().size() );
105100
Client c = list.get( 0 );
106101
assertTrue( Hibernate.isInitialized( c.getName().getAliases() ) );
107102
} );
108103

109-
doInJPA( this::entityManagerFactory, em -> {
110-
Client c = em.merge( client );
111-
em.remove( c );
104+
scope.inTransaction( entityManager -> {
105+
Client c = entityManager.merge( client );
106+
entityManager.remove( c );
112107
} );
113108
}
114109

115110
@Test
116111
@JiraKey(value = "HHH-4586")
117-
public void testParameterizedFunctions() {
118-
doInJPA( this::entityManagerFactory, em -> {
119-
CriteriaBuilder cb = em.getCriteriaBuilder();
112+
public void testParameterizedFunctions(EntityManagerFactoryScope scope) {
113+
scope.inTransaction( entityManager -> {
114+
CriteriaBuilder cb = entityManager.getCriteriaBuilder();
120115
// lower
121116
CriteriaQuery<Client> cq = cb.createQuery( Client.class );
122117
Root<Client> root = cq.from( Client.class );
123118
cq.where( cb.equal( cb.lower( root.get( Client_.name ).get( Name_.lastName ) ), "test" ) );
124-
em.createQuery( cq ).getResultList();
119+
entityManager.createQuery( cq ).getResultList();
125120
// upper
126121
cq = cb.createQuery( Client.class );
127122
root = cq.from( Client.class );
128123
cq.where( cb.equal( cb.upper( root.get( Client_.name ).get( Name_.lastName ) ), "test" ) );
129-
em.createQuery( cq ).getResultList();
124+
entityManager.createQuery( cq ).getResultList();
130125
}
131126
);
132127
}

0 commit comments

Comments
 (0)