Skip to content

Commit 59abf04

Browse files
dreab8dreab8
committed
HHH-19846 Drop JUnit 4 usage
1 parent 2c564bb commit 59abf04

File tree

7 files changed

+375
-371
lines changed

7 files changed

+375
-371
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/PersisterClassProviderTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class PersisterClassProviderTest {
2626

2727
@Test
2828
public void testPersisterClassProvider() {
29-
assertThat(org.hibernate.internal.SessionFactoryRegistry.INSTANCE.hasRegistrations() ).isFalse();
29+
org.hibernate.internal.SessionFactoryRegistry.INSTANCE.clearRegistrations();
3030
Configuration cfg = new Configuration();
3131
cfg.addAnnotatedClass( Gate.class );
3232
ServiceRegistry serviceRegistry = ServiceRegistryUtil.serviceRegistryBuilder()

‎hibernate-core/src/test/java/org/hibernate/orm/test/query/OneToManyLazyAndEagerProxyTest.java‎

Lines changed: 41 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -4,48 +4,45 @@
44
*/
55
package org.hibernate.orm.test.query;
66

7-
import java.util.HashSet;
8-
import java.util.Set;
9-
10-
import org.hibernate.Hibernate;
11-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
12-
import org.hibernate.proxy.HibernateProxy;
13-
14-
import org.hibernate.testing.orm.junit.JiraKey;
15-
import org.junit.After;
16-
import org.junit.Before;
17-
import org.junit.Test;
18-
197
import jakarta.persistence.Entity;
208
import jakarta.persistence.FetchType;
219
import jakarta.persistence.Id;
2210
import jakarta.persistence.ManyToOne;
2311
import jakarta.persistence.OneToMany;
2412
import jakarta.persistence.Table;
13+
import org.hibernate.Hibernate;
14+
import org.hibernate.SessionFactory;
15+
import org.hibernate.proxy.HibernateProxy;
16+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
17+
import org.hibernate.testing.orm.junit.JiraKey;
18+
import org.hibernate.testing.orm.junit.Jpa;
19+
import org.junit.jupiter.api.AfterEach;
20+
import org.junit.jupiter.api.BeforeEach;
21+
import org.junit.jupiter.api.Test;
22+
23+
import java.util.HashSet;
24+
import java.util.Set;
25+
26+
import static org.assertj.core.api.Assertions.assertThat;
2527

26-
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
27-
import static org.junit.Assert.assertEquals;
28-
import static org.junit.Assert.assertFalse;
29-
import static org.junit.Assert.assertTrue;
3028

3129
/**
3230
* @author Marco Belladelli
3331
* @author Tomas Cerskus
3432
*/
3533
@JiraKey(value = "HHH-16136")
36-
public class OneToManyLazyAndEagerProxyTest extends BaseEntityManagerFunctionalTestCase {
37-
@Override
38-
protected Class<?>[] getAnnotatedClasses() {
39-
return new Class<?>[] {
40-
User.class,
41-
Order.class,
42-
OrderItem.class
43-
};
44-
}
34+
@Jpa(
35+
annotatedClasses = {
36+
OneToManyLazyAndEagerProxyTest.User.class,
37+
OneToManyLazyAndEagerProxyTest.Order.class,
38+
OneToManyLazyAndEagerProxyTest.OrderItem.class
39+
}
40+
)
41+
public class OneToManyLazyAndEagerProxyTest {
4542

46-
@Before
47-
public void prepare() {
48-
doInJPA( this::entityManagerFactory, em -> {
43+
@BeforeEach
44+
public void prepare(EntityManagerFactoryScope scope) {
45+
scope.inTransaction( em -> {
4946
final User user = new User( "User 1", "Marco" );
5047
final User targetUser = new User( "User 2", "Andrea" );
5148
final Order order = new Order( "Order 1", user, targetUser );
@@ -58,30 +55,32 @@ public void prepare() {
5855
} );
5956
}
6057

61-
@After
62-
public void tearDown() {
63-
doInJPA( this::entityManagerFactory, em -> {
64-
em.createQuery( "delete from OrderItem" ).executeUpdate();
65-
em.createQuery( "delete from Order" ).executeUpdate();
66-
em.createQuery( "delete from User" ).executeUpdate();
67-
});
58+
@AfterEach
59+
public void tearDown(EntityManagerFactoryScope scope) {
60+
scope.getEntityManagerFactory().unwrap( SessionFactory.class ).getSchemaManager().truncateMappedObjects();
6861
}
6962

7063
@Test
71-
public void testHibernateProxy() {
72-
doInJPA( this::entityManagerFactory, em -> {
64+
public void testHibernateProxy(EntityManagerFactoryScope scope) {
65+
scope.inTransaction( em -> {
7366
// get reference to get a lazy proxy instance
7467
final User userRef = em.getReference( User.class, "User 1" );
75-
assertTrue( userRef instanceof HibernateProxy );
76-
assertFalse( "Proxy should not be initialized", Hibernate.isInitialized( userRef ) );
68+
assertThat( userRef ).isInstanceOf( HibernateProxy.class );
69+
assertThat( Hibernate.isInitialized( userRef ) )
70+
.describedAs( "Proxy should not be initialized" )
71+
.isFalse();
7772
// query eager order.user and check that same instance was initialized
7873
final Order order = em.createQuery( "select o from Order o", Order.class )
7974
.getResultList()
8075
.get( 0 );
8176
final User user = order.getUser();
82-
assertEquals( "Proxy instance should be the same", userRef, user );
83-
assertTrue( "Proxy should be initialized", Hibernate.isInitialized( user ) );
84-
assertEquals( "Marco", user.getName() );
77+
assertThat( user )
78+
.describedAs( "Proxy instance should be the same" )
79+
.isEqualTo( userRef );
80+
assertThat( Hibernate.isInitialized( user ) )
81+
.describedAs( "Proxy should be initialized" )
82+
.isTrue();
83+
assertThat( user.getName() ).isEqualTo( "Marco" );
8584
} );
8685
}
8786

‎hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryTimeOutTest.java‎

Lines changed: 47 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -4,71 +4,70 @@
44
*/
55
package org.hibernate.orm.test.query;
66

7-
import java.sql.Statement;
8-
import java.sql.Types;
9-
import java.util.List;
10-
import java.util.Map;
11-
7+
import jakarta.persistence.Entity;
8+
import jakarta.persistence.Id;
9+
import jakarta.persistence.Table;
10+
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
1211
import org.hibernate.cfg.AvailableSettings;
1312
import org.hibernate.dialect.AbstractTransactSQLDialect;
1413
import org.hibernate.dialect.DmlTargetColumnQualifierSupport;
1514
import org.hibernate.dialect.OracleDialect;
1615
import org.hibernate.dialect.SybaseDialect;
1716
import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
17+
import org.hibernate.engine.spi.SessionFactoryImplementor;
18+
import org.hibernate.query.MutationQuery;
1819
import org.hibernate.query.NativeQuery;
19-
import org.hibernate.query.Query;
20-
import org.hibernate.type.descriptor.java.StringJavaType;
21-
import org.hibernate.type.descriptor.jdbc.JdbcType;
22-
23-
import org.hibernate.testing.DialectChecks;
24-
import org.hibernate.testing.RequiresDialectFeature;
25-
import org.hibernate.testing.orm.junit.JiraKey;
26-
import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
2720
import org.hibernate.testing.orm.jdbc.PreparedStatementSpyConnectionProvider;
21+
import org.hibernate.testing.orm.junit.BaseSessionFactoryFunctionalTest;
2822
import org.hibernate.testing.orm.junit.DialectContext;
29-
import org.junit.Before;
30-
import org.junit.Test;
23+
import org.hibernate.testing.orm.junit.DialectFeatureChecks;
24+
import org.hibernate.testing.orm.junit.JiraKey;
25+
import org.hibernate.testing.orm.junit.RequiresDialectFeature;
26+
import org.hibernate.type.descriptor.java.StringJavaType;
27+
import org.hibernate.type.descriptor.jdbc.JdbcType;
28+
import org.junit.jupiter.api.BeforeEach;
29+
import org.junit.jupiter.api.Test;
3130

32-
import jakarta.persistence.Entity;
33-
import jakarta.persistence.Id;
34-
import jakarta.persistence.Table;
31+
import java.sql.Statement;
32+
import java.sql.Types;
33+
import java.util.List;
3534

3635
import static org.hibernate.jpa.SpecHints.HINT_SPEC_QUERY_TIMEOUT;
37-
import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
38-
import static org.junit.Assert.fail;
3936
import static org.junit.jupiter.api.Assertions.assertEquals;
37+
import static org.junit.jupiter.api.Assertions.fail;
4038

4139
/**
4240
* @author Gail Badner
4341
*/
44-
@RequiresDialectFeature(DialectChecks.SupportsJdbcDriverProxying.class)
45-
public class QueryTimeOutTest extends BaseNonConfigCoreFunctionalTestCase {
42+
@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsJdbcDriverProxying.class)
43+
public class QueryTimeOutTest extends BaseSessionFactoryFunctionalTest {
4644

47-
private static final PreparedStatementSpyConnectionProvider CONNECTION_PROVIDER = new PreparedStatementSpyConnectionProvider(
48-
);
45+
private static final PreparedStatementSpyConnectionProvider CONNECTION_PROVIDER =
46+
new PreparedStatementSpyConnectionProvider();
4947
private static final String QUERY = "update AnEntity set name='abc'";
50-
5148
private String expectedSqlQuery;
5249

5350
@Override
5451
protected Class[] getAnnotatedClasses() {
55-
return new Class[] { AnEntity.class };
52+
return new Class[] {AnEntity.class};
5653
}
5754

5855
@Override
59-
protected void addSettings(Map<String,Object> settings) {
60-
if ( settings.containsKey( AvailableSettings.CONNECTION_PROVIDER ) ) {
61-
CONNECTION_PROVIDER.setConnectionProvider( (ConnectionProvider) settings.get( AvailableSettings.CONNECTION_PROVIDER ) );
62-
}
63-
settings.put( AvailableSettings.CONNECTION_PROVIDER, CONNECTION_PROVIDER );
56+
protected void applySettings(StandardServiceRegistryBuilder builer) {
57+
ConnectionProvider connectionProvider = (ConnectionProvider) builer.getSettings()
58+
.get( AvailableSettings.CONNECTION_PROVIDER );
59+
CONNECTION_PROVIDER.setConnectionProvider( connectionProvider );
60+
builer.applySetting( AvailableSettings.CONNECTION_PROVIDER, CONNECTION_PROVIDER );
6461
}
6562

66-
@Before
63+
@BeforeEach
6764
public void before() {
6865
CONNECTION_PROVIDER.clear();
69-
final JdbcType jdbcType = sessionFactory().getTypeConfiguration().getJdbcTypeRegistry().getDescriptor(
70-
Types.VARCHAR
71-
);
66+
SessionFactoryImplementor sessionFactoryImplementor = sessionFactory();
67+
final JdbcType jdbcType = sessionFactoryImplementor.getTypeConfiguration().getJdbcTypeRegistry()
68+
.getDescriptor(
69+
Types.VARCHAR
70+
);
7271
final String baseQuery;
7372
if ( DialectContext.getDialect() instanceof OracleDialect ) {
7473
baseQuery = "update AnEntity ae1_0 set ae1_0.name=?";
@@ -79,7 +78,8 @@ else if ( DialectContext.getDialect() instanceof SybaseDialect ) {
7978
else if ( DialectContext.getDialect() instanceof AbstractTransactSQLDialect ) {
8079
baseQuery = "update ae1_0 set name=? from AnEntity ae1_0";
8180
}
82-
else if ( DialectContext.getDialect().getDmlTargetColumnQualifierSupport() == DmlTargetColumnQualifierSupport.NONE ) {
81+
else if ( DialectContext.getDialect()
82+
.getDmlTargetColumnQualifierSupport() == DmlTargetColumnQualifierSupport.NONE ) {
8383
baseQuery = "update AnEntity set name=?";
8484
}
8585
else {
@@ -90,18 +90,17 @@ else if ( DialectContext.getDialect().getDmlTargetColumnQualifierSupport() == Dm
9090
jdbcType.getJdbcLiteralFormatter( StringJavaType.INSTANCE )
9191
.toJdbcLiteral(
9292
"abc",
93-
sessionFactory().getJdbcServices().getDialect(),
94-
sessionFactory().getWrapperOptions()
93+
sessionFactoryImplementor.getJdbcServices().getDialect(),
94+
sessionFactoryImplementor.getWrapperOptions()
9595
)
9696
);
9797
}
9898

9999
@Test
100100
@JiraKey(value = "HHH-12075")
101101
public void testCreateQuerySetTimeout() {
102-
doInHibernate(
103-
this::sessionFactory, session -> {
104-
Query query = session.createQuery( QUERY );
102+
inTransaction( session -> {
103+
MutationQuery query = session.createMutationQuery( QUERY );
105104
query.setTimeout( 123 );
106105
query.executeUpdate();
107106

@@ -115,7 +114,7 @@ public void testCreateQuerySetTimeout() {
115114
assertEquals( 0, setQueryTimeoutCalls.get( 1 )[0] );
116115
}
117116
catch (Exception ex) {
118-
fail( "should not have thrown exception" );
117+
fail( "should not have thrown exceptioinTransaction( session -> {n" );
119118
}
120119
}
121120
);
@@ -124,9 +123,8 @@ public void testCreateQuerySetTimeout() {
124123
@Test
125124
@JiraKey(value = "HHH-12075")
126125
public void testCreateQuerySetTimeoutHint() {
127-
doInHibernate(
128-
this::sessionFactory, session -> {
129-
Query query = session.createQuery( QUERY );
126+
inTransaction( session -> {
127+
MutationQuery query = session.createMutationQuery( QUERY );
130128
query.setHint( HINT_SPEC_QUERY_TIMEOUT, 123000 );
131129
query.executeUpdate();
132130

@@ -149,8 +147,7 @@ public void testCreateQuerySetTimeoutHint() {
149147
@Test
150148
@JiraKey(value = "HHH-12075")
151149
public void testCreateNativeQuerySetTimeout() {
152-
doInHibernate(
153-
this::sessionFactory, session -> {
150+
inTransaction( session -> {
154151
NativeQuery query = session.createNativeQuery( QUERY );
155152
query.setTimeout( 123 );
156153
query.executeUpdate();
@@ -174,8 +171,7 @@ public void testCreateNativeQuerySetTimeout() {
174171
@Test
175172
@JiraKey(value = "HHH-12075")
176173
public void testCreateNativeQuerySetTimeoutHint() {
177-
doInHibernate(
178-
this::sessionFactory, session -> {
174+
inTransaction( session -> {
179175
NativeQuery query = session.createNativeQuery( QUERY );
180176
query.setHint( HINT_SPEC_QUERY_TIMEOUT, 123000 );
181177
query.executeUpdate();
@@ -199,8 +195,7 @@ public void testCreateNativeQuerySetTimeoutHint() {
199195
@Test
200196
@JiraKey(value = "HHH-12075")
201197
public void testCreateSQLQuerySetTimeout() {
202-
doInHibernate(
203-
this::sessionFactory, session -> {
198+
inTransaction( session -> {
204199
NativeQuery query = session.createNativeQuery( QUERY );
205200
query.setTimeout( 123 );
206201
query.executeUpdate();
@@ -224,8 +219,7 @@ public void testCreateSQLQuerySetTimeout() {
224219
@Test
225220
@JiraKey(value = "HHH-12075")
226221
public void testCreateSQLQuerySetTimeoutHint() {
227-
doInHibernate(
228-
this::sessionFactory, session -> {
222+
inTransaction( session -> {
229223
NativeQuery query = session.createNativeQuery( QUERY );
230224
query.setHint( HINT_SPEC_QUERY_TIMEOUT, 123000 );
231225
query.executeUpdate();

0 commit comments

Comments
 (0)