Skip to content

Commit ffd56c0

Browse files
committed
HHH-19846 - Drop JUnit 4 usage: org.hibernate.orm.test.jpa.secondarytable
Signed-off-by: Jan Schatteman <jschatte@redhat.com>
1 parent af8782c commit ffd56c0

File tree

3 files changed

+22
-47
lines changed

3 files changed

+22
-47
lines changed

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/AbstractNonOptionalSecondaryTableTest.java

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,22 @@
44
*/
55
package org.hibernate.orm.test.jpa.secondarytable;
66

7-
import java.util.Arrays;
87
import java.util.Map;
98

109
import org.hibernate.cfg.AvailableSettings;
11-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
1210

13-
import org.junit.runners.Parameterized;
11+
import org.hibernate.testing.orm.junit.EntityManagerFactoryBasedFunctionalTest;
12+
import org.junit.jupiter.params.Parameter;
13+
import org.junit.jupiter.params.ParameterizedClass;
14+
import org.junit.jupiter.params.provider.EnumSource;
1415

15-
public abstract class AbstractNonOptionalSecondaryTableTest extends BaseEntityManagerFunctionalTestCase {
16-
public enum JpaComplianceCachingSetting{ DEFAULT, TRUE, FALSE };
16+
@ParameterizedClass
17+
@EnumSource(value = AbstractNonOptionalSecondaryTableTest.JpaComplianceCachingSetting.class)
18+
public abstract class AbstractNonOptionalSecondaryTableTest extends EntityManagerFactoryBasedFunctionalTest {
19+
public enum JpaComplianceCachingSetting{ DEFAULT, TRUE, FALSE }
1720

18-
private final JpaComplianceCachingSetting jpaComplianceCachingSetting;
19-
20-
@Parameterized.Parameters(name = "JpaComplianceCachingSetting={0}")
21-
public static Iterable<Object[]> parameters() {
22-
return Arrays.asList(
23-
new Object[][] {
24-
{ JpaComplianceCachingSetting.DEFAULT },
25-
{ JpaComplianceCachingSetting.FALSE },
26-
{ JpaComplianceCachingSetting.TRUE }
27-
}
28-
);
29-
}
30-
31-
AbstractNonOptionalSecondaryTableTest(JpaComplianceCachingSetting jpaComplianceCachingSetting) {
32-
this.jpaComplianceCachingSetting = jpaComplianceCachingSetting;
33-
}
21+
@Parameter
22+
private JpaComplianceCachingSetting jpaComplianceCachingSetting;
3423

3524
@Override
3625
protected void addConfigOptions(Map options) {

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/JoinedTableNullNonOptionalSecondaryTableTest.java

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,19 @@
1313

1414
import org.hibernate.annotations.SecondaryRow;
1515

16-
import org.hibernate.testing.junit4.CustomParameterized;
17-
import org.junit.After;
18-
import org.junit.Test;
19-
import org.junit.runner.RunWith;
16+
import org.junit.jupiter.api.AfterEach;
17+
import org.junit.jupiter.api.Test;
2018

2119
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
22-
import static org.junit.Assert.assertEquals;
23-
import static org.junit.Assert.assertNotNull;
24-
import static org.junit.Assert.assertNull;
20+
import static org.junit.jupiter.api.Assertions.assertEquals;
21+
import static org.junit.jupiter.api.Assertions.assertNotNull;
22+
import static org.junit.jupiter.api.Assertions.assertNull;
2523

2624
/**
2725
* @author Gail Badner
2826
*/
29-
@RunWith(CustomParameterized.class)
3027
public class JoinedTableNullNonOptionalSecondaryTableTest extends AbstractNonOptionalSecondaryTableTest {
3128

32-
public JoinedTableNullNonOptionalSecondaryTableTest(JpaComplianceCachingSetting jpaComplianceCachingSetting) {
33-
super( jpaComplianceCachingSetting );
34-
}
35-
3629
@Test
3730
public void testRowAddedForNullValue() {
3831
doInJPA(
@@ -86,7 +79,7 @@ public void testRowAddedForNullValueInSubclassTable() {
8679
);
8780
}
8881

89-
@After
82+
@AfterEach
9083
public void cleanupData() {
9184
doInJPA(
9285
this::entityManagerFactory, entityManager -> {

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/SingleTableNullNonOptionalSecondaryTableTest.java

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,19 @@
1111

1212
import org.hibernate.annotations.SecondaryRow;
1313

14-
import org.hibernate.testing.junit4.CustomParameterized;
15-
import org.junit.After;
16-
import org.junit.Test;
17-
import org.junit.runner.RunWith;
14+
import org.junit.jupiter.api.AfterEach;
15+
import org.junit.jupiter.api.Test;
1816

1917
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
20-
import static org.junit.Assert.assertEquals;
21-
import static org.junit.Assert.assertNotNull;
22-
import static org.junit.Assert.assertNull;
18+
import static org.junit.jupiter.api.Assertions.assertEquals;
19+
import static org.junit.jupiter.api.Assertions.assertNotNull;
20+
import static org.junit.jupiter.api.Assertions.assertNull;
2321

2422
/**
2523
* @author Gail Badner
2624
*/
27-
@RunWith(CustomParameterized.class)
2825
public class SingleTableNullNonOptionalSecondaryTableTest extends AbstractNonOptionalSecondaryTableTest {
2926

30-
public SingleTableNullNonOptionalSecondaryTableTest(JpaComplianceCachingSetting jpaComplianceCachingSetting) {
31-
super( jpaComplianceCachingSetting );
32-
}
33-
3427
@Test
3528
public void testRowAddedForNullValue() {
3629
doInJPA(
@@ -122,7 +115,7 @@ public void testEntityWithBadDataInSubclassSecondaryTableIgnored() {
122115
);
123116
}
124117

125-
@After
118+
@AfterEach
126119
public void cleanupData() {
127120
doInJPA(
128121
this::entityManagerFactory, entityManager -> {

0 commit comments

Comments
 (0)