Skip to content

Commit 3d34cc4

Browse files
marko-bekhtamarko-bekhta
committed
HHH-19916 Drop JUnit 4 usage
1 parent dd565eb commit 3d34cc4

File tree

65 files changed

+3420
-3883
lines changed

Some content is hidden

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

65 files changed

+3420
-3883
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/ReflectionOptimizerTest.java‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,30 @@
55
package org.hibernate.orm.test.bytecode;
66

77
import static org.hibernate.bytecode.internal.BytecodeProviderInitiator.buildDefaultBytecodeProvider;
8-
import static org.junit.Assert.assertEquals;
9-
import static org.junit.Assert.assertNotNull;
8+
import static org.junit.jupiter.api.Assertions.assertEquals;
9+
import static org.junit.jupiter.api.Assertions.assertNotNull;
1010

1111
import org.hibernate.bytecode.spi.BytecodeProvider;
1212
import org.hibernate.bytecode.spi.ReflectionOptimizer;
1313

1414
import org.hibernate.testing.orm.junit.JiraKey;
15-
import org.hibernate.testing.junit4.BaseUnitTestCase;
16-
import org.junit.AfterClass;
17-
import org.junit.BeforeClass;
18-
import org.junit.Test;
15+
import org.junit.jupiter.api.AfterAll;
16+
import org.junit.jupiter.api.BeforeAll;
17+
import org.junit.jupiter.api.Test;
1918

2019
/**
2120
* @author Steve Ebersole
2221
*/
23-
public class ReflectionOptimizerTest extends BaseUnitTestCase {
22+
public class ReflectionOptimizerTest {
2423

2524
private static BytecodeProvider provider;
2625

27-
@BeforeClass
26+
@BeforeAll
2827
public static void initBytecodeProvider() {
2928
provider = buildDefaultBytecodeProvider();
3029
}
3130

32-
@AfterClass
31+
@AfterAll
3332
public static void clearBytecodeProvider() {
3433
if ( provider != null ) {
3534
provider.resetCaches();
@@ -50,35 +49,37 @@ public void testReflectionOptimization() {
5049
assertNotNull( optimizer.getAccessOptimizer() );
5150

5251
Object instance = optimizer.getInstantiationOptimizer().newInstance();
53-
assertEquals( instance.getClass(), Bean.class );
54-
Bean bean = ( Bean ) instance;
52+
assertEquals( Bean.class, instance.getClass() );
53+
Bean bean = (Bean) instance;
5554

5655
optimizer.getAccessOptimizer().setPropertyValues( bean, BeanReflectionHelper.TEST_VALUES );
57-
assertEquals( bean.getSomeString(), BeanReflectionHelper.TEST_VALUES[0] );
56+
assertEquals( BeanReflectionHelper.TEST_VALUES[0], bean.getSomeString() );
5857
Object[] values = optimizer.getAccessOptimizer().getPropertyValues( bean );
5958
assertEquivalent( values, BeanReflectionHelper.TEST_VALUES );
6059
}
6160

6261
@Test
6362
@JiraKey(value = "HHH-12584")
6463
public void testAbstractClass() {
65-
ReflectionOptimizer reflectionOptimizer = provider.getReflectionOptimizer( AbstractClass.class, new String[]{ "getProperty" },
66-
new String[]{ "setProperty" }, new Class[]{ String.class } );
64+
ReflectionOptimizer reflectionOptimizer = provider.getReflectionOptimizer( AbstractClass.class,
65+
new String[] {"getProperty"},
66+
new String[] {"setProperty"}, new Class[] {String.class} );
6767
assertNotNull( reflectionOptimizer );
6868
}
6969

7070
@Test
7171
@JiraKey(value = "HHH-12584")
7272
public void testInterface() {
73-
ReflectionOptimizer reflectionOptimizer = provider.getReflectionOptimizer( Interface.class, new String[]{ "getProperty" },
74-
new String[]{ "setProperty" }, new Class[]{ String.class } );
73+
ReflectionOptimizer reflectionOptimizer = provider.getReflectionOptimizer( Interface.class,
74+
new String[] {"getProperty"},
75+
new String[] {"setProperty"}, new Class[] {String.class} );
7576
assertNotNull( reflectionOptimizer );
7677
}
7778

7879
private void assertEquivalent(Object[] checkValues, Object[] values) {
79-
assertEquals( "Different lengths", checkValues.length, values.length );
80+
assertEquals( checkValues.length, values.length, "Different lengths" );
8081
for ( int i = 0; i < checkValues.length; i++ ) {
81-
assertEquals( "different values at index [" + i + "]", checkValues[i], values[i] );
82+
assertEquals( checkValues[i], values[i], "different values at index [" + i + "]" );
8283
}
8384
}
8485

‎hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazySqlResultMappingTest.java‎

Lines changed: 72 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@
88

99
import org.hibernate.Hibernate;
1010

11-
import org.hibernate.testing.FailureExpected;
11+
import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
12+
import org.hibernate.testing.orm.junit.DomainModel;
13+
import org.hibernate.testing.orm.junit.FailureExpected;
1214
import org.hibernate.testing.orm.junit.JiraKey;
13-
import org.junit.After;
14-
import org.junit.Before;
15-
import org.junit.Test;
15+
import org.hibernate.testing.orm.junit.SessionFactory;
16+
import org.hibernate.testing.orm.junit.SessionFactoryScope;
17+
import org.junit.jupiter.api.AfterEach;
1618
import org.junit.jupiter.api.Assertions;
17-
import org.junit.runner.RunWith;
1819

1920
import jakarta.persistence.Basic;
2021
import jakarta.persistence.Entity;
@@ -26,102 +27,103 @@
2627
import jakarta.persistence.SqlResultSetMapping;
2728
import jakarta.persistence.Table;
2829

29-
import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner;
30-
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
31-
32-
import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
30+
import org.junit.jupiter.api.BeforeEach;
31+
import org.junit.jupiter.api.Test;
3332

3433
/**
3534
* @author Jan Schatteman
3635
* @author Christian Beikov
3736
*/
38-
@RunWith( BytecodeEnhancerRunner.class )
39-
public class LazySqlResultMappingTest extends BaseCoreFunctionalTestCase {
40-
41-
@Override
42-
protected Class<?>[] getAnnotatedClasses() {
43-
return new Class[]{ User.class };
44-
}
45-
46-
@Before
47-
public void prepareData() {
48-
doInHibernate( this::sessionFactory,
49-
session -> {
50-
session.persist(new User(1L, (byte)1));
51-
}
37+
@DomainModel(
38+
annotatedClasses = {
39+
LazySqlResultMappingTest.User.class
40+
}
41+
)
42+
@SessionFactory
43+
@BytecodeEnhanced
44+
public class LazySqlResultMappingTest {
45+
46+
@BeforeEach
47+
public void prepareData(SessionFactoryScope scope) {
48+
scope.inTransaction( session -> {
49+
session.persist( new User( 1L, (byte) 1 ) );
50+
}
5251
);
5352
}
5453

55-
@After
56-
public void cleanupData() {
57-
doInHibernate( this::sessionFactory,
58-
session -> {
59-
session.createMutationQuery("delete from User").executeUpdate();
60-
}
61-
);
54+
@AfterEach
55+
public void cleanupData(SessionFactoryScope scope) {
56+
scope.getSessionFactory().getSchemaManager().truncateMappedObjects();
6257
}
6358

6459
@Test
65-
public void testGetIdAndPrincipalUsingFieldResults() {
66-
doInHibernate( this::sessionFactory,
67-
session -> {
68-
List<User> users = session.createNamedQuery( "getIdAndPrincipalUsingFieldResults", User.class ).getResultList();
69-
Assertions.assertTrue( Hibernate.isPropertyInitialized( users.get(0), "principal" ) );
70-
}
60+
public void testGetIdAndPrincipalUsingFieldResults(SessionFactoryScope scope) {
61+
scope.inTransaction( session -> {
62+
List<User> users = session.createNamedQuery( "getIdAndPrincipalUsingFieldResults", User.class )
63+
.getResultList();
64+
Assertions.assertTrue( Hibernate.isPropertyInitialized( users.get( 0 ), "principal" ) );
65+
}
7166
);
7267
}
7368

7469
@Test
75-
@JiraKey( value = "HHH-953" )
76-
public void testGetIdAndPrincipalWithoutUsingFieldResults() {
77-
doInHibernate( this::sessionFactory,
78-
session -> {
79-
List<User> users = session.createNamedQuery( "getIdAndPrincipalWithoutUsingFieldResults", User.class ).getResultList();
80-
Assertions.assertTrue( Hibernate.isPropertyInitialized( users.get(0), "principal" ) );
81-
}
70+
@JiraKey(value = "HHH-953")
71+
public void testGetIdAndPrincipalWithoutUsingFieldResults(SessionFactoryScope scope) {
72+
scope.inTransaction( session -> {
73+
List<User> users = session.createNamedQuery( "getIdAndPrincipalWithoutUsingFieldResults",
74+
User.class ).getResultList();
75+
Assertions.assertTrue( Hibernate.isPropertyInitialized( users.get( 0 ), "principal" ) );
76+
}
8277
);
8378
}
8479

8580
@Test
86-
@JiraKey( value = "HHH-15667" )
87-
@FailureExpected(jiraKey = "HHH-15667", message = "SQLGrammarException: Unable to find column position by name: principal")
88-
public void testGetIdWithoutUsingFieldResults() {
89-
doInHibernate( this::sessionFactory,
90-
session -> {
91-
List<User> users = session.createNamedQuery( "getIdWithoutUsingFieldResults", User.class ).getResultList();
92-
Assertions.assertFalse( Hibernate.isPropertyInitialized( users.get(0), "principal" ) );
93-
}
81+
@JiraKey(value = "HHH-15667")
82+
@FailureExpected(jiraKey = "HHH-15667",
83+
reason = "SQLGrammarException: Unable to find column position by name: principal")
84+
public void testGetIdWithoutUsingFieldResults(SessionFactoryScope scope) {
85+
scope.inTransaction( session -> {
86+
List<User> users = session.createNamedQuery( "getIdWithoutUsingFieldResults", User.class )
87+
.getResultList();
88+
Assertions.assertFalse( Hibernate.isPropertyInitialized( users.get( 0 ), "principal" ) );
89+
}
9490
);
9591
}
9692

9793
@Test
98-
public void testGetIdUsingFieldResults() {
99-
doInHibernate( this::sessionFactory,
100-
session -> {
101-
List<User> users = session.createNamedQuery( "getIdUsingFieldResults", User.class ).getResultList();
102-
Assertions.assertFalse( Hibernate.isPropertyInitialized( users.get(0), "principal" ) );
103-
}
94+
public void testGetIdUsingFieldResults(SessionFactoryScope scope) {
95+
scope.inTransaction( session -> {
96+
List<User> users = session.createNamedQuery( "getIdUsingFieldResults", User.class ).getResultList();
97+
Assertions.assertFalse( Hibernate.isPropertyInitialized( users.get( 0 ), "principal" ) );
98+
}
10499
);
105100
}
106101

107-
@NamedNativeQuery(name = "getIdAndPrincipalUsingFieldResults", query = "select u.id as id, u.principal as principal from user_tbl u", resultSetMapping = "id_and_principal_with_fields")
108-
@NamedNativeQuery(name = "getIdUsingFieldResults", query = "select u.id as id from user_tbl u", resultSetMapping = "id_with_fields")
109-
@NamedNativeQuery(name = "getIdAndPrincipalWithoutUsingFieldResults", query = "select u.id as id, u.principal as principal from user_tbl u", resultSetMapping = "without_fields")
110-
@NamedNativeQuery(name = "getIdWithoutUsingFieldResults", query = "select u.id as id from user_tbl u", resultSetMapping = "without_fields")
111-
112-
@SqlResultSetMapping( name = "id_and_principal_with_fields",
113-
entities = @EntityResult( entityClass = User.class, fields = { @FieldResult(name = "id", column = "id"), @FieldResult(name = "principal", column = "principal") } )
102+
@NamedNativeQuery(name = "getIdAndPrincipalUsingFieldResults",
103+
query = "select u.id as id, u.principal as principal from user_tbl u",
104+
resultSetMapping = "id_and_principal_with_fields")
105+
@NamedNativeQuery(name = "getIdUsingFieldResults", query = "select u.id as id from user_tbl u",
106+
resultSetMapping = "id_with_fields")
107+
@NamedNativeQuery(name = "getIdAndPrincipalWithoutUsingFieldResults",
108+
query = "select u.id as id, u.principal as principal from user_tbl u", resultSetMapping = "without_fields")
109+
@NamedNativeQuery(name = "getIdWithoutUsingFieldResults", query = "select u.id as id from user_tbl u",
110+
resultSetMapping = "without_fields")
111+
112+
@SqlResultSetMapping(name = "id_and_principal_with_fields",
113+
entities = @EntityResult(entityClass = User.class,
114+
fields = {@FieldResult(name = "id", column = "id"), @FieldResult(name = "principal",
115+
column = "principal")})
114116
)
115-
@SqlResultSetMapping( name = "id_with_fields",
116-
entities = @EntityResult( entityClass = User.class, fields = { @FieldResult(name = "id", column = "id") } )
117+
@SqlResultSetMapping(name = "id_with_fields",
118+
entities = @EntityResult(entityClass = User.class, fields = {@FieldResult(name = "id", column = "id")})
117119
)
118-
@SqlResultSetMapping( name = "without_fields",
119-
entities = @EntityResult( entityClass = User.class )
120+
@SqlResultSetMapping(name = "without_fields",
121+
entities = @EntityResult(entityClass = User.class)
120122
)
121123

122-
@Entity( name = "User")
124+
@Entity(name = "User")
123125
@Table(name = "user_tbl")
124-
private static class User {
126+
static class User {
125127
@Id
126128
private Long id;
127129
@Basic(fetch = FetchType.LAZY)

0 commit comments

Comments
 (0)