HHH-19846 - Drop JUnit 4 usage: org.hibernate.orm.test.jpa.secondarytable

Signed-off-by: Jan Schatteman <jschatte@redhat.com>

Author: jrenaat

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

@@ -4,33 +4,22 @@
  */
 package org.hibernate.orm.test.jpa.secondarytable;
 
-import java.util.Arrays;
 import java.util.Map;
 
 import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
 
-import org.junit.runners.Parameterized;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryBasedFunctionalTest;
+import org.junit.jupiter.params.Parameter;
+import org.junit.jupiter.params.ParameterizedClass;
+import org.junit.jupiter.params.provider.EnumSource;
 
-public abstract class AbstractNonOptionalSecondaryTableTest extends BaseEntityManagerFunctionalTestCase {
-	public enum JpaComplianceCachingSetting{ DEFAULT, TRUE, FALSE };
+@ParameterizedClass
+@EnumSource(value = AbstractNonOptionalSecondaryTableTest.JpaComplianceCachingSetting.class)
+public abstract class AbstractNonOptionalSecondaryTableTest extends EntityManagerFactoryBasedFunctionalTest {
+	public enum JpaComplianceCachingSetting{ DEFAULT, TRUE, FALSE }
 
-	private final JpaComplianceCachingSetting jpaComplianceCachingSetting;
-
-	@Parameterized.Parameters(name = "JpaComplianceCachingSetting={0}")
-	public static Iterable<Object[]> parameters() {
-		return Arrays.asList(
-				new Object[][] {
-						{ JpaComplianceCachingSetting.DEFAULT },
-						{ JpaComplianceCachingSetting.FALSE },
-						{ JpaComplianceCachingSetting.TRUE }
-				}
-		);
-	}
-
-	AbstractNonOptionalSecondaryTableTest(JpaComplianceCachingSetting jpaComplianceCachingSetting) {
-		this.jpaComplianceCachingSetting = jpaComplianceCachingSetting;
-	}
+	@Parameter
+	private JpaComplianceCachingSetting jpaComplianceCachingSetting;
 
 	@Override
 	protected void addConfigOptions(Map options) {

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

@@ -13,26 +13,19 @@
 
 import org.hibernate.annotations.SecondaryRow;
 
-import org.hibernate.testing.junit4.CustomParameterized;
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
 import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 /**
  * @author Gail Badner
  */
-@RunWith(CustomParameterized.class)
 public class JoinedTableNullNonOptionalSecondaryTableTest extends AbstractNonOptionalSecondaryTableTest {
 
-	public JoinedTableNullNonOptionalSecondaryTableTest(JpaComplianceCachingSetting jpaComplianceCachingSetting) {
-		super( jpaComplianceCachingSetting );
-	}
-
 	@Test
 	public void testRowAddedForNullValue() {
 		doInJPA(
@@ -86,7 +79,7 @@ public void testRowAddedForNullValueInSubclassTable() {
 		);
 	}
 
-	@After
+	@AfterEach
 	public void cleanupData() {
 		doInJPA(
 				this::entityManagerFactory, entityManager -> {

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

@@ -11,26 +11,19 @@
 
 import org.hibernate.annotations.SecondaryRow;
 
-import org.hibernate.testing.junit4.CustomParameterized;
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
 import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 /**
  * @author Gail Badner
  */
-@RunWith(CustomParameterized.class)
 public class SingleTableNullNonOptionalSecondaryTableTest extends AbstractNonOptionalSecondaryTableTest {
 
-	public SingleTableNullNonOptionalSecondaryTableTest(JpaComplianceCachingSetting jpaComplianceCachingSetting) {
-		super( jpaComplianceCachingSetting );
-	}
-
 	@Test
 	public void testRowAddedForNullValue() {
 		doInJPA(
@@ -122,7 +115,7 @@ public void testEntityWithBadDataInSubclassSecondaryTableIgnored() {
 		);
 	}
 
-	@After
+	@AfterEach
 	public void cleanupData() {
 		doInJPA(
 				this::entityManagerFactory, entityManager -> {