Skip to content

Commit f95e007

Browse files
dreab8dreab8
committed
HHH-19846 Drop JUnit 4 usage
1 parent 58d61ab commit f95e007

File tree

3 files changed

+93
-75
lines changed

3 files changed

+93
-75
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/AbstractJPAIndexTest.java‎

Lines changed: 81 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,8 @@
44
*/
55
package org.hibernate.orm.test.annotations.index.jpa;
66

7-
import java.util.Iterator;
8-
9-
import org.hibernate.boot.MetadataBuilder;
7+
import org.hibernate.boot.model.naming.ImplicitNamingStrategy;
108
import org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl;
11-
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
129
import org.hibernate.cfg.AvailableSettings;
1310
import org.hibernate.internal.util.StringHelper;
1411
import org.hibernate.mapping.Bag;
@@ -21,119 +18,138 @@
2118
import org.hibernate.mapping.Table;
2219
import org.hibernate.mapping.UniqueKey;
2320
import org.hibernate.metamodel.CollectionClassification;
21+
import org.hibernate.testing.orm.junit.ServiceRegistry;
22+
import org.hibernate.testing.orm.junit.SessionFactory;
23+
import org.hibernate.testing.orm.junit.SessionFactoryScope;
24+
import org.hibernate.testing.orm.junit.SettingProvider;
25+
import org.junit.jupiter.api.Test;
26+
27+
import java.util.Iterator;
2428

25-
import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
26-
import org.junit.Test;
29+
import static org.assertj.core.api.Assertions.assertThat;
2730

28-
import static org.junit.Assert.assertEquals;
29-
import static org.junit.Assert.assertFalse;
30-
import static org.junit.Assert.assertSame;
31-
import static org.junit.Assert.assertTrue;
3231

3332
/**
3433
* @author Strong Liu
3534
*/
36-
public abstract class AbstractJPAIndexTest extends BaseNonConfigCoreFunctionalTestCase {
37-
@Override
38-
protected void configureMetadataBuilder(MetadataBuilder metadataBuilder) {
39-
super.configureMetadataBuilder( metadataBuilder );
40-
metadataBuilder.applyImplicitNamingStrategy( ImplicitNamingStrategyJpaCompliantImpl.INSTANCE );
35+
@SessionFactory
36+
@ServiceRegistry(
37+
settingProviders = {
38+
@SettingProvider(settingName = AvailableSettings.DEFAULT_LIST_SEMANTICS,
39+
provider = AbstractJPAIndexTest.ListSemanticProvider.class),
40+
@SettingProvider(settingName = AvailableSettings.IMPLICIT_NAMING_STRATEGY,
41+
provider = AbstractJPAIndexTest.ImplicitNameSettingProvider.class)}
42+
)
43+
public abstract class AbstractJPAIndexTest {
44+
45+
public static class ImplicitNameSettingProvider implements SettingProvider.Provider<ImplicitNamingStrategy> {
46+
@Override
47+
public ImplicitNamingStrategy getSetting() {
48+
return ImplicitNamingStrategyJpaCompliantImpl.INSTANCE;
49+
}
4150
}
4251

43-
@Override
44-
protected void configureStandardServiceRegistryBuilder(StandardServiceRegistryBuilder ssrb) {
45-
super.configureStandardServiceRegistryBuilder( ssrb );
46-
ssrb.applySetting( AvailableSettings.DEFAULT_LIST_SEMANTICS, CollectionClassification.BAG );
52+
public static class ListSemanticProvider implements SettingProvider.Provider<CollectionClassification> {
53+
@Override
54+
public CollectionClassification getSetting() {
55+
return CollectionClassification.BAG;
56+
}
4757
}
4858

4959
@Test
50-
public void testTableIndex() {
51-
PersistentClass entity = metadata().getEntityBinding( Car.class.getName() );
60+
public void testTableIndex(SessionFactoryScope scope) {
61+
PersistentClass entity = scope.getMetadataImplementor().getEntityBinding( Car.class.getName() );
5262
Iterator itr = entity.getTable().getUniqueKeys().values().iterator();
53-
assertTrue( itr.hasNext() );
63+
assertThat( itr.hasNext() ).isTrue();
5464
UniqueKey uk = (UniqueKey) itr.next();
55-
assertFalse( itr.hasNext() );
56-
assertTrue( StringHelper.isNotEmpty( uk.getName() ) );
57-
assertEquals( 2, uk.getColumnSpan() );
58-
Column column = (Column) uk.getColumns().get( 0 );
59-
assertEquals( "brand", column.getName() );
60-
column = (Column) uk.getColumns().get( 1 );
61-
assertEquals( "producer", column.getName() );
62-
assertSame( entity.getTable(), uk.getTable() );
65+
assertThat( itr.hasNext() ).isFalse();
66+
assertThat( StringHelper.isNotEmpty( uk.getName() ) ).isTrue();
67+
assertThat( uk.getColumnSpan() ).isEqualTo( 2 );
68+
Column column = uk.getColumns().get( 0 );
69+
assertThat( column.getName() ).isEqualTo( "brand" );
70+
column = uk.getColumns().get( 1 );
71+
assertThat( column.getName() ).isEqualTo( "producer" );
72+
assertThat( uk.getTable() ).isSameAs( entity.getTable() );
6373

6474

6575
itr = entity.getTable().getIndexes().values().iterator();
66-
assertTrue( itr.hasNext() );
67-
Index index = (Index)itr.next();
68-
assertFalse( itr.hasNext() );
69-
assertEquals( "Car_idx", index.getName() );
70-
assertEquals( 1, index.getColumnSpan() );
76+
assertThat( itr.hasNext() ).isTrue();
77+
Index index = (Index) itr.next();
78+
assertThat( itr.hasNext() ).isFalse();
79+
assertThat( index.getName() ).isEqualTo( "Car_idx" );
80+
assertThat( index.getColumnSpan() ).isEqualTo( 1 );
7181
column = index.getColumns().iterator().next();
72-
assertEquals( "since", column.getName() );
73-
assertSame( entity.getTable(), index.getTable() );
82+
assertThat( column.getName() ).isEqualTo( "since" );
83+
assertThat( index.getTable() ).isSameAs( entity.getTable() );
7484
}
7585

7686
@Test
77-
public void testSecondaryTableIndex(){
78-
PersistentClass entity = metadata().getEntityBinding( Car.class.getName() );
87+
public void testSecondaryTableIndex(SessionFactoryScope scope) {
88+
PersistentClass entity = scope.getMetadataImplementor().getEntityBinding( Car.class.getName() );
7989

8090
Join join = entity.getJoins().get( 0 );
8191
Iterator<Index> itr = join.getTable().getIndexes().values().iterator();
82-
assertTrue( itr.hasNext() );
92+
assertThat( itr.hasNext() ).isTrue();
8393
Index index = itr.next();
84-
assertFalse( itr.hasNext() );
85-
assertTrue( "index name is not generated", StringHelper.isNotEmpty( index.getName() ) );
86-
assertEquals( 2, index.getColumnSpan() );
94+
assertThat( itr.hasNext() ).isFalse();
95+
assertThat( StringHelper.isNotEmpty( index.getName() ) )
96+
.describedAs( "index name is not generated" )
97+
.isTrue();
98+
assertThat( index.getColumnSpan() ).isEqualTo( 2 );
8799
Iterator<Column> columnIterator = index.getColumns().iterator();
88100
Column column = columnIterator.next();
89-
assertEquals( "dealer_name", column.getName() );
101+
assertThat( column.getName() ).isEqualTo( "dealer_name" );
90102
column = columnIterator.next();
91-
assertEquals( "rate", column.getName() );
92-
assertSame( join.getTable(), index.getTable() );
103+
assertThat( column.getName() ).isEqualTo( "rate" );
104+
assertThat( index.getTable() ).isSameAs( join.getTable() );
93105

94106
}
95107

96108
@Test
97-
public void testCollectionTableIndex(){
98-
PersistentClass entity = metadata().getEntityBinding( Car.class.getName() );
109+
public void testCollectionTableIndex(SessionFactoryScope scope) {
110+
PersistentClass entity = scope.getMetadataImplementor().getEntityBinding( Car.class.getName() );
99111
Property property = entity.getProperty( "otherDealers" );
100-
Set set = (Set)property.getValue();
112+
Set set = (Set) property.getValue();
101113
Table collectionTable = set.getCollectionTable();
102114

103115
Iterator<Index> itr = collectionTable.getIndexes().values().iterator();
104-
assertTrue( itr.hasNext() );
116+
assertThat( itr.hasNext() ).isTrue();
105117
Index index = itr.next();
106-
assertFalse( itr.hasNext() );
107-
assertTrue( "index name is not generated", StringHelper.isNotEmpty( index.getName() ) );
108-
assertEquals( 1, index.getColumnSpan() );
118+
assertThat( itr.hasNext() ).isFalse();
119+
assertThat( StringHelper.isNotEmpty( index.getName() ) )
120+
.describedAs( "index name is not generated" )
121+
.isTrue();
122+
assertThat( index.getColumnSpan() ).isEqualTo( 1 );
109123
Iterator<Column> columnIterator = index.getColumns().iterator();
110124
Column column = columnIterator.next();
111-
assertEquals( "name", column.getName() );
112-
assertSame( collectionTable, index.getTable() );
125+
assertThat( column.getName() ).isEqualTo( "name" );
126+
assertThat( index.getTable() ).isSameAs( collectionTable );
113127

114128
}
115129

116130
@Test
117-
public void testJoinTableIndex(){
118-
PersistentClass entity = metadata().getEntityBinding( Importer.class.getName() );
131+
public void testJoinTableIndex(SessionFactoryScope scope) {
132+
PersistentClass entity = scope.getMetadataImplementor().getEntityBinding( Importer.class.getName() );
119133
Property property = entity.getProperty( "cars" );
120-
Bag set = (Bag)property.getValue();
134+
Bag set = (Bag) property.getValue();
121135
Table collectionTable = set.getCollectionTable();
122136

123137
Iterator<Index> itr = collectionTable.getIndexes().values().iterator();
124-
assertTrue( itr.hasNext() );
138+
assertThat( itr.hasNext() ).isTrue();
125139
Index index = itr.next();
126-
assertFalse( itr.hasNext() );
127-
assertTrue( "index name is not generated", StringHelper.isNotEmpty( index.getName() ) );
128-
assertEquals( 1, index.getColumnSpan() );
140+
assertThat( itr.hasNext() ).isFalse();
141+
assertThat( StringHelper.isNotEmpty( index.getName() ) )
142+
.describedAs( "index name is not generated" )
143+
.isTrue();
144+
assertThat( index.getColumnSpan() ).isEqualTo( 1 );
129145
Iterator<Column> columnIterator = index.getColumns().iterator();
130146
Column column = columnIterator.next();
131-
assertEquals( "importers_id", column.getName() );
132-
assertSame( collectionTable, index.getTable() );
147+
assertThat( column.getName() ).isEqualTo( "importers_id" );
148+
assertThat( index.getTable() ).isSameAs( collectionTable );
133149
}
134150

135151
@Test
136-
public void testTableGeneratorIndex(){
152+
public void testTableGeneratorIndex() {
137153
//todo
138154
}
139155
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/IndexTest.java‎

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

7+
import org.hibernate.testing.orm.junit.DomainModel;
8+
79
/**
810
* @author Strong Liu
911
*/
10-
public class IndexTest extends AbstractJPAIndexTest {
11-
@Override
12-
protected Class<?>[] getAnnotatedClasses() {
13-
return new Class[] {
12+
@DomainModel(
13+
annotatedClasses = {
1414
Car.class,
1515
Dealer.class,
1616
Importer.class
17-
};
18-
}
17+
}
18+
)
19+
public class IndexTest extends AbstractJPAIndexTest {
1920
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/OrmXmlIndexTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@
55
package org.hibernate.orm.test.annotations.index.jpa;
66

77

8+
import org.hibernate.testing.orm.junit.DomainModel;
9+
810
/**
911
* @author Strong Liu
1012
*/
13+
@DomainModel(
14+
xmlMappings = "org/hibernate/orm/test/annotations/index/jpa/orm-index.xml"
15+
)
1116
public class OrmXmlIndexTest extends AbstractJPAIndexTest {
12-
@Override
13-
protected String[] getXmlFiles() {
14-
return new String[] { "org/hibernate/orm/test/annotations/index/jpa/orm-index.xml" };
15-
}
1617
}

0 commit comments

Comments
 (0)