Skip to content

Commit f18f6e1

Browse files
dreab8dreab8
committed
HHH-19846 Drop JUnit 4 usage
1 parent f1ac4e3 commit f18f6e1

File tree

7 files changed

+136
-124
lines changed

7 files changed

+136
-124
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/hbm/collectionpk/CollectionPkTest.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,38 @@
44
*/
55
package org.hibernate.orm.test.hbm.collectionpk;
66

7-
import java.util.Arrays;
8-
97
import org.hibernate.boot.Metadata;
108
import org.hibernate.boot.MetadataSources;
119
import org.hibernate.boot.registry.StandardServiceRegistry;
1210
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
13-
import org.hibernate.tool.schema.internal.SchemaCreatorImpl;
14-
11+
import org.hibernate.orm.test.hbm.index.JournalingSchemaToolingTarget;
12+
import org.hibernate.testing.orm.junit.BaseUnitTest;
1513
import org.hibernate.testing.orm.junit.JiraKey;
16-
import org.hibernate.testing.junit4.BaseUnitTestCase;
1714
import org.hibernate.testing.util.ServiceRegistryUtil;
15+
import org.hibernate.tool.schema.internal.SchemaCreatorImpl;
16+
import org.junit.jupiter.api.AfterEach;
17+
import org.junit.jupiter.api.BeforeEach;
18+
import org.junit.jupiter.api.Test;
1819

19-
import org.hibernate.orm.test.hbm.index.JournalingSchemaToolingTarget;
20-
import org.junit.After;
21-
import org.junit.Before;
22-
import org.junit.Test;
20+
import java.util.Arrays;
21+
22+
import static org.assertj.core.api.Assertions.assertThat;
2323

24-
import static org.junit.Assert.assertTrue;
2524

2625
/**
2726
* @author Steve Ebersole
2827
*/
29-
@JiraKey( value = "HHH-10206" )
30-
public class CollectionPkTest extends BaseUnitTestCase {
28+
@JiraKey(value = "HHH-10206")
29+
@BaseUnitTest
30+
public class CollectionPkTest {
3131
private StandardServiceRegistry ssr;
3232

33-
@Before
33+
@BeforeEach
3434
public void before() {
3535
ssr = ServiceRegistryUtil.serviceRegistry();
3636
}
3737

38-
@After
38+
@AfterEach
3939
public void after() {
4040
if ( ssr != null ) {
4141
StandardServiceRegistryBuilder.destroy( ssr );
@@ -59,10 +59,10 @@ private void verifyPkNameUsed(String mappingResource, String... expectedName) {
5959
final JournalingSchemaToolingTarget target = new JournalingSchemaToolingTarget();
6060
new SchemaCreatorImpl( ssr ).doCreation( metadata, false, target );
6161

62-
assertTrue(
63-
"Expected foreign-key name [" + Arrays.toString(expectedName) + "] not seen in schema creation output",
64-
Arrays.stream( expectedName ).anyMatch( target::containedText )
65-
);
62+
assertThat( Arrays.stream( expectedName ).anyMatch( target::containedText ) )
63+
.describedAs( "Expected foreign-key name [" + Arrays.toString(
64+
expectedName ) + "] not seen in schema creation output" )
65+
.isTrue();
6666
}
6767

6868
@Test

‎hibernate-core/src/test/java/org/hibernate/orm/test/hbm/comment/ClassCommentTest.java‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,36 @@
44
*/
55
package org.hibernate.orm.test.hbm.comment;
66

7-
import java.io.StringReader;
8-
97
import org.hibernate.boot.Metadata;
108
import org.hibernate.boot.MetadataSources;
119
import org.hibernate.boot.registry.StandardServiceRegistry;
1210
import org.hibernate.dialect.H2Dialect;
1311
import org.hibernate.internal.util.ReaderInputStream;
1412
import org.hibernate.mapping.PersistentClass;
1513
import org.hibernate.mapping.Table;
16-
17-
import org.hibernate.testing.RequiresDialect;
18-
import org.hibernate.testing.junit4.BaseUnitTestCase;
14+
import org.hibernate.testing.orm.junit.BaseUnitTest;
15+
import org.hibernate.testing.orm.junit.RequiresDialect;
1916
import org.hibernate.testing.util.ServiceRegistryUtil;
20-
import org.junit.Assert;
21-
import org.junit.Test;
17+
import org.junit.jupiter.api.Test;
18+
19+
import java.io.StringReader;
20+
21+
import static org.assertj.core.api.Assertions.assertThat;
2222

23-
@RequiresDialect( H2Dialect.class )
24-
public class ClassCommentTest extends BaseUnitTestCase {
23+
@RequiresDialect(H2Dialect.class)
24+
@BaseUnitTest
25+
public class ClassCommentTest {
2526

26-
private static String CLASS_COMMENT_HBM_XML =
27-
"<hibernate-mapping package='org.hibernate.test.hbm'> "+
28-
" <class name='Foo' subselect='from foo'> "+
29-
" <comment>This is class 'Foo' with property 'bar'.</comment> "+
30-
" <id name='id' type='int'> "+
31-
" <generator class='sequence'/> "+
32-
" </id> "+
33-
" <property name='bar' type='string'/> "+
34-
" </class> "+
35-
"</hibernate-mapping> ";
27+
private static final String CLASS_COMMENT_HBM_XML =
28+
"<hibernate-mapping package='org.hibernate.test.hbm'> " +
29+
" <class name='Foo' subselect='from foo'> " +
30+
" <comment>This is class 'Foo' with property 'bar'.</comment> " +
31+
" <id name='id' type='int'> " +
32+
" <generator class='sequence'/> " +
33+
" </id> " +
34+
" <property name='bar' type='string'/> " +
35+
" </class> " +
36+
"</hibernate-mapping> ";
3637

3738
@Test
3839
public void testClassComment() {
@@ -41,10 +42,10 @@ public void testClassComment() {
4142
metadataSources.addInputStream( new ReaderInputStream( new StringReader( CLASS_COMMENT_HBM_XML ) ) );
4243
Metadata metadata = metadataSources.buildMetadata();
4344
PersistentClass pc = metadata.getEntityBinding( "org.hibernate.test.hbm.Foo" );
44-
Assert.assertNotNull( pc );
45+
assertThat( pc ).isNotNull();
4546
Table table = pc.getTable();
46-
Assert.assertNotNull( table );
47-
Assert.assertEquals( "This is class 'Foo' with property 'bar'.", table.getComment() );
47+
assertThat( table ).isNotNull();
48+
assertThat( table.getComment() ).isEqualTo( "This is class 'Foo' with property 'bar'." );
4849
}
4950
}
5051

‎hibernate-core/src/test/java/org/hibernate/orm/test/hbm/fk/CollectionKeyFkNameTest.java‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,39 +9,38 @@
99
import org.hibernate.boot.registry.StandardServiceRegistry;
1010
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
1111
import org.hibernate.engine.config.spi.ConfigurationService;
12-
import org.hibernate.tool.schema.internal.SchemaCreatorImpl;
13-
12+
import org.hibernate.orm.test.hbm.index.JournalingSchemaToolingTarget;
13+
import org.hibernate.testing.orm.junit.BaseUnitTest;
1414
import org.hibernate.testing.orm.junit.JiraKey;
15-
import org.hibernate.testing.junit4.BaseUnitTestCase;
1615
import org.hibernate.testing.util.ServiceRegistryUtil;
16+
import org.hibernate.tool.schema.internal.SchemaCreatorImpl;
17+
import org.junit.jupiter.api.AfterEach;
18+
import org.junit.jupiter.api.BeforeEach;
19+
import org.junit.jupiter.api.Test;
1720

18-
import org.hibernate.orm.test.hbm.index.JournalingSchemaToolingTarget;
19-
import org.junit.After;
20-
import org.junit.Before;
21-
import org.junit.Test;
22-
23-
import static org.junit.Assert.assertTrue;
21+
import static org.assertj.core.api.Assertions.assertThat;
2422

2523
/**
2624
* @author Steve Ebersole
2725
*/
28-
public class CollectionKeyFkNameTest extends BaseUnitTestCase {
26+
@BaseUnitTest
27+
public class CollectionKeyFkNameTest {
2928
private StandardServiceRegistry ssr;
3029

31-
@Before
30+
@BeforeEach
3231
public void before() {
3332
ssr = ServiceRegistryUtil.serviceRegistry();
3433
}
3534

36-
@After
35+
@AfterEach
3736
public void after() {
3837
if ( ssr != null ) {
3938
StandardServiceRegistryBuilder.destroy( ssr );
4039
}
4140
}
4241

4342
@Test
44-
@JiraKey( value = "HHH-10207" )
43+
@JiraKey(value = "HHH-10207")
4544
public void testExplicitFkNameOnCollectionKey() {
4645
verifyFkNameUsed(
4746
"org/hibernate/orm/test/hbm/fk/person_set.hbm.xml",
@@ -63,14 +62,13 @@ private void verifyFkNameUsed(String mappingResource, String expectedName) {
6362
target
6463
);
6564

66-
assertTrue(
67-
"Expected foreign-key name [" + expectedName + "] not seen in schema creation output",
68-
target.containedText( expectedName )
69-
);
65+
assertThat( target.containedText( expectedName ) )
66+
.describedAs( "Expected foreign-key name [" + expectedName + "] not seen in schema creation output" )
67+
.isTrue();
7068
}
7169

7270
@Test
73-
@JiraKey( value = "HHH-10207" )
71+
@JiraKey(value = "HHH-10207")
7472
public void testExplicitFkNameOnManyToOne() {
7573
verifyFkNameUsed(
7674
"org/hibernate/orm/test/hbm/fk/person_set.hbm.xml",

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

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,30 @@
88
import org.hibernate.boot.MetadataSources;
99
import org.hibernate.boot.registry.StandardServiceRegistry;
1010
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
11-
import org.hibernate.tool.schema.internal.SchemaCreatorImpl;
12-
11+
import org.hibernate.testing.orm.junit.BaseUnitTest;
1312
import org.hibernate.testing.orm.junit.JiraKey;
14-
import org.hibernate.testing.junit4.BaseUnitTestCase;
1513
import org.hibernate.testing.util.ServiceRegistryUtil;
16-
import org.junit.After;
17-
import org.junit.Before;
18-
import org.junit.Test;
14+
import org.hibernate.tool.schema.internal.SchemaCreatorImpl;
15+
import org.junit.jupiter.api.AfterEach;
16+
import org.junit.jupiter.api.BeforeEach;
17+
import org.junit.jupiter.api.Test;
1918

20-
import static org.junit.Assert.assertTrue;
19+
import static org.assertj.core.api.Assertions.assertThat;
2120

2221
/**
2322
* @author Steve Ebersole
2423
*/
25-
@JiraKey( value = "HHH-10208" )
26-
public class IndexTest extends BaseUnitTestCase {
24+
@JiraKey(value = "HHH-10208")
25+
@BaseUnitTest
26+
public class IndexTest {
2727
private StandardServiceRegistry ssr;
2828

29-
@Before
29+
@BeforeEach
3030
public void before() {
3131
ssr = ServiceRegistryUtil.serviceRegistry();
3232
}
3333

34-
@After
34+
@AfterEach
3535
public void after() {
3636
if ( ssr != null ) {
3737
StandardServiceRegistryBuilder.destroy( ssr );
@@ -55,10 +55,9 @@ private void verifyIndexCreated(String mappingResource, String expectedIndexName
5555
final JournalingSchemaToolingTarget target = new JournalingSchemaToolingTarget();
5656
new SchemaCreatorImpl( ssr ).doCreation( metadata, false, target );
5757

58-
assertTrue(
59-
"Expected index [" + expectedIndexName + "] not seen in schema creation output",
60-
target.containedText( expectedIndexName )
61-
);
58+
assertThat( target.containedText( expectedIndexName ) )
59+
.describedAs( "Expected index [" + expectedIndexName + "] not seen in schema creation output" )
60+
.isTrue();
6261
}
6362

6463
@Test

‎hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/NamedQueryTest.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,21 @@
1111
import org.hibernate.dialect.H2Dialect;
1212
import org.hibernate.internal.util.ReaderInputStream;
1313

14-
import org.hibernate.testing.RequiresDialect;
14+
import org.hibernate.testing.orm.junit.BaseUnitTest;
1515
import org.hibernate.testing.orm.junit.JiraKey;
16-
import org.hibernate.testing.junit4.BaseUnitTestCase;
16+
import org.hibernate.testing.orm.junit.RequiresDialect;
1717
import org.hibernate.testing.util.ServiceRegistryUtil;
18-
import org.junit.Test;
18+
import org.junit.jupiter.api.Test;
1919

2020
/**
2121
* @author Koen Aers
2222
*/
2323
@JiraKey( value = "HHH-10223" )
2424
@RequiresDialect( H2Dialect.class )
25-
public class NamedQueryTest extends BaseUnitTestCase {
25+
@BaseUnitTest
26+
public class NamedQueryTest {
2627

27-
private static String NAMED_QUERY_HBM_XML =
28+
private static final String NAMED_QUERY_HBM_XML =
2829
"<hibernate-mapping package='org.hibernate.orm.test.hbm.query'> "+
2930
" <class name='NamedQueryTest$Bar'> "+
3031
" <id name='id'> "+

0 commit comments

Comments
 (0)