Skip to content

Commit c210b84

Browse files
jrenaatjrenaat
committed
HHH-19846 - Remove JUnit4: org.hibernate.orm.test.mapping.converted.converter
Signed-off-by: Jan Schatteman <[email protected]>
1 parent 2635542 commit c210b84

32 files changed

+592
-779
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AndLobTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424

2525
import static org.hamcrest.Matchers.equalTo;
2626
import static org.hamcrest.Matchers.is;
27-
import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping;
28-
import static org.junit.Assert.assertThat;
27+
import static org.hibernate.testing.orm.junit.ExtraAssertions.assertTyping;
28+
import static org.hamcrest.MatcherAssert.assertThat;
2929

3030
/**
3131
* Test mapping a model with an attribute combining {@code @Lob} with an AttributeConverter.

‎hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AndNationalizedTests.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,17 @@
2020
import org.hibernate.mapping.PersistentClass;
2121

2222
import org.hibernate.testing.orm.junit.JiraKey;
23-
import org.hibernate.testing.junit4.BaseUnitTestCase;
2423
import org.hibernate.testing.util.ServiceRegistryUtil;
25-
import org.junit.Test;
24+
import org.junit.jupiter.api.Test;
2625

27-
import static org.junit.Assert.assertEquals;
26+
import static org.junit.jupiter.api.Assertions.assertEquals;
2827

2928
/**
3029
* Test the combination of @Nationalized and @Convert
3130
*
3231
* @author Steve Ebersole
3332
*/
34-
//@SkipForDialect(value = DB2Dialect.class, comment = "DB2 jdbc driver doesn't support setNString")
35-
public class AndNationalizedTests extends BaseUnitTestCase {
33+
public class AndNationalizedTests {
3634
@Test
3735
@JiraKey( value = "HHH-9599")
3836
public void basicTest() {

‎hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterTest.java‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,9 @@
4040

4141
import org.hibernate.testing.orm.junit.JiraKey;
4242
import org.hibernate.testing.boot.MetadataBuildingContextTestingImpl;
43-
import org.hibernate.testing.junit4.BaseUnitTestCase;
4443
import org.hibernate.testing.util.ExceptionUtil;
4544
import org.hibernate.testing.util.ServiceRegistryUtil;
46-
import org.junit.Test;
45+
import org.junit.jupiter.api.Test;
4746

4847
import jakarta.persistence.AttributeConverter;
4948
import jakarta.persistence.Column;
@@ -58,18 +57,18 @@
5857
import static org.hamcrest.Matchers.equalTo;
5958
import static org.hamcrest.Matchers.instanceOf;
6059
import static org.hamcrest.Matchers.is;
61-
import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping;
62-
import static org.junit.Assert.assertEquals;
63-
import static org.junit.Assert.assertNotNull;
64-
import static org.junit.Assert.assertSame;
65-
import static org.junit.Assert.fail;
60+
import static org.hibernate.testing.orm.junit.ExtraAssertions.assertTyping;
61+
import static org.junit.jupiter.api.Assertions.assertEquals;
62+
import static org.junit.jupiter.api.Assertions.assertNotNull;
63+
import static org.junit.jupiter.api.Assertions.assertSame;
64+
import static org.junit.jupiter.api.Assertions.fail;
6665

6766
/**
6867
* Tests the principle of adding "AttributeConverter" to the mix of {@link Type} resolution
6968
*
7069
* @author Steve Ebersole
7170
*/
72-
public class AttributeConverterTest extends BaseUnitTestCase {
71+
public class AttributeConverterTest {
7372
@Test
7473
public void testErrorInstantiatingConverterClass() {
7574
Configuration cfg = new Configuration();
@@ -313,21 +312,21 @@ public void testBasicUsage() {
313312
sf.getStatistics().clear();
314313
session = sf.openSession();
315314
session.beginTransaction();
316-
session.get( Tester4.class, 1L );
315+
session.find( Tester4.class, 1L );
317316
session.getTransaction().commit();
318317
session.close();
319318
assertEquals( 0, sf.getStatistics().getEntityUpdateCount() );
320319

321320
session = sf.openSession();
322321
session.beginTransaction();
323-
Tester4 t4 = (Tester4) session.get( Tester4.class, 1L );
322+
Tester4 t4 = session.find( Tester4.class, 1L );
324323
t4.code = 300;
325324
session.getTransaction().commit();
326325
session.close();
327326

328327
session = sf.openSession();
329328
session.beginTransaction();
330-
t4 = session.get( Tester4.class, 1L );
329+
t4 = session.find( Tester4.class, 1L );
331330
assertEquals( 300, t4.code.longValue() );
332331
session.remove( t4 );
333332
session.getTransaction().commit();
@@ -386,7 +385,7 @@ public void testBasicTimestampUsage() {
386385
sf.getStatistics().clear();
387386
session = sf.openSession();
388387
session.beginTransaction();
389-
IrrelevantInstantEntity e = (IrrelevantInstantEntity) session.get( IrrelevantInstantEntity.class, 1L );
388+
IrrelevantInstantEntity e = session.find( IrrelevantInstantEntity.class, 1L );
390389
session.getTransaction().commit();
391390
session.close();
392391
assertEquals( 0, sf.getStatistics().getEntityUpdateCount() );

‎hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/BasicCustomTimeConversionTest.java‎

Lines changed: 14 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,34 @@
44
*/
55
package org.hibernate.orm.test.mapping.converted.converter;
66

7-
import java.net.MalformedURLException;
87
import java.time.LocalDate;
98
import jakarta.persistence.AttributeConverter;
109
import jakarta.persistence.Convert;
1110
import jakarta.persistence.Entity;
1211
import jakarta.persistence.Id;
1312

14-
import org.hibernate.Session;
13+
import org.hibernate.testing.orm.junit.DomainModel;
14+
import org.hibernate.testing.orm.junit.SessionFactory;
15+
import org.hibernate.testing.orm.junit.SessionFactoryScope;
1516
import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter;
1617
import org.hibernate.persister.entity.EntityPersister;
1718
import org.hibernate.type.Type;
1819
import org.hibernate.type.internal.ConvertedBasicTypeImpl;
1920

2021
import org.hibernate.testing.orm.junit.JiraKey;
21-
import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
22-
import org.junit.Test;
22+
import org.junit.jupiter.api.Test;
2323

2424

25-
import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping;
26-
import static org.junit.Assert.assertTrue;
25+
import static org.hibernate.testing.orm.junit.ExtraAssertions.assertTyping;
26+
import static org.junit.jupiter.api.Assertions.assertTrue;
2727

2828
/**
2929
* @author Steve Ebersole
3030
*/
3131
@JiraKey( value = "HHH-8842" )
32-
public class BasicCustomTimeConversionTest extends BaseNonConfigCoreFunctionalTestCase {
32+
@DomainModel(annotatedClasses = {BasicCustomTimeConversionTest.TheEntity.class})
33+
@SessionFactory
34+
public class BasicCustomTimeConversionTest {
3335
static boolean convertToDatabaseColumnCalled = false;
3436
static boolean convertToEntityAttributeCalled = false;
3537

@@ -68,43 +70,26 @@ public TheEntity(Integer id, CustomLocalDate theDate) {
6870
}
6971
}
7072

71-
@Override
72-
protected Class[] getAnnotatedClasses() {
73-
return new Class[] { TheEntity.class };
74-
}
75-
7673
@Test
77-
public void testSimpleConvertUsage() throws MalformedURLException {
78-
final EntityPersister ep = sessionFactory().getMappingMetamodel().getEntityDescriptor(TheEntity.class.getName());
74+
public void testSimpleConvertUsage(SessionFactoryScope scope) {
75+
final EntityPersister ep = scope.getSessionFactory().getMappingMetamodel().getEntityDescriptor(TheEntity.class.getName());
7976
final Type theDatePropertyType = ep.getPropertyType( "theDate" );
8077
final ConvertedBasicTypeImpl type = assertTyping( ConvertedBasicTypeImpl.class, theDatePropertyType );
8178
final JpaAttributeConverter converter = (JpaAttributeConverter) type.getValueConverter();
8279
assertTrue( CustomLocalDateConverter.class.isAssignableFrom( converter.getConverterJavaType().getJavaTypeClass() ) );
8380

8481
resetFlags();
8582

86-
Session session = openSession();
87-
session.getTransaction().begin();
88-
session.persist( new TheEntity( 1, new CustomLocalDate( 2025, 9, 26 ) ) );
89-
session.getTransaction().commit();
90-
session.close();
83+
scope.inTransaction( session -> session.persist( new TheEntity( 1, new CustomLocalDate( 2025, 9, 26 ) ) ) );
9184

9285
assertTrue( convertToDatabaseColumnCalled );
9386
resetFlags();
9487

95-
session = openSession();
96-
session.getTransaction().begin();
97-
session.get( TheEntity.class, 1 );
98-
session.getTransaction().commit();
99-
session.close();
88+
scope.inTransaction( session -> session.find( TheEntity.class, 1 ) );
10089

10190
assertTrue( convertToEntityAttributeCalled );
10291
resetFlags();
10392

104-
session = openSession();
105-
session.getTransaction().begin();
106-
session.createQuery( "delete TheEntity" ).executeUpdate();
107-
session.getTransaction().commit();
108-
session.close();
93+
scope.dropData();
10994
}
11095
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/DirtyCheckingTest.java‎

Lines changed: 53 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -10,120 +10,92 @@
1010
import jakarta.persistence.Entity;
1111
import jakarta.persistence.Id;
1212

13-
import org.hibernate.Session;
14-
1513
import org.hibernate.metamodel.mapping.AttributeMapping;
1614
import org.hibernate.persister.entity.EntityPersister;
17-
import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
18-
import org.junit.Test;
15+
import org.hibernate.testing.orm.junit.DomainModel;
16+
import org.hibernate.testing.orm.junit.SessionFactory;
17+
import org.hibernate.testing.orm.junit.SessionFactoryScope;
18+
import org.junit.jupiter.api.Test;
1919

20-
import static org.junit.Assert.assertEquals;
21-
import static org.junit.Assert.assertFalse;
22-
import static org.junit.Assert.assertTrue;
20+
import static org.junit.jupiter.api.Assertions.assertEquals;
21+
import static org.junit.jupiter.api.Assertions.assertFalse;
22+
import static org.junit.jupiter.api.Assertions.assertTrue;
2323

2424
/**
2525
* @author Steve Ebersole
2626
*/
27-
public class DirtyCheckingTest extends BaseNonConfigCoreFunctionalTestCase {
27+
@DomainModel(annotatedClasses = {DirtyCheckingTest.SomeEntity.class})
28+
@SessionFactory
29+
public class DirtyCheckingTest {
2830

2931
@Test
30-
public void dirtyCheckAgainstNewNameInstance() {
32+
public void dirtyCheckAgainstNewNameInstance(SessionFactoryScope scope) {
3133
SomeEntity simpleEntity = new SomeEntity();
3234
simpleEntity.setId( 1L );
3335
simpleEntity.setName( new Name( "Steven" ) );
3436

35-
Session session = openSession();
36-
session.getTransaction().begin();
37-
session.persist( simpleEntity );
38-
session.getTransaction().commit();
39-
session.close();
40-
41-
session = openSession();
42-
session.getTransaction().begin();
43-
SomeEntity loaded = session.byId( SomeEntity.class ).load( 1L );
44-
loaded.setName( new Name( "Steve" ) );
45-
session.getTransaction().commit();
46-
session.close();
47-
48-
session = openSession();
49-
session.getTransaction().begin();
50-
loaded = session.byId( SomeEntity.class ).load( 1L );
51-
assertEquals( "Steve", loaded.getName().getText() );
52-
session.remove( loaded );
53-
session.getTransaction().commit();
54-
session.close();
37+
scope.inTransaction( session -> session.persist( simpleEntity ) );
38+
39+
scope.inTransaction( session -> {
40+
SomeEntity loaded = session.find( SomeEntity.class, 1L );
41+
loaded.setName( new Name( "Steve" ) );
42+
} );
43+
44+
scope.inTransaction( session -> {
45+
SomeEntity loaded = session.find( SomeEntity.class, 1L );
46+
assertEquals( "Steve", loaded.getName().getText() );
47+
session.remove( loaded );
48+
} );
5549
}
5650

5751
@Test
58-
public void dirtyCheckAgainstMutatedNameInstance() {
52+
public void dirtyCheckAgainstMutatedNameInstance(SessionFactoryScope scope) {
5953
SomeEntity simpleEntity = new SomeEntity();
6054
simpleEntity.setId( 1L );
6155
simpleEntity.setName( new Name( "Steven" ) );
6256

63-
Session session = openSession();
64-
session.getTransaction().begin();
65-
session.persist( simpleEntity );
66-
session.getTransaction().commit();
67-
session.close();
68-
69-
session = openSession();
70-
session.getTransaction().begin();
71-
SomeEntity loaded = session.byId( SomeEntity.class ).load( 1L );
72-
loaded.getName().setText( "Steve" );
73-
session.getTransaction().commit();
74-
session.close();
75-
76-
session = openSession();
77-
session.getTransaction().begin();
78-
loaded = session.byId( SomeEntity.class ).load( 1L );
79-
assertEquals( "Steve", loaded.getName().getText() );
80-
session.remove( loaded );
81-
session.getTransaction().commit();
82-
session.close();
57+
scope.inTransaction( session -> session.persist( simpleEntity ) );
58+
59+
scope.inTransaction( session -> {
60+
SomeEntity loaded = session.find( SomeEntity.class, 1L );
61+
loaded.getName().setText( "Steve" );
62+
} );
63+
64+
scope.inTransaction( session -> {
65+
SomeEntity loaded = session.find( SomeEntity.class, 1L );
66+
assertEquals( "Steve", loaded.getName().getText() );
67+
session.remove( loaded );
68+
} );
8369
}
8470

8571
@Test
86-
public void dirtyCheckAgainstNewNumberInstance() {
72+
public void dirtyCheckAgainstNewNumberInstance(SessionFactoryScope scope) {
8773
// numbers (and most other java types) are actually immutable...
8874
SomeEntity simpleEntity = new SomeEntity();
8975
simpleEntity.setId( 1L );
9076
simpleEntity.setNumber( 1 );
9177

92-
Session session = openSession();
93-
session.getTransaction().begin();
94-
session.persist( simpleEntity );
95-
session.getTransaction().commit();
96-
session.close();
97-
98-
session = openSession();
99-
session.getTransaction().begin();
100-
SomeEntity loaded = session.byId( SomeEntity.class ).load( 1L );
101-
loaded.setNumber( 2 );
102-
session.getTransaction().commit();
103-
session.close();
104-
105-
session = openSession();
106-
session.getTransaction().begin();
107-
loaded = session.byId( SomeEntity.class ).load( 1L );
108-
assertEquals( 2, loaded.getNumber().intValue() );
109-
session.remove( loaded );
110-
session.getTransaction().commit();
111-
session.close();
78+
scope.inTransaction( session -> session.persist( simpleEntity ) );
79+
80+
scope.inTransaction( session -> {
81+
SomeEntity loaded = session.find( SomeEntity.class, 1L );
82+
loaded.setNumber( 2 );
83+
} );
84+
85+
scope.inTransaction( session -> {
86+
SomeEntity loaded = session.find( SomeEntity.class, 1L );
87+
assertEquals( 2, loaded.getNumber().intValue() );
88+
session.remove( loaded );
89+
} );
11290
}
11391

11492
@Test
115-
public void checkConverterMutabilityPlans() {
116-
final EntityPersister persister = sessionFactory().getMappingMetamodel().getEntityDescriptor(SomeEntity.class.getName());
93+
public void checkConverterMutabilityPlans(SessionFactoryScope scope) {
94+
final EntityPersister persister = scope.getSessionFactory().getMappingMetamodel().getEntityDescriptor(SomeEntity.class.getName());
11795
final AttributeMapping numberMapping = persister.findAttributeMapping( "number" );
11896
final AttributeMapping nameMapping = persister.findAttributeMapping( "name" );
119-
120-
assertFalse( persister.getPropertyType( "number" ).isMutable() );
121-
assertTrue( persister.getPropertyType( "name" ).isMutable() );
122-
}
123-
124-
@Override
125-
protected Class[] getAnnotatedClasses() {
126-
return new Class[] {SomeEntity.class};
97+
assertFalse( numberMapping.getExposedMutabilityPlan().isMutable() );
98+
assertTrue( nameMapping.getExposedMutabilityPlan().isMutable() );
12799
}
128100

129101
public static class Name {

0 commit comments

Comments
 (0)