Skip to content

Commit 3ff52f7

Browse files
dreab8dreab8
committed
HHH-19846 Drop JUnit 4 usage
1 parent 12364d0 commit 3ff52f7

File tree

10 files changed

+421
-417
lines changed

10 files changed

+421
-417
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/naming/AcmeCorpPhysicalNamingStrategyTest.java‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,12 @@
88
import org.hibernate.boot.registry.StandardServiceRegistry;
99
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
1010
import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
11-
1211
import org.hibernate.testing.util.ServiceRegistryUtil;
13-
import org.junit.After;
14-
import org.junit.Before;
15-
import org.junit.Test;
12+
import org.junit.jupiter.api.AfterEach;
13+
import org.junit.jupiter.api.BeforeEach;
14+
import org.junit.jupiter.api.Test;
1615

17-
import static org.hamcrest.CoreMatchers.equalTo;
18-
import static org.hamcrest.MatcherAssert.assertThat;
16+
import static org.assertj.core.api.Assertions.assertThat;
1917

2018
/**
2119
* @author Steve Ebersole
@@ -24,25 +22,25 @@ public class AcmeCorpPhysicalNamingStrategyTest {
2422
private AcmeCorpPhysicalNamingStrategy strategy = new AcmeCorpPhysicalNamingStrategy();
2523
private StandardServiceRegistry serviceRegistry;
2624

27-
@Before
25+
@BeforeEach
2826
public void prepareServiceRegistry() {
2927
serviceRegistry = ServiceRegistryUtil.serviceRegistryBuilder()
3028
.build();
3129
}
3230

33-
@After
31+
@AfterEach
3432
public void releaseServiceRegistry() {
35-
if (serviceRegistry != null) {
36-
StandardServiceRegistryBuilder.destroy(serviceRegistry);
33+
if ( serviceRegistry != null ) {
34+
StandardServiceRegistryBuilder.destroy( serviceRegistry );
3735
}
3836
}
3937

4038
@Test
4139
public void testTableNaming() {
4240
{
43-
Identifier in = Identifier.toIdentifier("accountNumber");
44-
Identifier out = strategy.toPhysicalTableName(in, serviceRegistry.getService(JdbcEnvironment.class));
45-
assertThat(out.getText(), equalTo("acct_num"));
41+
Identifier in = Identifier.toIdentifier( "accountNumber" );
42+
Identifier out = strategy.toPhysicalTableName( in, serviceRegistry.getService( JdbcEnvironment.class ) );
43+
assertThat( out.getText() ).isEqualTo( "acct_num" );
4644
}
4745
}
4846
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/BaseNamingTests.java‎

Lines changed: 60 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,18 @@
1515
import org.hibernate.mapping.PersistentClass;
1616
import org.hibernate.mapping.Property;
1717
import org.hibernate.service.ServiceRegistry;
18-
19-
import org.hibernate.testing.junit4.BaseUnitTestCase;
18+
import org.hibernate.testing.orm.junit.BaseUnitTest;
2019
import org.hibernate.testing.util.ServiceRegistryUtil;
21-
import org.junit.Test;
20+
import org.junit.jupiter.api.Test;
2221

23-
import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping;
24-
import static org.junit.Assert.assertEquals;
25-
import static org.junit.Assert.assertNotNull;
22+
import static org.assertj.core.api.Assertions.assertThat;
23+
import static org.junit.jupiter.api.Assertions.fail;
2624

2725
/**
2826
* @author Steve Ebersole
2927
*/
30-
public abstract class BaseNamingTests extends BaseUnitTestCase {
28+
@BaseUnitTest
29+
public abstract class BaseNamingTests {
3130

3231
@Test
3332
public void doTest() {
@@ -50,7 +49,7 @@ public void doTest() {
5049
}
5150
finally {
5251
ServiceRegistry metaServiceRegistry = metadataSources.getServiceRegistry();
53-
if(metaServiceRegistry instanceof BootstrapServiceRegistry ) {
52+
if ( metaServiceRegistry instanceof BootstrapServiceRegistry ) {
5453
BootstrapServiceRegistryBuilder.destroy( metaServiceRegistry );
5554
}
5655
}
@@ -62,25 +61,25 @@ public void doTest() {
6261

6362
protected void validateCustomer(Metadata metadata) {
6463
final PersistentClass customerBinding = metadata.getEntityBinding( Customer.class.getName() );
65-
assertNotNull( customerBinding );
64+
assertThat( customerBinding ).isNotNull();
6665

6766
validateCustomerPrimaryTableName( customerBinding.getTable().getQuotedName() );
6867

69-
assertEquals( 1, customerBinding.getIdentifier().getColumnSpan() );
68+
assertThat( customerBinding.getIdentifier().getColumnSpan() ).isEqualTo( 1 );
7069
validateCustomerPrimaryKeyColumn( (Column) customerBinding.getIdentifier().getSelectables().get( 0 ) );
7170

72-
assertNotNull( customerBinding.getVersion() );
73-
assertEquals( 1, customerBinding.getVersion().getColumnSpan() );
71+
assertThat( customerBinding.getVersion() ).isNotNull();
72+
assertThat( customerBinding.getVersion().getColumnSpan() ).isEqualTo( 1 );
7473
validateCustomerVersionColumn( (Column) customerBinding.getVersion().getSelectables().get( 0 ) );
7574

7675
final Property nameBinding = customerBinding.getProperty( "name" );
77-
assertNotNull( nameBinding );
78-
assertEquals( 1, nameBinding.getColumnSpan() );
76+
assertThat( nameBinding ).isNotNull();
77+
assertThat( nameBinding.getColumnSpan() ).isEqualTo( 1 );
7978
validateCustomerNameColumn( (Column) nameBinding.getSelectables().get( 0 ) );
8079

8180
final Property hqAddressBinding = customerBinding.getProperty( "hqAddress" );
82-
assertNotNull( hqAddressBinding );
83-
assertEquals( 3, hqAddressBinding.getColumnSpan() );
81+
assertThat( hqAddressBinding ).isNotNull();
82+
assertThat( hqAddressBinding.getColumnSpan() ).isEqualTo( 3 );
8483
validateCustomerHqAddressComponent( assertTyping( Component.class, hqAddressBinding.getValue() ) );
8584
}
8685

@@ -97,31 +96,31 @@ protected void validateCustomer(Metadata metadata) {
9796

9897
protected void validateOrder(Metadata metadata) {
9998
final PersistentClass orderBinding = metadata.getEntityBinding( Order.class.getName() );
100-
assertNotNull( orderBinding );
99+
assertThat( orderBinding ).isNotNull();
101100

102101
validateOrderPrimaryTableName( orderBinding.getTable().getQuotedName() );
103102

104-
assertEquals( 1, orderBinding.getIdentifier().getColumnSpan() );
103+
assertThat( orderBinding.getIdentifier().getColumnSpan() ).isEqualTo( 1 );
105104
validateOrderPrimaryKeyColumn( (Column) orderBinding.getIdentifier().getSelectables().get( 0 ) );
106105

107106
final Property referenceCodeBinding = orderBinding.getProperty( "referenceCode" );
108-
assertNotNull( referenceCodeBinding );
109-
assertEquals( 1, referenceCodeBinding.getColumnSpan() );
107+
assertThat( referenceCodeBinding ).isNotNull();
108+
assertThat( referenceCodeBinding.getColumnSpan() ).isEqualTo( 1 );
110109
validateOrderReferenceCodeColumn( (Column) referenceCodeBinding.getSelectables().get( 0 ) );
111110

112111
final Property placedBinding = orderBinding.getProperty( "placed" );
113-
assertNotNull( placedBinding );
114-
assertEquals( 1, placedBinding.getColumnSpan() );
112+
assertThat( placedBinding ).isNotNull();
113+
assertThat( placedBinding.getColumnSpan() ).isEqualTo( 1 );
115114
validateOrderPlacedColumn( (Column) placedBinding.getSelectables().get( 0 ) );
116115

117116
final Property fulfilledBinding = orderBinding.getProperty( "fulfilled" );
118-
assertNotNull( fulfilledBinding );
119-
assertEquals( 1, fulfilledBinding.getColumnSpan() );
117+
assertThat( fulfilledBinding ).isNotNull();
118+
assertThat( fulfilledBinding.getColumnSpan() ).isEqualTo( 1 );
120119
validateOrderFulfilledColumn( (Column) fulfilledBinding.getSelectables().get( 0 ) );
121120

122121
final Property customerBinding = orderBinding.getProperty( "customer" );
123-
assertNotNull( customerBinding );
124-
assertEquals( 1, customerBinding.getColumnSpan() );
122+
assertThat( customerBinding ).isNotNull();
123+
assertThat( customerBinding.getColumnSpan() ).isEqualTo( 1 );
125124
validateOrderCustomerColumn( (Column) customerBinding.getSelectables().get( 0 ) );
126125
}
127126

@@ -138,29 +137,28 @@ protected void validateOrder(Metadata metadata) {
138137
protected abstract void validateOrderCustomerColumn(Column column);
139138

140139

141-
142140
protected void validateZipCode(Metadata metadata) {
143141
final PersistentClass zipCodeBinding = metadata.getEntityBinding( ZipCode.class.getName() );
144-
assertNotNull( zipCodeBinding );
142+
assertThat( zipCodeBinding ).isNotNull();
145143

146144
validateZipCodePrimaryTableName( zipCodeBinding.getTable().getQuotedName() );
147145

148-
assertEquals( 1, zipCodeBinding.getIdentifier().getColumnSpan() );
146+
assertThat( zipCodeBinding.getIdentifier().getColumnSpan() ).isEqualTo( 1 );
149147
validateZipCodePrimaryKeyColumn( (Column) zipCodeBinding.getIdentifier().getSelectables().get( 0 ) );
150148

151149
final Property codeBinding = zipCodeBinding.getProperty( "code" );
152-
assertNotNull( codeBinding );
153-
assertEquals( 1, codeBinding.getColumnSpan() );
150+
assertThat( codeBinding ).isNotNull();
151+
assertThat( codeBinding.getColumnSpan() ).isEqualTo( 1 );
154152
validateZipCodeCodeColumn( (Column) codeBinding.getSelectables().get( 0 ) );
155153

156154
final Property cityBinding = zipCodeBinding.getProperty( "city" );
157-
assertNotNull( cityBinding );
158-
assertEquals( 1, cityBinding.getColumnSpan() );
155+
assertThat( cityBinding ).isNotNull();
156+
assertThat( cityBinding.getColumnSpan() ).isEqualTo( 1 );
159157
validateZipCodeCityColumn( (Column) cityBinding.getSelectables().get( 0 ) );
160158

161159
final Property stateBinding = zipCodeBinding.getProperty( "state" );
162-
assertNotNull( stateBinding );
163-
assertEquals( 1, stateBinding.getColumnSpan() );
160+
assertThat( stateBinding ).isNotNull();
161+
assertThat( stateBinding.getColumnSpan() ).isEqualTo( 1 );
164162
validateZipCodeStateColumn( (Column) stateBinding.getSelectables().get( 0 ) );
165163
}
166164

@@ -176,15 +174,16 @@ protected void validateZipCode(Metadata metadata) {
176174

177175

178176
protected void validateCustomerRegisteredTrademarks(Metadata metadata) {
179-
final Collection collectionBinding = metadata.getCollectionBinding( Customer.class.getName() + ".registeredTrademarks" );
180-
assertNotNull( collectionBinding );
177+
final Collection collectionBinding = metadata.getCollectionBinding(
178+
Customer.class.getName() + ".registeredTrademarks" );
179+
assertThat( collectionBinding ).isNotNull();
181180

182181
validateCustomerRegisteredTrademarksTableName( collectionBinding.getCollectionTable().getQuotedName() );
183182

184-
assertEquals( 1, collectionBinding.getKey().getColumnSpan() );
183+
assertThat( collectionBinding.getKey().getColumnSpan() ).isEqualTo( 1 );
185184
validateCustomerRegisteredTrademarksKeyColumn( (Column) collectionBinding.getKey().getSelectables().get( 0 ) );
186185

187-
assertEquals( 1, collectionBinding.getElement().getColumnSpan() );
186+
assertThat( collectionBinding.getElement().getColumnSpan() ).isEqualTo( 1 );
188187
validateCustomerRegisteredTrademarksElementColumn(
189188
(Column) collectionBinding.getElement()
190189
.getSelectables()
@@ -201,14 +200,14 @@ protected void validateCustomerRegisteredTrademarks(Metadata metadata) {
201200

202201
protected void validateCustomerAddresses(Metadata metadata) {
203202
final Collection collectionBinding = metadata.getCollectionBinding( Customer.class.getName() + ".addresses" );
204-
assertNotNull( collectionBinding );
203+
assertThat( collectionBinding ).isNotNull();
205204

206205
validateCustomerAddressesTableName( collectionBinding.getCollectionTable().getQuotedName() );
207206

208-
assertEquals( 1, collectionBinding.getKey().getColumnSpan() );
207+
assertThat( collectionBinding.getKey().getColumnSpan() ).isEqualTo( 1 );
209208
validateCustomerAddressesKeyColumn( (Column) collectionBinding.getKey().getSelectables().get( 0 ) );
210209

211-
assertEquals( 3, collectionBinding.getElement().getColumnSpan() );
210+
assertThat( collectionBinding.getElement().getColumnSpan() ).isEqualTo( 3 );
212211
validateCustomerAddressesElementComponent( assertTyping( Component.class, collectionBinding.getElement() ) );
213212
}
214213

@@ -221,14 +220,14 @@ protected void validateCustomerAddresses(Metadata metadata) {
221220

222221
protected void validateCustomerOrders(Metadata metadata) {
223222
final Collection collectionBinding = metadata.getCollectionBinding( Customer.class.getName() + ".orders" );
224-
assertNotNull( collectionBinding );
223+
assertThat( collectionBinding ).isNotNull();
225224

226225
validateCustomerOrdersTableName( collectionBinding.getCollectionTable().getQuotedName() );
227226

228-
assertEquals( 1, collectionBinding.getKey().getColumnSpan() );
227+
assertThat( collectionBinding.getKey().getColumnSpan() ).isEqualTo( 1 );
229228
validateCustomerOrdersKeyColumn( (Column) collectionBinding.getKey().getSelectables().get( 0 ) );
230229

231-
assertEquals( 1, collectionBinding.getElement().getColumnSpan() );
230+
assertThat( collectionBinding.getElement().getColumnSpan() ).isEqualTo( 1 );
232231
validateCustomerOrdersElementColumn( (Column) collectionBinding.getElement().getSelectables().get( 0 ) );
233232
}
234233

@@ -240,17 +239,30 @@ protected void validateCustomerOrders(Metadata metadata) {
240239

241240
protected void validateCustomerIndustries(Metadata metadata) {
242241
final Collection collectionBinding = metadata.getCollectionBinding( Customer.class.getName() + ".industries" );
243-
assertNotNull( collectionBinding );
242+
assertThat( collectionBinding ).isNotNull();
244243

245244
validateCustomerIndustriesTableName( collectionBinding.getCollectionTable().getQuotedName() );
246245

247-
assertEquals( 1, collectionBinding.getKey().getColumnSpan() );
246+
assertThat( collectionBinding.getKey().getColumnSpan() ).isEqualTo( 1 );
248247
validateCustomerIndustriesKeyColumn( (Column) collectionBinding.getKey().getSelectables().get( 0 ) );
249248

250-
assertEquals( 1, collectionBinding.getElement().getColumnSpan() );
249+
assertThat( collectionBinding.getElement().getColumnSpan() ).isEqualTo( 1 );
251250
validateCustomerIndustriesElementColumn( (Column) collectionBinding.getElement().getSelectables().get( 0 ) );
252251
}
253252

253+
public static <T> T assertTyping(Class<T> expectedType, Object value) {
254+
if ( !expectedType.isInstance( value ) ) {
255+
fail(
256+
String.format(
257+
"Expecting value of type [%s], but found [%s]",
258+
expectedType.getName(),
259+
value == null ? "<null>" : value
260+
)
261+
);
262+
}
263+
return (T) value;
264+
}
265+
254266
protected abstract void validateCustomerIndustriesTableName(String name);
255267

256268
protected abstract void validateCustomerIndustriesKeyColumn(Column column);

0 commit comments

Comments
 (0)