HHH-19846 - Remove JUnit4: org.hibernate.orm.test.dialect.unit.locktimeout

Signed-off-by: Jan Schatteman <[email protected]>

Author: jrenaat

hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/DB2LockTimeoutTest.java

@@ -9,18 +9,17 @@
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.DatabaseVersion;
 import org.hibernate.dialect.Dialect;
-import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.hibernate.testing.orm.junit.RequiresDialect;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.hibernate.Timeouts.SKIP_LOCKED;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author Gavin King
  */
 @RequiresDialect(DB2Dialect.class)
-public class DB2LockTimeoutTest extends BaseUnitTestCase {
+public class DB2LockTimeoutTest {
 
 	private final Dialect dialect = new DB2Dialect( DatabaseVersion.make( 11, 5 ) );
 

hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/HANALockTimeoutTest.java

@@ -8,13 +8,12 @@
 import org.hibernate.LockOptions;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.HANADialect;
-import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.hibernate.testing.orm.junit.RequiresDialect;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.hibernate.Timeouts.NO_WAIT;
 import static org.hibernate.Timeouts.SKIP_LOCKED;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Expected lock clauses according to the official HANA FOR UPDATE clause documentation:
@@ -24,7 +23,7 @@
  * @author Vlad Mihalcea
  */
 @RequiresDialect(HANADialect.class)
-public class HANALockTimeoutTest extends BaseUnitTestCase {
+public class HANALockTimeoutTest {
 
 	private final Dialect dialect = new HANADialect();
 

hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/OracleLockTimeoutTest.java

@@ -9,19 +9,18 @@
 import org.hibernate.dialect.DatabaseVersion;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.OracleDialect;
-import org.hibernate.testing.RequiresDialect;
-import org.hibernate.testing.junit4.BaseUnitTestCase;
-import org.junit.Test;
+import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.junit.jupiter.api.Test;
 
 import static org.hibernate.Timeouts.NO_WAIT;
 import static org.hibernate.Timeouts.SKIP_LOCKED;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author Vlad Mihalcea
  */
 @RequiresDialect(OracleDialect.class)
-public class OracleLockTimeoutTest extends BaseUnitTestCase {
+public class OracleLockTimeoutTest {
 
 	private final Dialect dialect = new OracleDialect( DatabaseVersion.make( 12 ) );
 

hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/PostgreSQLLockTimeoutTest.java

@@ -9,19 +9,18 @@
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 
-import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.hibernate.testing.orm.junit.RequiresDialect;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.hibernate.Timeouts.NO_WAIT;
 import static org.hibernate.Timeouts.SKIP_LOCKED;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author Vlad Mihalcea
  */
 @RequiresDialect(PostgreSQLDialect.class)
-public class PostgreSQLLockTimeoutTest extends BaseUnitTestCase {
+public class PostgreSQLLockTimeoutTest {
 
 	private final Dialect dialect = new PostgreSQLDialect();