Skip to content

Commit a0a4710

Browse files
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 d002f76 commit a0a4710

29 files changed

+760
-1045
lines changed

hibernate-core/src/main/java/org/hibernate/engine/spi/TransactionCompletionCallbacksImplementor.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010
* @since 7.2
1111
*
1212
* @author Gavin King
13-
*
1413
*/
15-
@Incubating // is this separate interface really needed?
14+
@Incubating
1615
public interface TransactionCompletionCallbacksImplementor extends TransactionCompletionCallbacks {
1716
/**
1817
* Are there any registered before-completion callbacks?

hibernate-core/src/main/java/org/hibernate/service/internal/AbstractServiceRegistryImpl.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,7 @@ public <R extends Service> void startService(ServiceBinding<R> serviceBinding) {
340340
}
341341
}
342342

343+
@Override
343344
public boolean isActive() {
344345
return active.get();
345346
}

hibernate-core/src/main/java/org/hibernate/service/spi/ServiceRegistryImplementor.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ default void close() {
3030
destroy();
3131
}
3232

33+
boolean isActive();
34+
3335
/**
3436
* Release resources
3537
*/

hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/BaseExceptionHandlingTest.java

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,15 @@
44
*/
55
package org.hibernate.orm.test.exceptionhandling;
66

7-
import java.util.Arrays;
8-
import java.util.Map;
7+
import org.junit.jupiter.params.ParameterizedClass;
8+
import org.junit.jupiter.params.provider.MethodSource;
99

10-
import org.hibernate.testing.junit4.CustomParameterized;
11-
import org.junit.runner.RunWith;
12-
import org.junit.runners.Parameterized;
10+
import java.util.Arrays;
1311

14-
@RunWith(CustomParameterized.class)
12+
@ParameterizedClass
13+
@MethodSource("parameters")
1514
public abstract class BaseExceptionHandlingTest extends BaseJpaOrNativeBootstrapFunctionalTestCase {
1615

17-
@Parameterized.Parameters(name = "Bootstrap={0}, ExceptionHandlingSetting={1}")
1816
public static Iterable<Object[]> parameters() {
1917
return Arrays.asList( new Object[][] {
2018
{ BootstrapMethod.JPA, ExceptionExpectations.jpa() },
@@ -30,7 +28,4 @@ protected BaseExceptionHandlingTest(
3028
super( bootstrapMethod );
3129
this.exceptionExpectations = exceptionExpectations;
3230
}
33-
34-
@Override
35-
protected void configure(Map<String, Object> properties) {}
3631
}

0 commit comments

Comments
 (0)