Skip to content

Commit f5bff93

Browse files
sebersolesebersole
committed
HHH-19846 - Drop JUnit 4 usage
Cannot convert... * 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
1 parent 81de9a9 commit f5bff93

File tree

7 files changed

+168
-182
lines changed

7 files changed

+168
-182
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneTest.java‎

Lines changed: 39 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@
44
*/
55
package org.hibernate.orm.test.annotations.manytoone;
66

7-
import java.util.ArrayList;
8-
97
import org.hibernate.Hibernate;
10-
118
import org.hibernate.orm.test.annotations.Company;
129
import org.hibernate.orm.test.annotations.Customer;
1310
import org.hibernate.orm.test.annotations.Discount;
@@ -20,11 +17,15 @@
2017
import org.hibernate.testing.orm.junit.SessionFactoryScope;
2118
import org.hibernate.testing.orm.junit.Setting;
2219
import org.junit.jupiter.api.AfterEach;
23-
import org.junit.jupiter.api.Assertions;
2420
import org.junit.jupiter.api.Test;
2521

22+
import java.util.ArrayList;
23+
2624
import static org.hibernate.cfg.MappingSettings.IMPLICIT_NAMING_STRATEGY;
27-
import static org.junit.Assert.assertNotNull;
25+
import static org.junit.jupiter.api.Assertions.assertEquals;
26+
import static org.junit.jupiter.api.Assertions.assertFalse;
27+
import static org.junit.jupiter.api.Assertions.assertNotNull;
28+
import static org.junit.jupiter.api.Assertions.assertTrue;
2829

2930
/**
3031
* @author Emmanuel Bernard
@@ -73,9 +74,9 @@ public void testEager(SessionFactoryScope factoryScope) {
7374

7475
factoryScope.inTransaction( (session) -> {
7576
var car = session.find( Car.class, carId );
76-
Assertions.assertNotNull( car );
77-
Assertions.assertNotNull( car.getBodyColor() );
78-
Assertions.assertEquals( "Yellow", car.getBodyColor().getName() );
77+
assertNotNull( car );
78+
assertNotNull( car.getBodyColor() );
79+
assertEquals( "Yellow", car.getBodyColor().getName() );
7980
} );
8081
}
8182

@@ -95,13 +96,13 @@ public void testDefaultMetadata(SessionFactoryScope factoryScope) {
9596
var car = session.find( Car.class, carId );
9697
assertNotNull( car );
9798
assertNotNull( car.getBodyColor() );
98-
Assertions.assertEquals( "Blue", car.getBodyColor().getName() );
99+
assertEquals( "Blue", car.getBodyColor().getName() );
99100
} );
100101
}
101102

102103
@Test
103104
public void testCreate(SessionFactoryScope factoryScope) throws Exception {
104-
var companyId = factoryScope.fromTransaction( (session) -> {
105+
factoryScope.inTransaction( (session) -> {
105106
Flight firstOne = new Flight();
106107
firstOne.setId(1L);
107108
firstOne.setName( "AF0101" );
@@ -112,14 +113,12 @@ public void testCreate(SessionFactoryScope factoryScope) throws Exception {
112113

113114
session.persist( firstOne );
114115
session.persist( frenchOne );
115-
116-
return frenchOne.getId();
117116
} );
118117

119118
factoryScope.inTransaction( (session) -> {
120119
var flight = session.find( Flight.class, 1L );
121-
Assertions.assertNotNull( flight.getCompany() );
122-
Assertions.assertEquals( "Air France", flight.getCompany().getName() );
120+
assertNotNull( flight.getCompany() );
121+
assertEquals( "Air France", flight.getCompany().getName() );
123122
} );
124123
}
125124

@@ -139,9 +138,9 @@ public void testCascade(SessionFactoryScope factoryScope) {
139138

140139
factoryScope.inTransaction( (session) -> {
141140
var discount = session.find( Discount.class, 1L );
142-
Assertions.assertNotNull( discount );
143-
Assertions.assertEquals( 20.12, discount.getDiscount(), 0.01 );
144-
Assertions.assertNotNull( discount.getOwner() );
141+
assertNotNull( discount );
142+
assertEquals( 20.12, discount.getDiscount(), 0.01 );
143+
assertNotNull( discount.getOwner() );
145144
var customer = new Customer();
146145
customer.setName( "Clooney" );
147146
discount.setOwner( customer );
@@ -152,9 +151,9 @@ public void testCascade(SessionFactoryScope factoryScope) {
152151

153152
factoryScope.inTransaction( (session) -> {
154153
var discount = session.find( Discount.class, 1L );
155-
Assertions.assertNotNull( discount );
156-
Assertions.assertNotNull( discount.getOwner() );
157-
Assertions.assertEquals( "Clooney", discount.getOwner().getName() );
154+
assertNotNull( discount );
155+
assertNotNull( discount.getOwner() );
156+
assertEquals( "Clooney", discount.getOwner().getName() );
158157
} );
159158
}
160159

@@ -174,14 +173,14 @@ public void testFetch(SessionFactoryScope factoryScope) {
174173

175174
factoryScope.inTransaction( (session) -> {
176175
var discount = session.find( Discount.class, 1L );
177-
Assertions.assertNotNull( discount );
178-
Assertions.assertFalse( Hibernate.isInitialized( discount.getOwner() ) );
176+
assertNotNull( discount );
177+
assertFalse( Hibernate.isInitialized( discount.getOwner() ) );
179178
} );
180179

181180
factoryScope.inTransaction( (session) -> {
182181
var discount = session.getReference( Discount.class, 1L );
183-
Assertions.assertNotNull( discount );
184-
Assertions.assertFalse( Hibernate.isInitialized( discount.getOwner() ) );
182+
assertNotNull( discount );
183+
assertFalse( Hibernate.isInitialized( discount.getOwner() ) );
185184
} );
186185
}
187186

@@ -205,9 +204,9 @@ public void testCompositeFK(SessionFactoryScope factoryScope) {
205204
var result = session.createQuery( "from Child c where c.parent.id.lastName = :lastName" )
206205
.setParameter( "lastName", "Doe")
207206
.list();
208-
Assertions.assertEquals( 1, result.size() );
207+
assertEquals( 1, result.size() );
209208
Child c2 = (Child) result.get( 0 );
210-
Assertions.assertEquals( 1, c2.id );
209+
assertEquals( 1, c2.id );
211210
} );
212211
}
213212

@@ -235,9 +234,9 @@ public void testImplicitCompositeFk(SessionFactoryScope factoryScope) {
235234

236235
factoryScope.inTransaction( (session) -> {
237236
var n2 = session.find( Node.class, node2Pk );
238-
Assertions.assertNotNull( n2 );
239-
Assertions.assertNotNull( n2.getParent() );
240-
Assertions.assertEquals( 1, n2.getParent().getId().getLevel() );
237+
assertNotNull( n2 );
238+
assertNotNull( n2.getParent() );
239+
assertEquals( 1, n2.getParent().getId().getLevel() );
241240
} );
242241
}
243242

@@ -256,9 +255,9 @@ public void testManyToOneNonPk(SessionFactoryScope factoryScope) {
256255

257256
factoryScope.inTransaction( (session) -> {
258257
var ol = session.find( OrderLine.class, 1 );
259-
Assertions.assertNotNull( ol.getOrder() );
260-
Assertions.assertEquals( "123", ol.getOrder().getOrderNbr() );
261-
Assertions.assertTrue( ol.getOrder().getOrderLines().contains( ol ) );
258+
assertNotNull( ol.getOrder() );
259+
assertEquals( "123", ol.getOrder().getOrderNbr() );
260+
assertTrue( ol.getOrder().getOrderLines().contains( ol ) );
262261
} );
263262
}
264263

@@ -277,9 +276,9 @@ public void testManyToOneNonPkSecondaryTable(SessionFactoryScope factoryScope) {
277276

278277
factoryScope.inTransaction( (session) -> {
279278
var ol = session.find( OrderLine.class, 1 );
280-
Assertions.assertNotNull( ol.getReplacementOrder() );
281-
Assertions.assertEquals( "123", ol.getReplacementOrder().getOrderNbr() );
282-
Assertions.assertFalse( ol.getReplacementOrder().getOrderLines().contains( ol ) );
279+
assertNotNull( ol.getReplacementOrder() );
280+
assertEquals( "123", ol.getReplacementOrder().getOrderNbr() );
281+
assertFalse( ol.getReplacementOrder().getOrderLines().contains( ol ) );
283282
} );
284283
}
285284

@@ -301,8 +300,8 @@ public void testTwoManyToOneNonPk(SessionFactoryScope factoryScope) {
301300

302301
factoryScope.inTransaction( (session) -> {
303302
var deal = session.find( Deal.class, 1 );
304-
Assertions.assertNotNull( deal.from );
305-
Assertions.assertNotNull( deal.to );
303+
assertNotNull( deal.from );
304+
assertNotNull( deal.to );
306305
} );
307306
}
308307

@@ -326,9 +325,9 @@ public void testFormulaOnOtherSide(SessionFactoryScope factoryScope) {
326325

327326
factoryScope.inTransaction( (session) -> {
328327
var frame = session.find( Frame.class, 1L );
329-
Assertions.assertEquals( 2, frame.getLenses().size() );
330-
Assertions.assertTrue( frame.getLenses().iterator().next().getLength() <= 1 / 1.2f );
331-
Assertions.assertTrue( frame.getLenses().iterator().next().getLength() >= 1 / 2.5f );
328+
assertEquals( 2, frame.getLenses().size() );
329+
assertTrue( frame.getLenses().iterator().next().getLength() <= 1 / 1.2f );
330+
assertTrue( frame.getLenses().iterator().next().getLength() >= 1 / 2.5f );
332331
} );
333332
}
334333
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/FetchStrategyHelperTest.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import org.hibernate.engine.spi.SessionFactoryImplementor;
1717
import org.hibernate.metamodel.mapping.internal.FetchOptionsHelper;
1818
import org.hibernate.persister.entity.AbstractEntityPersister;
19-
import org.hibernate.persister.entity.EntityPersister;
2019
import org.hibernate.testing.orm.junit.DomainModel;
2120
import org.hibernate.testing.orm.junit.SessionFactory;
2221
import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -185,24 +184,23 @@ public void testCollectionSubselectFetch(SessionFactoryScope factoryScope) {
185184
}
186185

187186
private org.hibernate.FetchMode determineFetchMode(
188-
Class<?> entityClass,
187+
@SuppressWarnings("SameParameterValue") Class<?> entityClass,
189188
String path,
190189
SessionFactoryImplementor sessionFactory) {
191-
final EntityPersister entityDescriptor = sessionFactory
192-
.getMappingMetamodel()
193-
.getEntityDescriptor( entityClass );
194190
AbstractEntityPersister entityPersister = (AbstractEntityPersister)
195191
sessionFactory.getMappingMetamodel().getEntityDescriptor(entityClass.getName());
192+
//noinspection removal
196193
int index = entityPersister.getPropertyIndex( path );
197194
return entityPersister.getFetchMode( index );
198195
}
199196

200197
private AssociationType determineAssociationType(
201-
Class<?> entityClass,
198+
@SuppressWarnings("SameParameterValue") Class<?> entityClass,
202199
String path,
203200
SessionFactoryImplementor sessionFactory) {
204201
AbstractEntityPersister entityPersister = (AbstractEntityPersister)
205202
sessionFactory.getMappingMetamodel().getEntityDescriptor(entityClass.getName());
203+
//noinspection removal
206204
int index = entityPersister.getPropertyIndex( path );
207205
return (AssociationType) entityPersister.getSubclassPropertyType( index );
208206
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/id/IdClassManyToOneCascadeTest.java‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,35 @@
1212
import jakarta.persistence.IdClass;
1313
import jakarta.persistence.ManyToOne;
1414

15-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
1615

16+
import org.hibernate.testing.orm.junit.DomainModel;
1717
import org.hibernate.testing.orm.junit.JiraKey;
18-
import org.junit.Test;
18+
import org.hibernate.testing.orm.junit.SessionFactory;
19+
import org.hibernate.testing.orm.junit.SessionFactoryScope;
20+
import org.junit.jupiter.api.AfterEach;
21+
import org.junit.jupiter.api.Assertions;
22+
import org.junit.jupiter.api.Test;
1923

20-
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
21-
import static org.junit.Assert.assertTrue;
2224

2325
/**
2426
* @author Vlad Mihalcea
2527
*/
28+
@SuppressWarnings("JUnitMalformedDeclaration")
2629
@JiraKey( value = "HHH-12251" )
27-
public class IdClassManyToOneCascadeTest extends BaseEntityManagerFunctionalTestCase {
28-
29-
@Override
30-
protected Class<?>[] getAnnotatedClasses() {
31-
return new Class<?>[] {
32-
SomeEntity.class,
33-
ReferencedEntity.class
34-
};
30+
@DomainModel(annotatedClasses = {
31+
IdClassManyToOneCascadeTest.SomeEntity.class,
32+
IdClassManyToOneCascadeTest.ReferencedEntity.class
33+
})
34+
@SessionFactory
35+
public class IdClassManyToOneCascadeTest {
36+
@AfterEach
37+
public void tearDown(SessionFactoryScope factoryScope) {
38+
factoryScope.dropData();
3539
}
3640

3741
@Test
38-
public void testMergeCascadesToManyToOne() {
39-
40-
doInJPA( this::entityManagerFactory, entityManager -> {
42+
public void testMergeCascadesToManyToOne(SessionFactoryScope factoryScope) {
43+
factoryScope.inTransaction( entityManager -> {
4144
ReferencedEntity referencedEntity = new ReferencedEntity();
4245
referencedEntity.setId( 42L );
4346

@@ -47,14 +50,13 @@ public void testMergeCascadesToManyToOne() {
4750

4851
SomeEntity merged = entityManager.merge(someEntity);
4952

50-
assertTrue( entityManager.contains( merged.getReferencedEntity() ) );
53+
Assertions.assertTrue( entityManager.contains( merged.getReferencedEntity() ) );
5154
} );
5255
}
5356

5457
@Test
55-
public void testPersistCascadesToManyToOne() {
56-
57-
doInJPA( this::entityManagerFactory, entityManager -> {
58+
public void testPersistCascadesToManyToOne(SessionFactoryScope factoryScope) {
59+
factoryScope.inTransaction( entityManager -> {
5860
ReferencedEntity referencedEntity = new ReferencedEntity();
5961
referencedEntity.setId( 42L );
6062

@@ -64,7 +66,7 @@ public void testPersistCascadesToManyToOne() {
6466

6567
entityManager.persist( someEntity );
6668

67-
assertTrue( entityManager.contains( referencedEntity ) );
69+
Assertions.assertTrue( entityManager.contains( referencedEntity ) );
6870
} );
6971
}
7072

‎hibernate-core/src/test/java/org/hibernate/orm/test/id/ReSaveReferencedDeletedEntity.java‎ renamed to ‎hibernate-core/src/test/java/org/hibernate/orm/test/id/ReSaveReferencedDeletedEntityTests.java‎

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

7-
import org.hibernate.cfg.AvailableSettings;
8-
import org.hibernate.cfg.Configuration;
7+
import jakarta.persistence.CascadeType;
8+
import jakarta.persistence.Entity;
9+
import jakarta.persistence.GeneratedValue;
10+
import jakarta.persistence.Id;
11+
import jakarta.persistence.OneToOne;
912
import org.hibernate.dialect.HANADialect;
13+
import org.hibernate.testing.orm.junit.DomainModel;
1014
import org.hibernate.testing.orm.junit.JiraKey;
11-
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
15+
import org.hibernate.testing.orm.junit.ServiceRegistry;
16+
import org.hibernate.testing.orm.junit.SessionFactory;
17+
import org.hibernate.testing.orm.junit.SessionFactoryScope;
18+
import org.hibernate.testing.orm.junit.Setting;
1219
import org.hibernate.testing.orm.junit.SkipForDialect;
13-
import org.junit.Test;
20+
import org.junit.jupiter.api.AfterEach;
21+
import org.junit.jupiter.api.Test;
1422

15-
import jakarta.persistence.*;
16-
17-
import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
23+
import static org.hibernate.cfg.AvailableSettings.USE_IDENTIFIER_ROLLBACK;
1824

25+
@SuppressWarnings("JUnitMalformedDeclaration")
1926
@SkipForDialect( dialectClass = HANADialect.class,
2027
reason = "The INSERT statement for table [Child] contains no column, and this is not supported")
21-
public class ReSaveReferencedDeletedEntity extends BaseCoreFunctionalTestCase {
22-
@Override
23-
protected Class<?>[] getAnnotatedClasses() {
24-
return new Class<?>[] { Child.class, Parent.class };
25-
}
26-
27-
@Override
28-
protected void configure(Configuration configuration) {
29-
super.configure( configuration );
30-
configuration.setProperty( AvailableSettings.USE_IDENTIFIER_ROLLBACK, "true" );
28+
@ServiceRegistry(settings = @Setting(name=USE_IDENTIFIER_ROLLBACK, value = "true"))
29+
@DomainModel(annotatedClasses = {
30+
ReSaveReferencedDeletedEntityTests.Child.class,
31+
ReSaveReferencedDeletedEntityTests.Parent.class
32+
})
33+
@SessionFactory
34+
public class ReSaveReferencedDeletedEntityTests {
35+
@AfterEach
36+
public void dropTestData(SessionFactoryScope factoryScope) throws Exception {
37+
factoryScope.dropData();
3138
}
3239

3340
@Test
3441
@JiraKey("HHH-14416")
35-
public void testReSaveDeletedEntity() {
36-
doInHibernate( this::sessionFactory, session -> {
42+
public void testReSaveDeletedEntity(SessionFactoryScope factoryScope) {
43+
factoryScope.inTransaction( (session) -> {
3744
Parent parent = new Parent();
3845

3946
Child child = new Child();
@@ -53,8 +60,8 @@ public void testReSaveDeletedEntity() {
5360

5461
@Test
5562
@JiraKey("HHH-14416")
56-
public void testReSaveDeletedEntityWithDetach() {
57-
doInHibernate( this::sessionFactory, session -> {
63+
public void testReSaveDeletedEntityWithDetach(SessionFactoryScope factoryScope) {
64+
factoryScope.inTransaction( (session) -> {
5865
Parent parent = new Parent();
5966

6067
Child child = new Child();

0 commit comments

Comments
 (0)