Skip to content

Commit b2f65de

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 8e1b9a9 commit b2f65de

14 files changed

+1049
-1201
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java‎

Lines changed: 802 additions & 926 deletions
Large diffs are not rendered by default.

‎hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterDotNameTest.java‎

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

7-
import java.util.HashSet;
8-
import java.util.List;
9-
import java.util.Set;
10-
import java.util.function.BiConsumer;
11-
import java.util.function.Consumer;
12-
7+
import jakarta.persistence.CascadeType;
8+
import jakarta.persistence.Entity;
9+
import jakarta.persistence.Id;
10+
import jakarta.persistence.JoinColumn;
11+
import jakarta.persistence.ManyToOne;
12+
import jakarta.persistence.OneToMany;
13+
import org.hamcrest.MatcherAssert;
1314
import org.hibernate.SharedSessionContract;
1415
import org.hibernate.annotations.Filter;
1516
import org.hibernate.annotations.FilterDef;
1617
import org.hibernate.annotations.FilterDefs;
1718
import org.hibernate.annotations.Filters;
1819
import org.hibernate.annotations.ParamDef;
19-
20-
import org.hibernate.testing.orm.junit.JiraKey;
2120
import org.hibernate.testing.orm.junit.DomainModel;
21+
import org.hibernate.testing.orm.junit.JiraKey;
2222
import org.hibernate.testing.orm.junit.SessionFactoryScope;
2323
import org.junit.jupiter.api.AfterEach;
2424
import org.junit.jupiter.api.BeforeEach;
2525
import org.junit.jupiter.api.Test;
2626
import org.junit.jupiter.params.ParameterizedTest;
2727
import org.junit.jupiter.params.provider.MethodSource;
2828

29-
import jakarta.persistence.CascadeType;
30-
import jakarta.persistence.Entity;
31-
import jakarta.persistence.Id;
32-
import jakarta.persistence.JoinColumn;
33-
import jakarta.persistence.ManyToOne;
34-
import jakarta.persistence.OneToMany;
29+
import java.util.HashSet;
30+
import java.util.List;
31+
import java.util.Set;
32+
import java.util.function.BiConsumer;
33+
import java.util.function.Consumer;
3534

3635
import static org.hamcrest.CoreMatchers.is;
37-
import static org.junit.Assert.assertThat;
3836

3937
/**
4038
* @author Chris Cranford
@@ -80,7 +78,7 @@ void testEntityFilterNameWithoutDots(
8078
session.enableFilter( "customerIdFilter" ).setParameter( "customerId", 10L );
8179

8280
final List<PurchaseOrder> orders = session.createQuery( "FROM PurchaseOrder", PurchaseOrder.class ).getResultList();
83-
assertThat( orders.size(), is( 1 ) );
81+
MatcherAssert.assertThat( orders.size(), is( 1 ) );
8482
} );
8583
}
8684

@@ -92,7 +90,7 @@ void testEntityFilterNameWithDots(
9290
session.enableFilter( "PurchaseOrder.customerIdFilter" ).setParameter( "customerId", 20L );
9391

9492
final List<PurchaseOrder> orders = session.createQuery( "FROM PurchaseOrder", PurchaseOrder.class ).getResultList();
95-
assertThat( orders.size(), is( 1 ) );
93+
MatcherAssert.assertThat( orders.size(), is( 1 ) );
9694
} );
9795
}
9896

@@ -101,8 +99,8 @@ void testCollectionFilterNameWithoutDots() {
10199
scope.inTransaction( session -> {
102100
session.enableFilter( "itemIdFilter" ).setParameter( "itemId", 100L );
103101

104-
final PurchaseOrder order = session.get( PurchaseOrder.class, 1L );
105-
assertThat( order.getPurchaseItems().size(), is( 1 ) );
102+
final PurchaseOrder order = session.find( PurchaseOrder.class, 1L );
103+
MatcherAssert.assertThat( order.getPurchaseItems().size(), is( 1 ) );
106104
} );
107105
}
108106

@@ -111,11 +109,12 @@ public void testCollectionFilterNameWithDots() {
111109
scope.inTransaction( session -> {
112110
session.enableFilter( "PurchaseOrder.itemIdFilter" ).setParameter( "itemId", 100L );
113111

114-
final PurchaseOrder order = session.get( PurchaseOrder.class, 1L );
115-
assertThat( order.getPurchaseItems().size(), is( 1 ) );
112+
final PurchaseOrder order = session.find( PurchaseOrder.class, 1L );
113+
MatcherAssert.assertThat( order.getPurchaseItems().size(), is( 1 ) );
116114
} );
117115
}
118116

117+
@SuppressWarnings("unused")
119118
@Entity(name = "PurchaseOrder")
120119
@FilterDefs({
121120
@FilterDef(name = "customerIdFilter", parameters = @ParamDef(name = "customerId", type = Long.class)),

‎hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterParameterTests.java‎

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
*/
55
package org.hibernate.orm.test.filter;
66

7-
import java.sql.Types;
8-
import java.util.function.BiConsumer;
9-
import java.util.function.Consumer;
10-
import java.util.function.Supplier;
11-
7+
import jakarta.enterprise.inject.se.SeContainer;
8+
import jakarta.enterprise.inject.se.SeContainerInitializer;
9+
import jakarta.persistence.Basic;
10+
import jakarta.persistence.Column;
11+
import jakarta.persistence.Convert;
12+
import jakarta.persistence.Entity;
13+
import jakarta.persistence.Id;
14+
import jakarta.persistence.Table;
1215
import org.hibernate.SharedSessionContract;
1316
import org.hibernate.annotations.Filter;
1417
import org.hibernate.annotations.FilterDef;
@@ -18,38 +21,33 @@
1821
import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
1922
import org.hibernate.boot.registry.StandardServiceRegistry;
2023
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
21-
import org.hibernate.cfg.AvailableSettings;
24+
import org.hibernate.community.dialect.TiDBDialect;
2225
import org.hibernate.dialect.CockroachDialect;
2326
import org.hibernate.dialect.MariaDBDialect;
2427
import org.hibernate.dialect.MySQLDialect;
2528
import org.hibernate.dialect.PostgreSQLDialect;
2629
import org.hibernate.dialect.PostgresPlusDialect;
2730
import org.hibernate.dialect.SQLServerDialect;
28-
import org.hibernate.community.dialect.TiDBDialect;
29-
import org.hibernate.testing.orm.junit.RequiresDialect;
30-
import org.hibernate.type.NumericBooleanConverter;
31-
import org.hibernate.type.YesNoConverter;
32-
3331
import org.hibernate.testing.orm.junit.DomainModel;
32+
import org.hibernate.testing.orm.junit.RequiresDialect;
3433
import org.hibernate.testing.orm.junit.SessionFactoryScope;
3534
import org.hibernate.testing.orm.junit.SkipForDialect;
3635
import org.hibernate.testing.util.ServiceRegistryUtil;
36+
import org.hibernate.type.NumericBooleanConverter;
37+
import org.hibernate.type.YesNoConverter;
3738
import org.junit.jupiter.api.AfterEach;
3839
import org.junit.jupiter.api.BeforeEach;
3940
import org.junit.jupiter.params.ParameterizedTest;
4041
import org.junit.jupiter.params.provider.MethodSource;
4142

42-
import jakarta.enterprise.inject.se.SeContainer;
43-
import jakarta.enterprise.inject.se.SeContainerInitializer;
44-
import jakarta.persistence.Basic;
45-
import jakarta.persistence.Column;
46-
import jakarta.persistence.Convert;
47-
import jakarta.persistence.Entity;
48-
import jakarta.persistence.Id;
49-
import jakarta.persistence.Table;
43+
import java.sql.Types;
44+
import java.util.function.BiConsumer;
45+
import java.util.function.Consumer;
46+
import java.util.function.Supplier;
5047

5148
import static org.assertj.core.api.Assertions.assertThat;
5249
import static org.assertj.core.api.Assertions.assertThatThrownBy;
50+
import static org.hibernate.cfg.ManagedBeanSettings.JAKARTA_CDI_BEAN_MANAGER;
5351

5452
/**
5553
* @author Steve Ebersole
@@ -67,7 +65,7 @@ public class FilterParameterTests extends AbstractStatefulStatelessFilterTest {
6765
public void testYesNo(BiConsumer<SessionFactoryScope, Consumer<? extends SharedSessionContract>> inTransaction) {
6866
scope.inTransaction( (session) -> {
6967
session.disableFilter( "subDepartmentFilter" );
70-
final EntityOne loaded = session.byId( EntityOne.class ).load( 1 );
68+
final EntityOne loaded = session.find( EntityOne.class, 1 );
7169
assertThat( loaded ).isNotNull();
7270
} );
7371

@@ -90,7 +88,7 @@ public void testYesNo(BiConsumer<SessionFactoryScope, Consumer<? extends SharedS
9088
public void testYesNoMismatch(BiConsumer<SessionFactoryScope, Consumer<? extends SharedSessionContract>> inTransaction) {
9189
scope.inTransaction( (session) -> {
9290
session.disableFilter( "subDepartmentFilter" );
93-
final EntityOne loaded = session.byId( EntityOne.class ).load( 1 );
91+
final EntityOne loaded = session.find( EntityOne.class, 1 );
9492
assertThat( loaded ).isNotNull();
9593
} );
9694

@@ -110,7 +108,7 @@ public void testYesNoMismatch(BiConsumer<SessionFactoryScope, Consumer<? extends
110108
public void testNumeric(BiConsumer<SessionFactoryScope, Consumer<? extends SharedSessionContract>> inTransaction) {
111109
scope.inTransaction( (session) -> {
112110
session.disableFilter( "subDepartmentFilter" );
113-
final EntityTwo loaded = session.byId( EntityTwo.class ).load( 1 );
111+
final EntityTwo loaded = session.find( EntityTwo.class, 1 );
114112
assertThat( loaded ).isNotNull();
115113
} );
116114

@@ -133,7 +131,7 @@ public void testNumeric(BiConsumer<SessionFactoryScope, Consumer<? extends Share
133131
public void testNumericMismatch(BiConsumer<SessionFactoryScope, Consumer<? extends SharedSessionContract>> inTransaction) {
134132
scope.inTransaction( (session) -> {
135133
session.disableFilter( "subDepartmentFilter" );
136-
final EntityTwo loaded = session.byId( EntityTwo.class ).load( 1 );
134+
final EntityTwo loaded = session.find( EntityTwo.class, 1 );
137135
assertThat( loaded ).isNotNull();
138136
} );
139137

@@ -157,7 +155,7 @@ public void testNumericMismatch(BiConsumer<SessionFactoryScope, Consumer<? exten
157155
public void testMismatch(BiConsumer<SessionFactoryScope, Consumer<? extends SharedSessionContract>> inTransaction) {
158156
scope.inTransaction( (session) -> {
159157
session.disableFilter( "subDepartmentFilter" );
160-
final EntityThree loaded = session.byId( EntityThree.class ).load( 1 );
158+
final EntityThree loaded = session.find( EntityThree.class, 1 );
161159
assertThat( loaded ).isNotNull();
162160
} );
163161

@@ -182,18 +180,20 @@ public void testAutoEnableWithResolver() {
182180
BootstrapServiceRegistry bsr = new BootstrapServiceRegistryBuilder().build();
183181

184182
final StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistryBuilder( bsr )
185-
.applySetting( AvailableSettings.CDI_BEAN_MANAGER, cdiContainer.getBeanManager() )
183+
.applySetting( JAKARTA_CDI_BEAN_MANAGER, cdiContainer.getBeanManager() )
186184
.build();
187185

188186
try {
189187
scope.inTransaction( (session) -> {
190188
session.getEnabledFilter("subDepartmentFilter").setParameter("subdepartment", "FIRST_A" );
189+
//noinspection removal
191190
final EntityFour first_a = session.createQuery( "from EntityFour e where e.id = :id", EntityFour.class )
192191
.setParameter( "id", 1 )
193192
.getSingleResultOrNull();
194193
assertThat( first_a ).isNotNull();
195194
assertThat( first_a.getDepartment() ).isEqualTo( "FIRST" );
196195
session.getEnabledFilter("subDepartmentFilter").setParameter("subdepartment", "SECOND_A" );
196+
//noinspection removal
197197
final EntityFour second = session.createQuery( "from EntityFour e where e.id = :id", EntityFour.class )
198198
.setParameter( "id", 3 )
199199
.getSingleResultOrNull();
@@ -216,17 +216,19 @@ public void testAutoEnableWithoutResolver() {
216216
BootstrapServiceRegistry bsr = new BootstrapServiceRegistryBuilder().build();
217217

218218
final StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistryBuilder( bsr )
219-
.applySetting( AvailableSettings.CDI_BEAN_MANAGER, cdiContainer.getBeanManager() )
219+
.applySetting( JAKARTA_CDI_BEAN_MANAGER, cdiContainer.getBeanManager() )
220220
.build();
221221

222222
try {
223223
scope.inTransaction( (session) -> {
224224
session.getEnabledFilter("subDepartmentFilter").setParameter("subdepartment", "FIRST_A" );
225+
//noinspection removal
225226
final EntityFour first_a = session.createQuery( "from EntityFour e where e.id = :id", EntityFour.class )
226227
.setParameter( "id", 1 )
227228
.getSingleResultOrNull();
228229
assertThat( first_a ).isNotNull();
229230
assertThat( first_a.getDepartment() ).isEqualTo( "FIRST" );
231+
//noinspection removal
230232
final EntityFour first_b = session.createQuery( "from EntityFour e where e.id = :id", EntityFour.class )
231233
.setParameter( "id", 2 )
232234
.getSingleResultOrNull();
@@ -257,6 +259,7 @@ public void dropTestData() {
257259
scope.getSessionFactory().getSchemaManager().truncate();
258260
}
259261

262+
@SuppressWarnings("unused")
260263
@FilterDef(
261264
name = "filterYesNoConverter",
262265
defaultCondition = "yes_no = :yesNo",
@@ -312,6 +315,7 @@ public void setYesNo(boolean yesNo) {
312315
}
313316

314317

318+
@SuppressWarnings("unused")
315319
@FilterDef(
316320
name = "filterNumberConverter",
317321
defaultCondition = "zero_one = :zeroOne",
@@ -366,6 +370,7 @@ public void setZeroOne(boolean zeroOne) {
366370
}
367371
}
368372

373+
@SuppressWarnings("unused")
369374
@FilterDef(
370375
name = "filterMismatchConverter",
371376
defaultCondition = "mismatch = :mismatch",
@@ -414,6 +419,7 @@ public void setMismatch(boolean mismatch) {
414419
}
415420
}
416421

422+
@SuppressWarnings("unused")
417423
@FilterDef(
418424
name = "departmentFilter",
419425
defaultCondition = "department = :department",

‎hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterWitSubSelectFetchModeTest.java‎

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44
*/
55
package org.hibernate.orm.test.filter;
66

7-
import java.util.HashSet;
8-
import java.util.List;
9-
import java.util.Set;
10-
7+
import jakarta.persistence.CascadeType;
8+
import jakarta.persistence.Entity;
9+
import jakarta.persistence.FetchType;
10+
import jakarta.persistence.GeneratedValue;
11+
import jakarta.persistence.Id;
12+
import jakarta.persistence.ManyToOne;
13+
import jakarta.persistence.OneToMany;
1114
import org.hibernate.annotations.Fetch;
1215
import org.hibernate.annotations.FetchMode;
1316
import org.hibernate.annotations.Filter;
1417
import org.hibernate.annotations.FilterDef;
1518
import org.hibernate.annotations.ParamDef;
1619
import org.hibernate.cfg.AvailableSettings;
17-
import org.hibernate.stat.SessionStatistics;
18-
import org.hibernate.stat.Statistics;
19-
20-
import org.hibernate.testing.orm.junit.JiraKey;
2120
import org.hibernate.testing.orm.junit.DomainModel;
21+
import org.hibernate.testing.orm.junit.JiraKey;
2222
import org.hibernate.testing.orm.junit.ServiceRegistry;
2323
import org.hibernate.testing.orm.junit.SessionFactory;
2424
import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -27,21 +27,17 @@
2727
import org.junit.jupiter.api.BeforeEach;
2828
import org.junit.jupiter.api.Test;
2929

30-
import jakarta.persistence.CascadeType;
31-
import jakarta.persistence.Entity;
32-
import jakarta.persistence.FetchType;
33-
import jakarta.persistence.GeneratedValue;
34-
import jakarta.persistence.Id;
35-
import jakarta.persistence.ManyToOne;
36-
import jakarta.persistence.OneToMany;
30+
import java.util.HashSet;
31+
import java.util.Set;
3732

3833
import static org.hamcrest.CoreMatchers.is;
39-
import static org.junit.Assert.assertFalse;
40-
import static org.junit.Assert.assertThat;
34+
import static org.hamcrest.MatcherAssert.assertThat;
35+
import static org.junit.jupiter.api.Assertions.assertFalse;
4136

4237
/**
4338
* @author Andrea Boriero
4439
*/
40+
@SuppressWarnings("JUnitMalformedDeclaration")
4541
@DomainModel(
4642
annotatedClasses = {
4743
FilterWitSubSelectFetchModeTest.Customer.class,
@@ -93,29 +89,30 @@ void setUp(SessionFactoryScope scope) {
9389
void testFiltersAreApplied(SessionFactoryScope scope) {
9490
scope.inTransaction( session -> {
9591
session.enableFilter( "ID" ).setParameter( "id", 3L );
96-
final List<Customer> result = session.createQuery( "from Customer order by id", Customer.class ).getResultList();
92+
//noinspection removal
93+
var result = session.createQuery( "from Customer order by id", Customer.class ).getResultList();
9794

9895
assertFalse( result.isEmpty() );
99-
Customer customer = result.get( 0 );
96+
var customer = result.get( 0 );
10097
assertThat( customer.getCustomerId(), is( 3L ) );
10198

10299
assertThat( customer.getOrders().size(), is( 2 ) );
103-
SessionStatistics statistics = session.getStatistics();
100+
var statistics = session.getStatistics();
104101
assertThat( statistics.getEntityCount(), is( 9 ) );
105102

106-
Statistics sfStatistics = session.getSessionFactory().getStatistics();
103+
var sfStatistics = session.getSessionFactory().getStatistics();
107104

108105
assertThat( sfStatistics.getCollectionFetchCount(), is( 1L ) );
109106
assertThat( sfStatistics.getQueries().length, is(1 ) );
110-
111107
} );
112108
}
113109

114110
@AfterEach
115111
void tearDown(SessionFactoryScope scope) {
116-
scope.getSessionFactory().getSchemaManager().truncate();
112+
scope.dropData();
117113
}
118114

115+
@SuppressWarnings("FieldMayBeFinal")
119116
@Entity(name = "Customer")
120117
@FilterDef(
121118
name = "ID",

0 commit comments

Comments
 (0)