Skip to content

Commit 8e1b9a9

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 287debf commit 8e1b9a9

16 files changed

+613
-667
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/flush/AlwaysFlushTest.java‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,55 +4,56 @@
44
*/
55
package org.hibernate.orm.test.flush;
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.GeneratedValue;
1311
import jakarta.persistence.Id;
1412
import jakarta.persistence.ManyToOne;
1513
import jakarta.persistence.OneToMany;
16-
1714
import org.hibernate.FlushMode;
1815
import org.hibernate.Session;
19-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
16+
import org.hibernate.testing.orm.junit.DomainModel;
17+
import org.hibernate.testing.orm.junit.SessionFactory;
18+
import org.hibernate.testing.orm.junit.SessionFactoryScope;
19+
import org.jboss.logging.Logger;
20+
import org.junit.jupiter.api.Test;
2021

21-
import org.junit.Test;
22+
import java.util.ArrayList;
23+
import java.util.List;
2224

23-
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
24-
import static org.junit.Assert.assertTrue;
25+
import static org.junit.jupiter.api.Assertions.assertEquals;
2526

2627
/**
2728
* @author Vlad Mihalcea
2829
*/
29-
public class AlwaysFlushTest extends BaseEntityManagerFunctionalTestCase {
30-
31-
@Override
32-
protected Class<?>[] getAnnotatedClasses() {
33-
return new Class<?>[] {
34-
Person.class,
35-
Phone.class,
36-
Advertisement.class
37-
};
38-
}
30+
@SuppressWarnings("JUnitMalformedDeclaration")
31+
@DomainModel(annotatedClasses = {
32+
AlwaysFlushTest.Person.class,
33+
AlwaysFlushTest.Phone.class,
34+
AlwaysFlushTest.Advertisement.class
35+
})
36+
@SessionFactory
37+
public class AlwaysFlushTest {
38+
private final Logger log = Logger.getLogger( AlwaysFlushTest.class );
3939

4040
@Test
41-
public void testFlushSQL() {
42-
doInJPA(this::entityManagerFactory, entityManager -> {
41+
public void testFlushSQL(SessionFactoryScope factoryScope) {
42+
factoryScope.inTransaction( entityManager -> {
4343
entityManager.createNativeQuery("delete from Person").executeUpdate();
4444
});
45-
doInJPA(this::entityManagerFactory, entityManager -> {
45+
46+
factoryScope.inTransaction( entityManager -> {
4647
log.info("testFlushSQL");
4748
//tag::flushing-always-flush-sql-example[]
4849
Person person = new Person("John Doe");
4950
entityManager.persist(person);
5051

5152
Session session = entityManager.unwrap(Session.class);
52-
assertTrue(((Number) session
53-
.createNativeQuery("select count(*) from Person", Integer.class)
54-
.setHibernateFlushMode(FlushMode.ALWAYS)
55-
.uniqueResult()).intValue() == 1);
53+
assertEquals( 1, session
54+
.createNativeQuery( "select count(*) from Person", Integer.class )
55+
.setHibernateFlushMode( FlushMode.ALWAYS )
56+
.uniqueResult().intValue() );
5657
//end::flushing-always-flush-sql-example[]
5758
});
5859
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/flush/AutoFlushBeforeLoadTest.java‎

Lines changed: 41 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,12 @@
99

1010
import org.hibernate.annotations.NaturalId;
1111

12-
import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner;
1312
import org.hibernate.testing.bytecode.enhancement.EnhancementOptions;
14-
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
13+
import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
14+
import org.hibernate.testing.orm.junit.DomainModel;
1515
import org.hibernate.testing.orm.junit.JiraKey;
1616

17-
import org.junit.After;
18-
import org.junit.Before;
19-
import org.junit.Test;
20-
import org.junit.runner.RunWith;
17+
import org.hibernate.testing.orm.junit.SessionFactory;
2118

2219
import jakarta.persistence.CascadeType;
2320
import jakarta.persistence.Column;
@@ -29,70 +26,59 @@
2926
import jakarta.persistence.ManyToOne;
3027
import jakarta.persistence.OneToMany;
3128
import jakarta.persistence.OneToOne;
29+
import org.hibernate.testing.orm.junit.SessionFactoryScope;
30+
import org.junit.jupiter.api.AfterEach;
31+
import org.junit.jupiter.api.BeforeEach;
32+
import org.junit.jupiter.api.Test;
3233

3334
import static org.junit.jupiter.api.Assertions.assertEquals;
3435

3536
/**
3637
* @author Jan Schatteman
3738
*/
38-
@RunWith(BytecodeEnhancerRunner.class)
39-
@EnhancementOptions(biDirectionalAssociationManagement = true)
39+
@SuppressWarnings("JUnitMalformedDeclaration")
4040
@JiraKey(value = "HHH-17947")
41-
public class AutoFlushBeforeLoadTest extends BaseCoreFunctionalTestCase {
42-
43-
@Override
44-
protected Class[] getAnnotatedClasses() {
45-
return new Class[] {
46-
Person.class,
47-
Phone.class,
48-
DriversLicense.class
49-
};
50-
}
51-
52-
@Before
53-
public void setupData() {
54-
inTransaction(
55-
session -> {
56-
Person p = new Person( 1L, "John Doe" );
57-
session.persist( p );
58-
}
59-
);
41+
@BytecodeEnhanced
42+
@EnhancementOptions(biDirectionalAssociationManagement = true)
43+
@DomainModel(annotatedClasses = {
44+
AutoFlushBeforeLoadTest.Person.class,
45+
AutoFlushBeforeLoadTest.Phone.class,
46+
AutoFlushBeforeLoadTest.DriversLicense.class
47+
})
48+
@SessionFactory
49+
public class AutoFlushBeforeLoadTest {
50+
@BeforeEach
51+
public void setupData(SessionFactoryScope factoryScope) {
52+
factoryScope.inTransaction(session -> {
53+
Person p = new Person( 1L, "John Doe" );
54+
session.persist( p );
55+
} );
6056
}
6157

62-
@After
63-
public void tearDown() {
64-
inTransaction(
65-
session -> {
66-
session.createMutationQuery( "delete from DriversLicense" ).executeUpdate();
67-
session.createMutationQuery( "delete from Phone" ).executeUpdate();
68-
session.createMutationQuery( "delete from Person" ).executeUpdate();
69-
}
70-
);
58+
@AfterEach
59+
public void tearDown(SessionFactoryScope factoryScope) {
60+
factoryScope.dropData();
7161
}
7262

7363
@Test
74-
public void testCollectionInitialization() {
75-
inTransaction(
76-
session -> {
77-
Phone phone = new Phone( session.getReference( Person.class, 1L ), "1234567890" );
78-
session.persist( phone );
79-
Person person = session.createQuery( "select p from Person p", Person.class ).getSingleResult();
80-
assertEquals( 1, person.getPhones().size() );
81-
}
82-
);
64+
public void testCollectionInitialization(SessionFactoryScope factoryScope) {
65+
factoryScope.inTransaction(session -> {
66+
Phone phone = new Phone( session.getReference( Person.class, 1L ), "1234567890" );
67+
session.persist( phone );
68+
Person person = session.createQuery( "select p from Person p", Person.class ).getSingleResult();
69+
assertEquals( 1, person.getPhones().size() );
70+
} );
8371
}
8472

8573
@Test
86-
public void testOneToOneInitialization() {
87-
inTransaction(
88-
session -> {
89-
DriversLicense driversLicense = new DriversLicense( 1L, session.getReference( Person.class, 1L ), "999" );
90-
session.persist( driversLicense );
91-
Person person = session.createQuery( "select p from Person p", Person.class ).getSingleResult();
92-
assertEquals( driversLicense, person.getDriversLicense() );
93-
session.clear();
94-
}
95-
);
74+
public void testOneToOneInitialization(SessionFactoryScope factoryScope) {
75+
factoryScope.inTransaction(session -> {
76+
DriversLicense driversLicense = new DriversLicense( 1L, session.getReference( Person.class, 1L ), "999" );
77+
session.persist( driversLicense );
78+
Person person = session.createQuery( "select p from Person p", Person.class ).getSingleResult();
79+
assertEquals( driversLicense, person.getDriversLicense() );
80+
session.clear();
81+
} );
9682
}
9783

9884
@Entity(name = "Person")

‎hibernate-core/src/test/java/org/hibernate/orm/test/flush/AutoFlushRemoveTest.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,36 +15,34 @@
1515
import org.hibernate.testing.orm.junit.Jira;
1616
import org.hibernate.testing.orm.junit.SessionFactory;
1717
import org.hibernate.testing.orm.junit.SessionFactoryScope;
18-
import org.junit.jupiter.api.AfterAll;
19-
import org.junit.jupiter.api.BeforeAll;
18+
import org.junit.jupiter.api.AfterEach;
19+
import org.junit.jupiter.api.BeforeEach;
2020
import org.junit.jupiter.api.Test;
2121

2222
import java.util.HashSet;
2323
import java.util.Set;
2424

2525
import static org.assertj.core.api.Assertions.assertThat;
2626

27+
@SuppressWarnings("JUnitMalformedDeclaration")
2728
@SessionFactory
2829
@DomainModel( annotatedClasses = {
2930
AutoFlushRemoveTest.Item.class,
3031
AutoFlushRemoveTest.Comment.class,
3132
} )
3233
@Jira( "https://hibernate.atlassian.net/browse/HHH-3354" )
3334
public class AutoFlushRemoveTest {
34-
@BeforeAll
35+
@BeforeEach
3536
public void setUp(SessionFactoryScope scope) {
3637
scope.inTransaction( session -> {
3738
final Item first = new Item( 1L, "item" );
3839
session.persist( first );
3940
} );
4041
}
4142

42-
@AfterAll
43+
@AfterEach
4344
public void tearDown(SessionFactoryScope scope) {
44-
scope.inTransaction( session -> {
45-
session.createMutationQuery( "delete from Comment" ).executeUpdate();
46-
session.createMutationQuery( "delete from Item" ).executeUpdate();
47-
} );
45+
scope.dropData();
4846
}
4947

5048
@Test

0 commit comments

Comments
 (0)