Skip to content

Commit 6be9248

Browse files
dreab8dreab8
committed
HHH-19846 Drop JUnit 4 usage
1 parent 188f825 commit 6be9248

File tree

4 files changed

+103
-107
lines changed

4 files changed

+103
-107
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/CamelCaseToUnderscoresNamingStrategyTest.java‎

Lines changed: 25 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,79 +5,66 @@
55
package org.hibernate.orm.test.annotations.namingstrategy;
66

77
import jakarta.persistence.Column;
8+
import jakarta.persistence.Entity;
9+
import jakarta.persistence.Id;
10+
import jakarta.persistence.Table;
811
import org.hibernate.boot.Metadata;
912
import org.hibernate.boot.MetadataSources;
1013
import org.hibernate.boot.model.naming.PhysicalNamingStrategySnakeCaseImpl;
1114
import org.hibernate.cfg.Environment;
1215
import org.hibernate.mapping.PersistentClass;
1316
import org.hibernate.service.ServiceRegistry;
14-
1517
import org.hibernate.testing.ServiceRegistryBuilder;
16-
import org.hibernate.testing.junit4.BaseUnitTestCase;
17-
import org.junit.After;
18-
import org.junit.Before;
19-
import org.junit.Test;
20-
21-
import jakarta.persistence.Entity;
22-
import jakarta.persistence.Id;
23-
import jakarta.persistence.Table;
18+
import org.hibernate.testing.orm.junit.BaseUnitTest;
19+
import org.junit.jupiter.api.AfterAll;
20+
import org.junit.jupiter.api.BeforeAll;
21+
import org.junit.jupiter.api.Test;
2422

25-
import static org.junit.Assert.assertEquals;
23+
import static org.assertj.core.api.Assertions.assertThat;
2624

2725
/**
2826
* Test harness for HHH-17310.
2927
*
3028
* @author Anilabha Baral
3129
*/
32-
public class CamelCaseToUnderscoresNamingStrategyTest extends BaseUnitTestCase {
30+
@BaseUnitTest
31+
public class CamelCaseToUnderscoresNamingStrategyTest {
3332

3433
private ServiceRegistry serviceRegistry;
3534

36-
@Before
35+
@BeforeAll
3736
public void setUp() {
3837
serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() );
3938
}
4039

41-
@After
40+
@AfterAll
4241
public void tearDown() {
4342
if ( serviceRegistry != null ) {
4443
ServiceRegistryBuilder.destroy( serviceRegistry );
4544
}
4645
}
4746

4847
@Test
49-
public void testWithWordWithDigitNamingStrategy() throws Exception {
48+
public void testWithWordWithDigitNamingStrategy() {
5049
Metadata metadata = new MetadataSources( serviceRegistry )
5150
.addAnnotatedClass( B.class )
5251
.getMetadataBuilder()
5352
.applyPhysicalNamingStrategy( new PhysicalNamingStrategySnakeCaseImpl() )
5453
.build();
5554

5655
PersistentClass entityBinding = metadata.getEntityBinding( B.class.getName() );
57-
assertEquals(
58-
"word_with_digit_d1",
59-
entityBinding.getProperty( "wordWithDigitD1" ).getSelectables().get( 0 ).getText()
60-
);
61-
assertEquals(
62-
"abcd_efgh_i21",
63-
entityBinding.getProperty( "AbcdEfghI21" ).getSelectables().get( 0 ).getText()
64-
);
65-
assertEquals(
66-
"hello1",
67-
entityBinding.getProperty( "hello1" ).getSelectables().get( 0 ).getText()
68-
);
69-
assertEquals(
70-
"hello1_d2",
71-
entityBinding.getProperty( "hello1D2" ).getSelectables().get( 0 ).getText()
72-
);
73-
assertEquals(
74-
"hello3d4",
75-
entityBinding.getProperty( "hello3d4" ).getSelectables().get( 0 ).getText()
76-
);
77-
assertEquals(
78-
"Quoted-ColumnName",
79-
entityBinding.getProperty( "quoted" ).getSelectables().get( 0 ).getText()
80-
);
56+
assertThat( entityBinding.getProperty( "wordWithDigitD1" ).getSelectables().get( 0 ).getText() )
57+
.isEqualTo( "word_with_digit_d1" );
58+
assertThat( entityBinding.getProperty( "AbcdEfghI21" ).getSelectables().get( 0 ).getText() )
59+
.isEqualTo( "abcd_efgh_i21" );
60+
assertThat( entityBinding.getProperty( "hello1" ).getSelectables().get( 0 ).getText() )
61+
.isEqualTo( "hello1" );
62+
assertThat( entityBinding.getProperty( "hello1D2" ).getSelectables().get( 0 ).getText() )
63+
.isEqualTo( "hello1_d2" );
64+
assertThat( entityBinding.getProperty( "hello3d4" ).getSelectables().get( 0 ).getText() )
65+
.isEqualTo( "hello3d4" );
66+
assertThat( entityBinding.getProperty( "quoted" ).getSelectables().get( 0 ).getText() )
67+
.isEqualTo( "Quoted-ColumnName" );
8168
}
8269

8370
@Entity

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/LongKeyNamingStrategyTest.java‎

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,59 +12,62 @@
1212
import jakarta.persistence.ManyToOne;
1313
import jakarta.persistence.Table;
1414
import jakarta.persistence.UniqueConstraint;
15-
1615
import org.hibernate.boot.Metadata;
1716
import org.hibernate.boot.MetadataSources;
1817
import org.hibernate.cfg.Environment;
1918
import org.hibernate.service.ServiceRegistry;
20-
2119
import org.hibernate.testing.ServiceRegistryBuilder;
20+
import org.hibernate.testing.orm.junit.BaseUnitTest;
2221
import org.hibernate.testing.orm.junit.JiraKey;
23-
import org.hibernate.testing.junit4.BaseUnitTestCase;
24-
import org.junit.After;
25-
import org.junit.Before;
26-
import org.junit.Test;
22+
import org.junit.jupiter.api.AfterAll;
23+
import org.junit.jupiter.api.BeforeAll;
24+
import org.junit.jupiter.api.Test;
2725

28-
import static org.junit.Assert.assertEquals;
26+
import static org.assertj.core.api.Assertions.assertThat;
2927

3028
/**
3129
* Test harness for HHH-11089.
3230
*
3331
* @author Vlad Mihalcea
3432
*/
35-
@JiraKey( value = "HHH-11089" )
36-
public class LongKeyNamingStrategyTest extends BaseUnitTestCase {
33+
@JiraKey(value = "HHH-11089")
34+
@BaseUnitTest
35+
public class LongKeyNamingStrategyTest {
3736

3837
private ServiceRegistry serviceRegistry;
3938

40-
@Before
39+
@BeforeAll
4140
public void setUp() {
4241
serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() );
4342
}
4443

45-
@After
44+
@AfterAll
4645
public void tearDown() {
4746
if ( serviceRegistry != null ) {
4847
ServiceRegistryBuilder.destroy( serviceRegistry );
4948
}
5049
}
50+
5151
@Test
52-
public void testWithCustomNamingStrategy() throws Exception {
52+
public void testWithCustomNamingStrategy() {
5353
Metadata metadata = new MetadataSources( serviceRegistry )
54-
.addAnnotatedClass(Address.class)
55-
.addAnnotatedClass(Person.class)
54+
.addAnnotatedClass( Address.class )
55+
.addAnnotatedClass( Person.class )
5656
.getMetadataBuilder()
5757
.applyImplicitNamingStrategy( new LongIdentifierNamingStrategy() )
5858
.build();
5959

60-
var foreignKey = metadata.getEntityBinding(Address.class.getName()).getTable().getForeignKeyCollection().iterator().next();
61-
assertEquals( "FK_way_longer_than_the_30_char", foreignKey.getName() );
60+
var foreignKey = metadata.getEntityBinding( Address.class.getName() ).getTable().getForeignKeyCollection()
61+
.iterator().next();
62+
assertThat( foreignKey.getName() ).isEqualTo( "FK_way_longer_than_the_30_char" );
6263

63-
var uniqueKey = metadata.getEntityBinding(Address.class.getName()).getTable().getUniqueKeys().values().iterator().next();
64-
assertEquals( "UK_way_longer_than_the_30_char", uniqueKey.getName() );
64+
var uniqueKey = metadata.getEntityBinding( Address.class.getName() ).getTable().getUniqueKeys().values()
65+
.iterator().next();
66+
assertThat( uniqueKey.getName() ).isEqualTo( "UK_way_longer_than_the_30_char" );
6567

66-
var index = metadata.getEntityBinding(Address.class.getName()).getTable().getIndexes().values().iterator().next();
67-
assertEquals( "IDX_way_longer_than_the_30_cha", index.getName() );
68+
var index = metadata.getEntityBinding( Address.class.getName() ).getTable().getIndexes().values().iterator()
69+
.next();
70+
assertThat( index.getName() ).isEqualTo( "IDX_way_longer_than_the_30_cha" );
6871
}
6972

7073
@Entity(name = "Address")
@@ -73,7 +76,8 @@ public void testWithCustomNamingStrategy() throws Exception {
7376
columnNames = {
7477
"city", "streetName", "streetNumber"
7578
}),
76-
indexes = @Index( name = "IDX_way_longer_than_the_30_characters_limit", columnList = "city, streetName, streetNumber")
79+
indexes = @Index(name = "IDX_way_longer_than_the_30_characters_limit",
80+
columnList = "city, streetName, streetNumber")
7781
)
7882
public class Address {
7983

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/NamingStrategyTest.java‎

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

7-
import java.util.Locale;
87
import org.hibernate.boot.Metadata;
98
import org.hibernate.boot.MetadataSources;
109
import org.hibernate.boot.model.naming.Identifier;
@@ -14,43 +13,44 @@
1413
import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
1514
import org.hibernate.mapping.Collection;
1615
import org.hibernate.mapping.PersistentClass;
17-
import org.hibernate.mapping.Selectable;
1816
import org.hibernate.service.ServiceRegistry;
19-
2017
import org.hibernate.testing.ServiceRegistryBuilder;
21-
import org.hibernate.testing.junit4.BaseUnitTestCase;
22-
import org.junit.After;
23-
import org.junit.Before;
24-
import org.junit.Test;
18+
import org.hibernate.testing.orm.junit.BaseUnitTest;
19+
import org.junit.jupiter.api.AfterAll;
20+
import org.junit.jupiter.api.BeforeAll;
21+
import org.junit.jupiter.api.Test;
22+
23+
import java.util.Locale;
2524

26-
import static org.junit.Assert.assertEquals;
25+
import static org.assertj.core.api.Assertions.assertThat;
2726

2827
/**
2928
* Test harness for ANN-716.
3029
*
3130
* @author Hardy Ferentschik
3231
*/
33-
public class NamingStrategyTest extends BaseUnitTestCase {
32+
@BaseUnitTest
33+
public class NamingStrategyTest {
3434

3535
private ServiceRegistry serviceRegistry;
3636

37-
@Before
37+
@BeforeAll
3838
public void setUp() {
3939
serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() );
4040
}
4141

42-
@After
42+
@AfterAll
4343
public void tearDown() {
4444
if ( serviceRegistry != null ) {
4545
ServiceRegistryBuilder.destroy( serviceRegistry );
4646
}
4747
}
4848

4949
@Test
50-
public void testWithCustomNamingStrategy() throws Exception {
50+
public void testWithCustomNamingStrategy() {
5151
new MetadataSources( serviceRegistry )
52-
.addAnnotatedClass(Address.class)
53-
.addAnnotatedClass(Person.class)
52+
.addAnnotatedClass( Address.class )
53+
.addAnnotatedClass( Person.class )
5454
.getMetadataBuilder()
5555
.applyPhysicalNamingStrategy( new DummyNamingStrategy() )
5656
.build();
@@ -59,7 +59,7 @@ public void testWithCustomNamingStrategy() throws Exception {
5959
@Test
6060
public void testWithUpperCaseNamingStrategy() throws Exception {
6161
Metadata metadata = new MetadataSources( serviceRegistry )
62-
.addAnnotatedClass(A.class)
62+
.addAnnotatedClass( A.class )
6363
.getMetadataBuilder()
6464
.applyPhysicalNamingStrategy( new PhysicalNamingStrategyStandardImpl() {
6565
@Override
@@ -71,14 +71,14 @@ public Identifier toPhysicalColumnName(
7171
.build();
7272

7373
PersistentClass entityBinding = metadata.getEntityBinding( A.class.getName() );
74-
assertEquals("NAME",
75-
((Selectable) entityBinding.getProperty( "name" ).getSelectables().get( 0 ) ).getText());
76-
assertEquals("VALUE",
77-
((Selectable) entityBinding.getProperty( "value" ).getSelectables().get( 0 ) ).getText());
74+
assertThat( entityBinding.getProperty( "name" ).getSelectables().get( 0 ).getText() )
75+
.isEqualTo( "NAME" );
76+
assertThat( entityBinding.getProperty( "value" ).getSelectables().get( 0 ).getText() )
77+
.isEqualTo( "VALUE" );
7878
}
7979

8080
@Test
81-
public void testWithJpaCompliantNamingStrategy() throws Exception {
81+
public void testWithJpaCompliantNamingStrategy() {
8282
Metadata metadata = new MetadataSources( serviceRegistry )
8383
.addAnnotatedClass( A.class )
8484
.addAnnotatedClass( AddressEntry.class )
@@ -87,15 +87,15 @@ public void testWithJpaCompliantNamingStrategy() throws Exception {
8787
.build();
8888

8989
Collection collectionBinding = metadata.getCollectionBinding( A.class.getName() + ".address" );
90-
assertEquals(
91-
"Expecting A#address collection table name (implicit) to be [A_address] per JPA spec (section 11.1.8)",
92-
"A_ADDRESS",
93-
collectionBinding.getCollectionTable().getQuotedName().toUpperCase(Locale.ROOT)
94-
);
90+
assertThat( collectionBinding.getCollectionTable().getQuotedName().toUpperCase( Locale.ROOT ) )
91+
.describedAs(
92+
"Expecting A#address collection table name (implicit) to be [A_address] per JPA spec (section 11.1.8)"
93+
)
94+
.isEqualTo( "A_ADDRESS" );
9595
}
9696

9797
@Test
98-
public void testWithoutCustomNamingStrategy() throws Exception {
98+
public void testWithoutCustomNamingStrategy() {
9999
new MetadataSources( serviceRegistry )
100100
.addAnnotatedClass( Address.class )
101101
.addAnnotatedClass( Person.class )

0 commit comments

Comments
 (0)