Skip to content

Commit 1cb6569

Browse files
sebersolesebersole
committed
HHH-19846 - Drop JUnit 4 usage
Not converted... * org.hibernate.orm.test.hql.PostgreSQLFunctionSelectClauseTest - registering custom function * org.hibernate.orm.test.hql.PostgreSQLFunctionWhereClauseTest - aux-db-object * org.hibernate.orm.test.id.usertype - type registrations * org.hibernate.orm.test.idgen.enhanced.HiloOptimizerConcurrencyTest - recreation of SF during tests * org.hibernate.orm.test.type.AbstractJavaTimeTypeTest subtypes - crazy parameterization (see org.hibernate.orm.test.tm.InterceptorTransactionTest) * org.hibernate.orm.test.cdi.general.hibernatesearch.extended.HibernateSearchExtendedCdiSupportTest - not sure yet, all the other tests here pass with conversion - shelved for now
1 parent b2f65de commit 1cb6569

File tree

57 files changed

+1447
-1345
lines changed

Some content is hidden

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

57 files changed

+1447
-1345
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/DiscriminatorNotNullSingleTableTest.java‎

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,45 +4,47 @@
44
*/
55
package org.hibernate.orm.test.inheritance;
66

7-
import java.math.BigDecimal;
8-
import java.sql.Statement;
9-
import java.util.Map;
10-
import java.util.function.Function;
11-
import java.util.stream.Collectors;
127
import jakarta.persistence.DiscriminatorValue;
138
import jakarta.persistence.Entity;
149
import jakarta.persistence.Id;
1510
import jakarta.persistence.Inheritance;
1611
import jakarta.persistence.InheritanceType;
17-
1812
import org.hibernate.Session;
1913
import org.hibernate.dialect.H2Dialect;
20-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
14+
import org.hibernate.testing.orm.junit.DomainModel;
15+
import org.hibernate.testing.orm.junit.RequiresDialect;
16+
import org.hibernate.testing.orm.junit.SessionFactory;
17+
import org.hibernate.testing.orm.junit.SessionFactoryScope;
18+
import org.junit.jupiter.api.AfterEach;
19+
import org.junit.jupiter.api.Assertions;
20+
import org.junit.jupiter.api.Test;
2121

22-
import org.hibernate.testing.RequiresDialect;
23-
import org.junit.Test;
24-
25-
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
26-
import static org.junit.Assert.assertEquals;
22+
import java.math.BigDecimal;
23+
import java.sql.Statement;
24+
import java.util.Map;
25+
import java.util.function.Function;
26+
import java.util.stream.Collectors;
2727

2828
/**
2929
* @author Vlad Mihalcea
3030
*/
31+
@SuppressWarnings("JUnitMalformedDeclaration")
3132
@RequiresDialect(H2Dialect.class)
32-
public class DiscriminatorNotNullSingleTableTest extends BaseEntityManagerFunctionalTestCase {
33-
34-
@Override
35-
protected Class<?>[] getAnnotatedClasses() {
36-
return new Class<?>[] {
37-
DebitAccount.class,
38-
CreditAccount.class,
39-
OtherAccount.class
40-
};
33+
@DomainModel(annotatedClasses = {
34+
DiscriminatorNotNullSingleTableTest.DebitAccount.class,
35+
DiscriminatorNotNullSingleTableTest.CreditAccount.class,
36+
DiscriminatorNotNullSingleTableTest.OtherAccount.class
37+
})
38+
@SessionFactory
39+
public class DiscriminatorNotNullSingleTableTest {
40+
@AfterEach
41+
void tearDown(SessionFactoryScope factoryScope) {
42+
factoryScope.dropData();
4143
}
4244

4345
@Test
44-
public void test() {
45-
doInJPA(this::entityManagerFactory, entityManager -> {
46+
public void test(SessionFactoryScope factoryScope) {
47+
factoryScope.inTransaction( entityManager -> {
4648
//tag::entity-inheritance-single-table-discriminator-value-persist-example[]
4749
DebitAccount debitAccount = new DebitAccount();
4850
debitAccount.setId(1L);
@@ -79,7 +81,7 @@ public void test() {
7981
//end::entity-inheritance-single-table-discriminator-value-persist-example[]
8082
});
8183

82-
doInJPA(this::entityManagerFactory, entityManager -> {
84+
factoryScope.inTransaction( entityManager -> {
8385
//tag::entity-inheritance-single-table-discriminator-value-persist-example[]
8486

8587
Map<Long, Account> accounts = entityManager.createQuery(
@@ -88,11 +90,11 @@ public void test() {
8890
.stream()
8991
.collect(Collectors.toMap(Account::getId, Function.identity()));
9092

91-
assertEquals(4, accounts.size());
92-
assertEquals(DebitAccount.class, accounts.get(1L).getClass());
93-
assertEquals(CreditAccount.class, accounts.get(2L).getClass());
94-
assertEquals(Account.class, accounts.get(3L).getClass());
95-
assertEquals(OtherAccount.class, accounts.get(4L).getClass());
93+
Assertions.assertEquals( 4, accounts.size() );
94+
Assertions.assertEquals( DebitAccount.class, accounts.get(1L).getClass() );
95+
Assertions.assertEquals( CreditAccount.class, accounts.get(2L).getClass() );
96+
Assertions.assertEquals( Account.class, accounts.get(3L).getClass() );
97+
Assertions.assertEquals( OtherAccount.class, accounts.get(4L).getClass() );
9698
//end::entity-inheritance-single-table-discriminator-value-persist-example[]
9799
});
98100
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/DiscriminatorOptionsNotNullSingleTableTest.java‎

Lines changed: 27 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -4,54 +4,43 @@
44
*/
55
package org.hibernate.orm.test.inheritance;
66

7-
import java.math.BigDecimal;
8-
import java.sql.Statement;
9-
import java.util.Map;
10-
import java.util.function.Function;
11-
import java.util.stream.Collectors;
127
import jakarta.persistence.DiscriminatorValue;
138
import jakarta.persistence.Entity;
149
import jakarta.persistence.Id;
1510
import jakarta.persistence.Inheritance;
1611
import jakarta.persistence.InheritanceType;
17-
1812
import org.hibernate.Session;
1913
import org.hibernate.annotations.DiscriminatorOptions;
2014
import org.hibernate.dialect.H2Dialect;
21-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
15+
import org.hibernate.testing.orm.junit.DomainModel;
16+
import org.hibernate.testing.orm.junit.RequiresDialect;
17+
import org.hibernate.testing.orm.junit.SessionFactoryScope;
18+
import org.junit.jupiter.api.Test;
2219

23-
import org.hibernate.testing.RequiresDialect;
24-
import org.junit.Test;
20+
import java.math.BigDecimal;
21+
import java.sql.Statement;
22+
import java.util.Map;
23+
import java.util.function.Function;
24+
import java.util.stream.Collectors;
2525

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

2928
/**
3029
* @author Vlad Mihalcea
3130
*/
31+
@SuppressWarnings("JUnitMalformedDeclaration")
3232
@RequiresDialect(H2Dialect.class)
33-
public class DiscriminatorOptionsNotNullSingleTableTest extends BaseEntityManagerFunctionalTestCase {
34-
35-
@Override
36-
protected Class<?>[] getAnnotatedClasses() {
37-
return new Class<?>[] {
38-
DebitAccount.class,
39-
CreditAccount.class,
40-
OtherAccount.class
41-
};
42-
}
33+
@DomainModel(annotatedClasses = {
34+
DiscriminatorOptionsNotNullSingleTableTest.DebitAccount.class,
35+
DiscriminatorOptionsNotNullSingleTableTest.CreditAccount.class,
36+
DiscriminatorOptionsNotNullSingleTableTest.OtherAccount.class
37+
})
38+
public class DiscriminatorOptionsNotNullSingleTableTest {
4339

4440
@Test
45-
public void test() {
46-
doInJPA(this::entityManagerFactory, entityManager -> {
47-
entityManager.unwrap(Session.class).doWork(connection -> {
48-
try(Statement statement = connection.createStatement()) {
49-
//statement.executeUpdate("ALTER TABLE Account ALTER COLUMN DTYPE SET NULL");
50-
}
51-
});
52-
53-
54-
DebitAccount debitAccount = new DebitAccount();
41+
public void test(SessionFactoryScope factoryScope) {
42+
factoryScope.inTransaction( entityManager -> {
43+
var debitAccount = new DebitAccount();
5544
debitAccount.setId(1L);
5645
debitAccount.setOwner("John Doe");
5746
debitAccount.setBalance(BigDecimal.valueOf(100));
@@ -85,19 +74,19 @@ public void test() {
8574
});
8675
});
8776

88-
doInJPA(this::entityManagerFactory, entityManager -> {
77+
factoryScope.inTransaction( entityManager -> {
78+
//noinspection removal
8979
Map<Long, Account> accounts = entityManager.createQuery(
9080
"select a from Account a", Account.class)
9181
.getResultList()
9282
.stream()
9383
.collect(Collectors.toMap(Account::getId, Function.identity()));
9484

95-
assertEquals(4, accounts.size());
96-
assertEquals(DebitAccount.class, accounts.get(1L).getClass());
97-
assertEquals(CreditAccount.class, accounts.get(2L).getClass());
98-
assertEquals(Account.class, accounts.get(3L).getClass());
99-
assertEquals(OtherAccount.class, accounts.get(4L).getClass());
100-
85+
assertEquals( 4, accounts.size() );
86+
assertEquals( DebitAccount.class, accounts.get(1L).getClass() );
87+
assertEquals( CreditAccount.class, accounts.get(2L).getClass() );
88+
assertEquals( Account.class, accounts.get(3L).getClass() );
89+
assertEquals( OtherAccount.class, accounts.get(4L).getClass() );
10190
});
10291
}
10392

‎hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/EmbeddableInheritanceHierarchyOrderTest.java‎

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

7-
import org.hibernate.testing.orm.junit.DomainModel;
8-
import org.hibernate.testing.orm.junit.SessionFactory;
9-
import org.hibernate.testing.orm.junit.SessionFactoryScope;
10-
import org.junit.jupiter.api.AfterAll;
11-
import org.junit.jupiter.api.Test;
12-
137
import jakarta.persistence.DiscriminatorColumn;
148
import jakarta.persistence.Embeddable;
159
import jakarta.persistence.Embedded;
1610
import jakarta.persistence.Entity;
1711
import jakarta.persistence.Id;
12+
import org.hibernate.testing.orm.junit.DomainModel;
13+
import org.hibernate.testing.orm.junit.SessionFactory;
14+
import org.hibernate.testing.orm.junit.SessionFactoryScope;
15+
import org.junit.jupiter.api.AfterEach;
16+
import org.junit.jupiter.api.Test;
1817

1918
import static org.junit.jupiter.api.Assertions.assertEquals;
2019
import static org.junit.jupiter.api.Assertions.fail;
2120

21+
@SuppressWarnings("JUnitMalformedDeclaration")
2222
@DomainModel(
2323
annotatedClasses = {
2424
EmbeddableInheritanceHierarchyOrderTest.Animal.class,
@@ -33,9 +33,9 @@
3333
@SessionFactory
3434
public class EmbeddableInheritanceHierarchyOrderTest {
3535

36-
@AfterAll
36+
@AfterEach
3737
static void clean(SessionFactoryScope scope) {
38-
scope.inTransaction( session -> session.createMutationQuery( "delete from Owner" ).executeUpdate() );
38+
scope.dropData();
3939
}
4040

4141
@Test
@@ -53,8 +53,7 @@ public void test(SessionFactoryScope scope) {
5353
assertEquals( "Agapius", animalOwner.getPet().getName() );
5454

5555
final Owner fishOwner = session.find( Owner.class, 4L );
56-
if ( fishOwner.getPet() instanceof Fish ) {
57-
final Fish fish = (Fish) fishOwner.getPet();
56+
if ( fishOwner.getPet() instanceof Fish fish ) {
5857
assertEquals( 5, fish.getAge() );
5958
assertEquals( "Dionysius", fish.getName() );
6059
assertEquals( 3, fish.getFins() );
@@ -64,8 +63,7 @@ public void test(SessionFactoryScope scope) {
6463
}
6564

6665
final Owner mammalOwner = session.find( Owner.class, 5L );
67-
if ( mammalOwner.getPet() instanceof Mammal ) {
68-
final Mammal mammal = (Mammal) mammalOwner.getPet();
66+
if ( mammalOwner.getPet() instanceof Mammal mammal ) {
6967
assertEquals( 6, mammal.getAge() );
7068
assertEquals( "Epagraphas", mammal.getName() );
7169
assertEquals( "Eanswida", mammal.getMother() );
@@ -75,8 +73,7 @@ public void test(SessionFactoryScope scope) {
7573
}
7674

7775
final Owner catOwner = session.find( Owner.class, 2L );
78-
if ( catOwner.getPet() instanceof Cat ) {
79-
final Cat cat = (Cat) catOwner.getPet();
76+
if ( catOwner.getPet() instanceof Cat cat ) {
8077
assertEquals( 3, cat.getAge() );
8178
assertEquals( "Bercharius", cat.getName() );
8279
assertEquals( "Blaesilla", cat.getMother() );
@@ -86,8 +83,7 @@ public void test(SessionFactoryScope scope) {
8683
}
8784

8885
final Owner dogOwner = session.find( Owner.class, 3L );
89-
if ( dogOwner.getPet() instanceof Dog ) {
90-
final Dog dog = (Dog) dogOwner.getPet();
86+
if ( dogOwner.getPet() instanceof Dog dog ) {
9187
assertEquals( 4, dog.getAge() );
9288
assertEquals( "Censurius", dog.getName() );
9389
assertEquals( "Caesarea", dog.getMother() );

‎hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/EmbeddableInheritanceReplaceTest.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@
1616
import org.hibernate.testing.orm.junit.JiraKey;
1717
import org.hibernate.testing.orm.junit.SessionFactory;
1818
import org.hibernate.testing.orm.junit.SessionFactoryScope;
19+
import org.junit.jupiter.api.AfterEach;
1920
import org.junit.jupiter.api.Test;
2021

22+
@SuppressWarnings("JUnitMalformedDeclaration")
2123
@DomainModel(annotatedClasses = {
2224
EmbeddableInheritanceReplaceTest.Emb.class,
2325
EmbeddableInheritanceReplaceTest.Base.class,
@@ -27,6 +29,10 @@
2729
@SessionFactory
2830
@JiraKey("HHH-19079")
2931
public class EmbeddableInheritanceReplaceTest {
32+
@AfterEach
33+
void tearDown(SessionFactoryScope factoryScope) {
34+
factoryScope.dropData();
35+
}
3036

3137
@Test
3238
void merge(SessionFactoryScope scope) {

‎hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/HierarchyOrderTest.java‎

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

7-
import org.hibernate.testing.orm.junit.DomainModel;
8-
import org.hibernate.testing.orm.junit.SessionFactory;
9-
import org.hibernate.testing.orm.junit.SessionFactoryScope;
10-
import org.junit.jupiter.api.BeforeEach;
11-
import org.junit.jupiter.api.Test;
12-
137
import jakarta.persistence.Embeddable;
148
import jakarta.persistence.Embedded;
159
import jakarta.persistence.Entity;
16-
import jakarta.persistence.EntityManagerFactory;
1710
import jakarta.persistence.GeneratedValue;
1811
import jakarta.persistence.Id;
1912
import jakarta.persistence.Inheritance;
2013
import jakarta.persistence.InheritanceType;
2114
import jakarta.persistence.TypedQuery;
15+
import org.hibernate.testing.orm.junit.DomainModel;
16+
import org.hibernate.testing.orm.junit.SessionFactory;
17+
import org.hibernate.testing.orm.junit.SessionFactoryScope;
18+
import org.junit.jupiter.api.AfterEach;
19+
import org.junit.jupiter.api.BeforeEach;
20+
import org.junit.jupiter.api.Test;
2221

2322
import static org.junit.jupiter.api.Assertions.assertEquals;
2423
import static org.junit.jupiter.api.Assertions.assertNotNull;
2524

25+
@SuppressWarnings({"JUnitMalformedDeclaration", "removal"})
2626
@DomainModel(
2727
annotatedClasses = {
2828
HierarchyOrderTest.DerOA.class,
@@ -35,32 +35,31 @@
3535
)
3636
@SessionFactory
3737
class HierarchyOrderTest {
38-
39-
private EntityManagerFactory emf;
4038
private DerOA deroa;
4139
private DerOB derob;
4240

41+
@AfterEach
42+
void tearDown(SessionFactoryScope factoryScope) {
43+
factoryScope.dropData();
44+
}
45+
4346
@BeforeEach
44-
void setUp() {
47+
void setUp(SessionFactoryScope factoryScope) {
4548
DerDB derba1 = new DerDB( 5 );
4649
DerDA derda1 = new DerDA( "1", "abase" );
4750
deroa = new DerOA( derda1 );
4851
derob = new DerOB( derba1 );
49-
// emf = buildEntityManagerFactory();
52+
factoryScope.inTransaction( (em) -> {
53+
em.persist( deroa );
54+
em.persist( derob );
55+
} );
5056
}
5157

5258
@Test
53-
void testBaseProperty(SessionFactoryScope scope) {
54-
scope.inSession( em -> {
55-
em.getTransaction().begin();
56-
em.persist( deroa );
57-
em.persist( derob );
58-
em.getTransaction().commit();
59-
Integer ida = deroa.getId();
60-
Integer idb = derob.getId();
61-
em.clear();
59+
void testBaseProperty(SessionFactoryScope factoryScope) {
60+
factoryScope.inSession( em -> {
6261
TypedQuery<DerOA> qa = em.createQuery( "select o from DerOA o where o.id =:id", DerOA.class );
63-
qa.setParameter( "id", ida );
62+
qa.setParameter( "id", deroa.getId() );
6463
DerOA deroain = qa.getSingleResult();
6564
assertEquals( "abase", deroain.derda.baseprop );
6665
} );
@@ -69,15 +68,8 @@ void testBaseProperty(SessionFactoryScope scope) {
6968
@Test
7069
void testDerivedProperty(SessionFactoryScope scope) {
7170
scope.inSession( em -> {
72-
em.getTransaction().begin();
73-
em.persist( deroa );
74-
em.persist( derob );
75-
em.getTransaction().commit();
76-
Integer idb = derob.getId();
77-
em.clear();
78-
7971
TypedQuery<DerOB> qb = em.createQuery( "select o from DerOB o where o.id =:id", DerOB.class );
80-
qb.setParameter( "id", idb );
72+
qb.setParameter( "id", derob.getId() );
8173
DerOB derobin = qb.getSingleResult();
8274
assertNotNull( derobin );
8375
assertEquals( 5, derobin.derdb().b );

0 commit comments

Comments
 (0)