Skip to content

Commit b4a0b7d

Browse files
sebersolesebersole
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 232778b commit b4a0b7d

File tree

6 files changed

+128
-160
lines changed

6 files changed

+128
-160
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/LegacySettingInitiatorTest.java‎

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

7-
import java.util.Collections;
8-
97
import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
108
import org.hibernate.boot.registry.internal.BootstrapServiceRegistryImpl;
119
import org.hibernate.resource.transaction.backend.jdbc.internal.JdbcResourceLocalTransactionCoordinatorBuilderImpl;
1210
import org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorBuilderImpl;
1311
import org.hibernate.resource.transaction.internal.TransactionCoordinatorBuilderInitiator;
1412
import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder;
13+
import org.hibernate.testing.orm.junit.BaseUnitTest;
14+
import org.junit.jupiter.api.AfterEach;
15+
import org.junit.jupiter.api.BeforeEach;
16+
import org.junit.jupiter.api.Test;
1517

16-
import org.hibernate.testing.junit4.BaseUnitTestCase;
17-
import org.junit.After;
18-
import org.junit.Before;
19-
import org.junit.Test;
18+
import java.util.Collections;
2019

2120
import static org.hamcrest.CoreMatchers.instanceOf;
22-
import static org.junit.Assert.assertThat;
21+
import static org.hamcrest.MatcherAssert.assertThat;
2322

2423
/**
2524
* @author Steve Ebersole
2625
*/
27-
public class LegacySettingInitiatorTest extends BaseUnitTestCase {
26+
@BaseUnitTest
27+
public class LegacySettingInitiatorTest {
2828
private BootstrapServiceRegistryImpl bsr;
2929

30-
@Before
30+
@BeforeEach
3131
public void before() {
3232
bsr = (BootstrapServiceRegistryImpl) new BootstrapServiceRegistryBuilder().build();
3333
}
3434

35-
@After
35+
@AfterEach
3636
public void after() {
3737
if ( bsr != null ) {
3838
bsr.destroy();

‎hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/SynchronizationRegistryStandardImplTests.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@
66

77
import jakarta.transaction.Status;
88
import jakarta.transaction.Synchronization;
9-
109
import org.hibernate.orm.test.resource.common.SynchronizationCollectorImpl;
1110
import org.hibernate.orm.test.resource.common.SynchronizationErrorImpl;
1211
import org.hibernate.resource.transaction.LocalSynchronizationException;
1312
import org.hibernate.resource.transaction.NullSynchronizationException;
1413
import org.hibernate.resource.transaction.internal.SynchronizationRegistryStandardImpl;
14+
import org.hibernate.testing.orm.junit.BaseUnitTest;
15+
import org.junit.jupiter.api.Test;
1516

16-
import org.junit.Test;
17-
18-
import static org.junit.Assert.assertEquals;
19-
import static org.junit.Assert.fail;
17+
import static org.assertj.core.api.AssertionsForClassTypes.fail;
18+
import static org.junit.jupiter.api.Assertions.assertEquals;
2019

2120
/**
2221
* Unit tests for SynchronizationRegistryStandardImpl.
2322
*
2423
* @author Steve Ebersole
2524
*/
25+
@BaseUnitTest
2626
public class SynchronizationRegistryStandardImplTests {
2727
@Test
2828
public void basicUsageTests() {

‎hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/AlreadyStartedTransactionTest.java‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,28 @@
44
*/
55
package org.hibernate.orm.test.resource.transaction.jdbc;
66

7-
import org.hibernate.Session;
8-
import org.hibernate.Transaction;
97

8+
import org.hibernate.testing.orm.junit.ExpectedException;
109
import org.hibernate.testing.orm.junit.JiraKey;
11-
import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
12-
import org.junit.Test;
10+
import org.hibernate.testing.orm.junit.SessionFactory;
11+
import org.hibernate.testing.orm.junit.SessionFactoryScope;
12+
import org.junit.jupiter.api.Test;
1313

1414
/**
1515
* @author Andrea Boriero
1616
*/
1717
@JiraKey(value = "HHH-13076")
18-
public class AlreadyStartedTransactionTest extends BaseNonConfigCoreFunctionalTestCase {
18+
@SessionFactory
19+
public class AlreadyStartedTransactionTest {
1920

20-
@Test(expected = IllegalStateException.class)
21-
public void anIllegalStateExceptionShouldBeThrownWhenBeginTxIsCalledWithAnAlreadyActiveTX() {
22-
Transaction transaction = null;
23-
try (Session session = openSession()) {
24-
transaction = session.getTransaction();
21+
@Test
22+
@ExpectedException(IllegalStateException.class)
23+
public void anIllegalStateExceptionShouldBeThrownWhenBeginTxIsCalledWithAnAlreadyActiveTX(SessionFactoryScope factoryScope) throws Exception {
24+
factoryScope.inSession( (session) -> {
25+
var transaction = session.getTransaction();
2526
transaction.begin();
2627
// A call to begin() with an active Tx should cause an IllegalStateException
2728
transaction.begin();
28-
}
29-
finally {
30-
if ( transaction != null && transaction.isActive() ) {
31-
transaction.rollback();
32-
}
33-
}
29+
} );
3430
}
3531
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/BasicJdbcTransactionTests.java‎

Lines changed: 89 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -5,141 +5,116 @@
55
package org.hibernate.orm.test.resource.transaction.jdbc;
66

77
import org.hibernate.TransactionException;
8-
import org.hibernate.boot.MetadataSources;
9-
import org.hibernate.boot.registry.StandardServiceRegistry;
10-
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
11-
import org.hibernate.cfg.AvailableSettings;
12-
import org.hibernate.engine.spi.SessionFactoryImplementor;
138
import org.hibernate.orm.test.resource.common.SynchronizationCollectorImpl;
149
import org.hibernate.orm.test.resource.common.SynchronizationErrorImpl;
10+
import org.hibernate.resource.transaction.backend.jdbc.internal.JdbcResourceLocalTransactionCoordinatorBuilderImpl;
1511
import org.hibernate.resource.transaction.spi.TransactionCoordinator;
12+
import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder;
1613
import org.hibernate.resource.transaction.spi.TransactionStatus;
17-
18-
import org.hibernate.testing.junit4.BaseUnitTestCase;
19-
import org.hibernate.testing.util.ServiceRegistryUtil;
20-
import org.junit.Test;
14+
import org.hibernate.testing.orm.junit.SessionFactory;
15+
import org.hibernate.testing.orm.junit.SessionFactoryScope;
16+
import org.junit.jupiter.api.Test;
2117

2218
import static org.hamcrest.CoreMatchers.anyOf;
2319
import static org.hamcrest.CoreMatchers.is;
2420
import static org.hamcrest.MatcherAssert.assertThat;
25-
import static org.hibernate.testing.transaction.TransactionUtil2.inSession;
26-
import static org.junit.Assert.assertEquals;
21+
import static org.junit.jupiter.api.Assertions.assertEquals;
22+
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
2723

2824
/**
2925
* @author Steve Ebersole
3026
*/
31-
public class BasicJdbcTransactionTests extends BaseUnitTestCase {
32-
33-
private SessionFactoryImplementor generateSessionFactory() {
34-
final StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistryBuilder()
35-
// should be the default, but lets be specific about which we want to test
36-
.applySetting( AvailableSettings.TRANSACTION_COORDINATOR_STRATEGY, "jdbc" )
37-
.build();
38-
try {
39-
return (SessionFactoryImplementor) new MetadataSources( ssr ).buildMetadata().buildSessionFactory();
40-
}
41-
catch (Exception e) {
42-
StandardServiceRegistryBuilder.destroy( ssr );
43-
throw e;
44-
}
27+
@SessionFactory
28+
public class BasicJdbcTransactionTests {
29+
@Test
30+
public void verifyAssumption(SessionFactoryScope factoryScope) {
31+
final TransactionCoordinatorBuilder transactionCoordinatorBuilder = factoryScope
32+
.getSessionFactory()
33+
.getServiceRegistry()
34+
.requireService( TransactionCoordinatorBuilder.class );
35+
assertInstanceOf( JdbcResourceLocalTransactionCoordinatorBuilderImpl.class, transactionCoordinatorBuilder );
4536
}
4637

4738
@Test
48-
public void basicUsageTest() {
49-
try ( final SessionFactoryImplementor sf = generateSessionFactory() ) {
50-
inSession(
51-
sf,
52-
session-> {
53-
final TransactionCoordinator coordinator = session.getTransactionCoordinator();
54-
55-
final SynchronizationCollectorImpl sync = new SynchronizationCollectorImpl();
56-
coordinator.getLocalSynchronizations()
57-
.registerSynchronization( sync );
58-
59-
coordinator.getTransactionDriverControl().begin();
60-
assertEquals( 0, sync.getBeforeCompletionCount() );
61-
assertEquals( 0, sync.getSuccessfulCompletionCount() );
62-
assertEquals( 0, sync.getFailedCompletionCount() );
63-
64-
coordinator.getTransactionDriverControl().commit();
65-
assertEquals( 1, sync.getBeforeCompletionCount() );
66-
assertEquals( 1, sync.getSuccessfulCompletionCount() );
67-
assertEquals( 0, sync.getFailedCompletionCount() );
68-
}
69-
);
70-
71-
}
39+
public void basicUsageTest(SessionFactoryScope factoryScope) {
40+
factoryScope.inSession( (session) -> {
41+
final TransactionCoordinator coordinator = session.getTransactionCoordinator();
42+
43+
final SynchronizationCollectorImpl sync = new SynchronizationCollectorImpl();
44+
coordinator.getLocalSynchronizations()
45+
.registerSynchronization( sync );
46+
47+
coordinator.getTransactionDriverControl().begin();
48+
assertEquals( 0, sync.getBeforeCompletionCount() );
49+
assertEquals( 0, sync.getSuccessfulCompletionCount() );
50+
assertEquals( 0, sync.getFailedCompletionCount() );
51+
52+
coordinator.getTransactionDriverControl().commit();
53+
assertEquals( 1, sync.getBeforeCompletionCount() );
54+
assertEquals( 1, sync.getSuccessfulCompletionCount() );
55+
assertEquals( 0, sync.getFailedCompletionCount() );
56+
} );
7257
}
7358

7459
@Test
75-
@SuppressWarnings("EmptyCatchBlock")
76-
public void testMarkRollbackOnly() {
77-
try ( final SessionFactoryImplementor sf = generateSessionFactory() ) {
78-
inSession(
79-
sf,
80-
session-> {
81-
final TransactionCoordinator coordinator = session.getTransactionCoordinator();
82-
83-
84-
assertEquals( TransactionStatus.NOT_ACTIVE, coordinator.getTransactionDriverControl().getStatus() );
85-
86-
session.getTransaction().begin();
87-
assertEquals( TransactionStatus.ACTIVE, coordinator.getTransactionDriverControl().getStatus() );
88-
89-
session.getTransaction().markRollbackOnly();
90-
assertEquals( TransactionStatus.MARKED_ROLLBACK, coordinator.getTransactionDriverControl().getStatus() );
91-
92-
try {
93-
session.getTransaction().commit();
94-
}
95-
catch (TransactionException expected) {
96-
}
97-
finally {
98-
assertThat(
99-
coordinator.getTransactionDriverControl().getStatus(),
100-
anyOf(
101-
is( TransactionStatus.NOT_ACTIVE ),
102-
is( TransactionStatus.ROLLED_BACK )
103-
)
104-
);
105-
}
106-
}
107-
);
108-
109-
}
60+
public void testMarkRollbackOnly(SessionFactoryScope factoryScope) {
61+
factoryScope.inSession( (session) -> {
62+
final TransactionCoordinator coordinator = session.getTransactionCoordinator();
63+
64+
assertEquals( TransactionStatus.NOT_ACTIVE,
65+
coordinator.getTransactionDriverControl().getStatus() );
66+
67+
session.getTransaction().begin();
68+
assertEquals( TransactionStatus.ACTIVE, coordinator.getTransactionDriverControl().getStatus() );
69+
70+
session.getTransaction().markRollbackOnly();
71+
assertEquals( TransactionStatus.MARKED_ROLLBACK,
72+
coordinator.getTransactionDriverControl().getStatus() );
73+
74+
try {
75+
session.getTransaction().commit();
76+
}
77+
catch (TransactionException expected) {
78+
}
79+
finally {
80+
assertThat(
81+
coordinator.getTransactionDriverControl().getStatus(),
82+
anyOf(
83+
is( TransactionStatus.NOT_ACTIVE ),
84+
is( TransactionStatus.ROLLED_BACK )
85+
)
86+
);
87+
}
88+
} );
11089
}
11190

11291
@Test
11392
@SuppressWarnings("EmptyCatchBlock")
114-
public void testSynchronizationFailure() {
115-
try ( final SessionFactoryImplementor sf = generateSessionFactory() ) {
116-
inSession(
117-
sf,
118-
session -> {
119-
final TransactionCoordinator coordinator = session.getTransactionCoordinator();
120-
121-
assertEquals( TransactionStatus.NOT_ACTIVE, coordinator.getTransactionDriverControl().getStatus() );
122-
coordinator.getLocalSynchronizations().registerSynchronization( SynchronizationErrorImpl.forBefore() );
123-
124-
coordinator.getTransactionDriverControl().begin();
125-
assertEquals( TransactionStatus.ACTIVE, coordinator.getTransactionDriverControl().getStatus() );
126-
127-
try {
128-
coordinator.getTransactionDriverControl().commit();
129-
}
130-
catch (Exception expected) {
131-
}
132-
finally {
133-
assertThat(
134-
coordinator.getTransactionDriverControl().getStatus(),
135-
anyOf(
136-
is( TransactionStatus.NOT_ACTIVE ),
137-
is( TransactionStatus.ROLLED_BACK )
138-
)
139-
);
140-
}
141-
}
142-
);
143-
}
93+
public void testSynchronizationFailure(SessionFactoryScope factoryScope) {
94+
factoryScope.inSession( (session) -> {
95+
final TransactionCoordinator coordinator = session.getTransactionCoordinator();
96+
97+
assertEquals( TransactionStatus.NOT_ACTIVE,
98+
coordinator.getTransactionDriverControl().getStatus() );
99+
coordinator.getLocalSynchronizations().registerSynchronization( SynchronizationErrorImpl.forBefore() );
100+
101+
coordinator.getTransactionDriverControl().begin();
102+
assertEquals( TransactionStatus.ACTIVE, coordinator.getTransactionDriverControl().getStatus() );
103+
104+
try {
105+
coordinator.getTransactionDriverControl().commit();
106+
}
107+
catch (Exception expected) {
108+
}
109+
finally {
110+
assertThat(
111+
coordinator.getTransactionDriverControl().getStatus(),
112+
anyOf(
113+
is( TransactionStatus.NOT_ACTIVE ),
114+
is( TransactionStatus.ROLLED_BACK )
115+
)
116+
);
117+
}
118+
} );
144119
}
145120
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/AbstractBasicJtaTestScenarios.java‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,22 @@
77
import jakarta.transaction.Status;
88
import jakarta.transaction.SystemException;
99
import jakarta.transaction.TransactionManager;
10-
1110
import org.hibernate.TransactionException;
1211
import org.hibernate.orm.test.resource.common.SynchronizationCollectorImpl;
12+
import org.hibernate.orm.test.resource.common.SynchronizationErrorImpl;
1313
import org.hibernate.resource.transaction.TransactionRequiredForJoinException;
1414
import org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorBuilderImpl;
1515
import org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorImpl;
1616
import org.hibernate.resource.transaction.backend.jta.internal.synchronization.SynchronizationCallbackCoordinatorTrackingImpl;
1717
import org.hibernate.resource.transaction.spi.TransactionStatus;
18+
import org.junit.jupiter.api.AfterEach;
19+
import org.junit.jupiter.api.BeforeEach;
20+
import org.junit.jupiter.api.Test;
1821

19-
import org.hibernate.orm.test.resource.common.SynchronizationErrorImpl;
20-
import org.junit.After;
21-
import org.junit.Before;
22-
import org.junit.Test;
23-
24-
import static org.junit.Assert.assertEquals;
25-
import static org.junit.Assert.assertFalse;
26-
import static org.junit.Assert.assertTrue;
27-
import static org.junit.Assert.fail;
22+
import static org.junit.jupiter.api.Assertions.assertEquals;
23+
import static org.junit.jupiter.api.Assertions.assertFalse;
24+
import static org.junit.jupiter.api.Assertions.assertTrue;
25+
import static org.junit.jupiter.api.Assertions.fail;
2826

2927
/**
3028
* @author Steve Ebersole
@@ -46,8 +44,8 @@ public JtaTransactionCoordinatorImpl buildTransactionCoordinator(boolean autoJoi
4644
);
4745
}
4846

49-
@Before
50-
@After
47+
@BeforeEach
48+
@AfterEach
5149
public void resetJtaPlatform() throws SystemException {
5250
// make sure the JTA platform is reset back to no active transactions before and after each test
5351
JtaPlatformStandardTestingImpl.INSTANCE.reset();

0 commit comments

Comments
 (0)