Skip to content

Commit 3773367

Browse files
dreab8dreab8
committed
HHH-19846 Drop JUnit 4 usage
1 parent 3b1277b commit 3773367

File tree

5 files changed

+127
-131
lines changed

5 files changed

+127
-131
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/HHH14230.java‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,21 @@
44
*/
55
package org.hibernate.orm.test.foreignkeys;
66

7-
import static org.junit.Assert.assertEquals;
8-
import static org.junit.Assert.assertNotNull;
9-
import static org.junit.Assert.assertTrue;
10-
11-
import java.util.stream.StreamSupport;
12-
137
import jakarta.persistence.Entity;
148
import jakarta.persistence.Id;
159
import jakarta.persistence.JoinColumn;
1610
import jakarta.persistence.ManyToOne;
17-
1811
import org.hibernate.boot.Metadata;
1912
import org.hibernate.boot.MetadataSources;
2013
import org.hibernate.boot.registry.StandardServiceRegistry;
2114
import org.hibernate.mapping.Table;
2215
import org.hibernate.testing.orm.junit.JiraKey;
2316
import org.hibernate.testing.util.ServiceRegistryUtil;
24-
import org.junit.Test;
17+
import org.junit.jupiter.api.Test;
18+
19+
import java.util.stream.StreamSupport;
20+
21+
import static org.assertj.core.api.Assertions.assertThat;
2522

2623
/**
2724
* @author Yanming Zhou
@@ -40,11 +37,11 @@ public void test() {
4037
Table table = StreamSupport.stream( metadata.getDatabase().getNamespaces().spliterator(), false )
4138
.flatMap( namespace -> namespace.getTables().stream() )
4239
.filter( t -> t.getName().equals( TABLE_NAME ) ).findFirst().orElse( null );
43-
assertNotNull( table );
44-
assertEquals( 1, table.getForeignKeyCollection().size() );
40+
assertThat( table ).isNotNull();
41+
assertThat( table.getForeignKeyCollection() ).hasSize( 1 );
4542

4643
// ClassCastException before HHH-14230
47-
assertTrue( table.getForeignKeys().keySet().iterator().next().toString().contains( JOIN_COLUMN_NAME ) );
44+
assertThat( table.getForeignKeys().keySet().iterator().next().toString() ).contains( JOIN_COLUMN_NAME );
4845
}
4946
}
5047

‎hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/DefaultConstraintModeTest.java‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,6 @@
44
*/
55
package org.hibernate.orm.test.foreignkeys.disabled;
66

7-
import java.util.List;
8-
import java.util.stream.StreamSupport;
9-
10-
import org.hibernate.boot.Metadata;
11-
import org.hibernate.boot.MetadataSources;
12-
import org.hibernate.boot.registry.StandardServiceRegistry;
13-
import org.hibernate.cfg.Environment;
14-
import org.hibernate.mapping.Table;
15-
16-
import org.hibernate.testing.junit4.BaseUnitTestCase;
17-
import org.hibernate.testing.orm.junit.Jira;
18-
import org.hibernate.testing.util.ServiceRegistryUtil;
19-
import org.junit.Test;
20-
217
import jakarta.persistence.ElementCollection;
228
import jakarta.persistence.Entity;
239
import jakarta.persistence.Id;
@@ -27,16 +13,29 @@
2713
import jakarta.persistence.ManyToMany;
2814
import jakarta.persistence.ManyToOne;
2915
import jakarta.persistence.OneToMany;
16+
import org.hibernate.boot.Metadata;
17+
import org.hibernate.boot.MetadataSources;
18+
import org.hibernate.boot.registry.StandardServiceRegistry;
19+
import org.hibernate.cfg.Environment;
20+
import org.hibernate.mapping.Table;
21+
import org.hibernate.testing.orm.junit.BaseUnitTest;
22+
import org.hibernate.testing.orm.junit.Jira;
23+
import org.hibernate.testing.util.ServiceRegistryUtil;
24+
import org.junit.jupiter.api.Test;
25+
26+
import java.util.List;
27+
import java.util.stream.StreamSupport;
28+
29+
import static org.assertj.core.api.Assertions.assertThat;
3030

31-
import static org.hamcrest.core.Is.is;
32-
import static org.junit.Assert.assertThat;
3331

3432
/**
3533
* @author Yanming Zhou
3634
*/
37-
@Jira( "https://hibernate.atlassian.net/browse/HHH-14253" )
38-
@Jira( "https://hibernate.atlassian.net/browse/HHH-17550" )
39-
public class DefaultConstraintModeTest extends BaseUnitTestCase {
35+
@Jira("https://hibernate.atlassian.net/browse/HHH-14253")
36+
@Jira("https://hibernate.atlassian.net/browse/HHH-17550")
37+
@BaseUnitTest
38+
public class DefaultConstraintModeTest {
4039
@Test
4140
public void testForeignKeyShouldNotBeCreated() {
4241
testForeignKeyCreation( false );
@@ -51,9 +50,12 @@ private void testForeignKeyCreation(boolean created) {
5150
try (StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistryBuilder()
5251
.applySetting( Environment.HBM2DDL_DEFAULT_CONSTRAINT_MODE, created ? "CONSTRAINT" : "NO_CONSTRAINT" )
5352
.build()) {
54-
Metadata metadata = new MetadataSources( ssr ).addAnnotatedClasses( TestEntity.class, ChildEntity.class ).buildMetadata();
55-
assertThat( findTable( metadata, "TestEntity" ).getForeignKeyCollection().isEmpty(), is( !created ) );
56-
assertThat( findTable( metadata, "ChildEntity" ).getForeignKeyCollection().isEmpty(), is( !created ) );
53+
Metadata metadata = new MetadataSources( ssr ).addAnnotatedClasses( TestEntity.class, ChildEntity.class )
54+
.buildMetadata();
55+
assertThat( findTable( metadata, "TestEntity" ).getForeignKeyCollection().isEmpty() )
56+
.isEqualTo( !created );
57+
assertThat( findTable( metadata, "ChildEntity" ).getForeignKeyCollection().isEmpty() )
58+
.isEqualTo( !created );
5759
}
5860
}
5961

@@ -63,9 +65,9 @@ private static Table findTable(Metadata metadata, String tableName) {
6365
.findFirst().orElse( null );
6466
}
6567

66-
@Entity( name = "TestEntity" )
67-
@jakarta.persistence.Table( name = "TestEntity" )
68-
@Inheritance( strategy = InheritanceType.JOINED )
68+
@Entity(name = "TestEntity")
69+
@jakarta.persistence.Table(name = "TestEntity")
70+
@Inheritance(strategy = InheritanceType.JOINED)
6971
public static class TestEntity {
7072

7173
@Id
@@ -85,8 +87,8 @@ public static class TestEntity {
8587
private List<String> elements;
8688
}
8789

88-
@Entity( name = "ChildEntity" )
89-
@jakarta.persistence.Table( name = "ChildEntity" )
90+
@Entity(name = "ChildEntity")
91+
@jakarta.persistence.Table(name = "ChildEntity")
9092
public static class ChildEntity extends TestEntity {
9193
private String childName;
9294
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/DisabledForeignKeyTest.java‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,32 @@
44
*/
55
package org.hibernate.orm.test.foreignkeys.disabled;
66

7-
import java.util.EnumSet;
8-
97
import org.hibernate.boot.MetadataSources;
108
import org.hibernate.boot.registry.StandardServiceRegistry;
119
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
1210
import org.hibernate.boot.spi.MetadataImplementor;
1311
import org.hibernate.mapping.Table;
12+
import org.hibernate.testing.orm.junit.BaseUnitTest;
13+
import org.hibernate.testing.orm.junit.JiraKey;
14+
import org.hibernate.testing.util.ServiceRegistryUtil;
1415
import org.hibernate.tool.hbm2ddl.SchemaExport;
1516
import org.hibernate.tool.hbm2ddl.SchemaUpdate;
1617
import org.hibernate.tool.schema.TargetType;
18+
import org.junit.jupiter.api.Test;
1719

18-
import org.hibernate.testing.orm.junit.JiraKey;
19-
import org.hibernate.testing.junit4.BaseUnitTestCase;
20-
import org.hibernate.testing.util.ServiceRegistryUtil;
21-
import org.junit.Test;
20+
import java.util.EnumSet;
21+
22+
import static org.assertj.core.api.Assertions.assertThat;
2223

23-
import static org.junit.Assert.assertEquals;
24-
import static org.junit.Assert.assertFalse;
2524

2625
/**
2726
* @author Steve Ebersole
2827
*/
29-
public class DisabledForeignKeyTest extends BaseUnitTestCase {
28+
@BaseUnitTest
29+
public class DisabledForeignKeyTest {
3030

3131
@Test
32-
@JiraKey( value = "HHH-9704" )
32+
@JiraKey(value = "HHH-9704")
3333
public void basicTests() {
3434
StandardServiceRegistry standardRegistry = ServiceRegistryUtil.serviceRegistry();
3535
try {
@@ -51,25 +51,26 @@ public void basicTests() {
5151
int fkCount = 0;
5252
for ( Table table : metadata.collectTableMappings() ) {
5353
for ( var entry : table.getForeignKeys().entrySet() ) {
54-
assertFalse(
55-
"Creation for ForeignKey [" + entry.getKey() + "] was not disabled",
56-
entry.getValue().isCreationEnabled()
57-
);
54+
assertThat( entry.getValue().isCreationEnabled() )
55+
.describedAs( "Creation for ForeignKey [" + entry.getKey() + "] was not disabled" )
56+
.isFalse();
5857
fkCount++;
5958
}
6059
}
6160

6261
// ultimately I want to actually create the ForeignKet reference, but simply disable its creation
6362
// via ForeignKet#disableCreation()
64-
assertEquals( "Was expecting 4 FKs", 0, fkCount );
63+
assertThat( fkCount )
64+
.describedAs( "Was expecting 4 FKs" )
65+
.isEqualTo( 0 );
6566
}
6667
finally {
6768
StandardServiceRegistryBuilder.destroy( standardRegistry );
6869
}
6970
}
7071

7172
@Test
72-
@JiraKey( value = "HHH-9704" )
73+
@JiraKey(value = "HHH-9704")
7374
public void expandedTests() {
7475
StandardServiceRegistry standardRegistry = ServiceRegistryUtil.serviceRegistry();
7576
try {

‎hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/InheritanceManyToManyForeignKeyTest.java‎

Lines changed: 56 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
*/
55
package org.hibernate.orm.test.foreignkeys.disabled;
66

7-
import java.time.LocalDate;
8-
import java.util.ArrayList;
9-
import java.util.List;
107
import jakarta.persistence.Column;
118
import jakarta.persistence.Entity;
129
import jakarta.persistence.FetchType;
@@ -16,74 +13,72 @@
1613
import jakarta.persistence.InheritanceType;
1714
import jakarta.persistence.ManyToMany;
1815
import jakarta.persistence.MappedSuperclass;
19-
20-
import org.hibernate.Session;
21-
import org.hibernate.Transaction;
2216
import org.hibernate.dialect.SybaseDialect;
23-
24-
import org.hibernate.testing.SkipForDialect;
17+
import org.hibernate.testing.orm.junit.DomainModel;
2518
import org.hibernate.testing.orm.junit.JiraKey;
26-
import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
27-
import org.junit.Test;
19+
import org.hibernate.testing.orm.junit.SessionFactory;
20+
import org.hibernate.testing.orm.junit.SessionFactoryScope;
21+
import org.hibernate.testing.orm.junit.SkipForDialect;
22+
import org.junit.jupiter.api.Test;
2823

29-
import static org.junit.Assert.assertEquals;
24+
import java.time.LocalDate;
25+
import java.util.ArrayList;
26+
import java.util.List;
27+
28+
import static org.assertj.core.api.Assertions.assertThat;
3029

3130
/**
3231
* @author Vlad Mihalcea
3332
*/
3433
@JiraKey(value = "HHH-9306")
35-
public class InheritanceManyToManyForeignKeyTest extends BaseNonConfigCoreFunctionalTestCase {
36-
37-
@Override
38-
protected Class<?>[] getAnnotatedClasses() {
39-
return new Class[] {
40-
LocalDateEvent.class,
41-
UserEvents.class,
42-
ApplicationEvents.class
43-
};
44-
}
45-
46-
@Test
47-
@SkipForDialect(value = SybaseDialect.class, comment = "Only dates between January 1, 1753 and December 31, 9999 are accepted.")
48-
public void testForeignKeyNameUnicity() {
49-
Session session = openSession();
50-
Transaction transaction = session.beginTransaction();
51-
52-
LocalDateEvent event1 = new LocalDateEvent();
53-
event1.startDate = LocalDate.of(1, 1, 1);
54-
session.persist(event1);
55-
56-
LocalDateEvent event2 = new LocalDateEvent();
57-
event2.startDate = LocalDate.of(1, 1, 2);
58-
session.persist(event2);
34+
@DomainModel(
35+
annotatedClasses = {InheritanceManyToManyForeignKeyTest.LocalDateEvent.class,
36+
InheritanceManyToManyForeignKeyTest.UserEvents.class,
37+
InheritanceManyToManyForeignKeyTest.ApplicationEvents.class
5938

60-
LocalDateEvent event3 = new LocalDateEvent();
61-
event3.startDate = LocalDate.of(1, 1, 3);
62-
session.persist(event3);
39+
}
40+
)
41+
@SessionFactory
42+
public class InheritanceManyToManyForeignKeyTest {
6343

44+
@Test
45+
@SkipForDialect(dialectClass = SybaseDialect.class,
46+
reason = "Only dates between January 1, 1753 and December 31, 9999 are accepted.")
47+
public void testForeignKeyNameUnicity(SessionFactoryScope scope) {
6448
UserEvents userEvents = new UserEvents();
65-
session.persist( userEvents );
66-
userEvents.getEvents().add( event1 );
67-
session.flush();
68-
userEvents.getEvents().add( event2 );
69-
session.flush();
70-
71-
7249
ApplicationEvents applicationEvents = new ApplicationEvents();
73-
session.persist( applicationEvents );
74-
applicationEvents.getEvents().add( event3 );
75-
76-
transaction.commit();
77-
session.close();
78-
79-
session = openSession();
80-
transaction = session.beginTransaction();
81-
82-
assertEquals(2, session.get( UserEvents.class, userEvents.id ).getEvents().size());
83-
assertEquals(1, session.get( ApplicationEvents.class, applicationEvents.id ).getEvents().size());
84-
85-
transaction.commit();
86-
session.close();
50+
scope.inTransaction(
51+
session -> {
52+
LocalDateEvent event1 = new LocalDateEvent();
53+
event1.startDate = LocalDate.of( 1, 1, 1 );
54+
session.persist( event1 );
55+
56+
LocalDateEvent event2 = new LocalDateEvent();
57+
event2.startDate = LocalDate.of( 1, 1, 2 );
58+
session.persist( event2 );
59+
60+
LocalDateEvent event3 = new LocalDateEvent();
61+
event3.startDate = LocalDate.of( 1, 1, 3 );
62+
session.persist( event3 );
63+
64+
65+
session.persist( userEvents );
66+
userEvents.getEvents().add( event1 );
67+
session.flush();
68+
userEvents.getEvents().add( event2 );
69+
session.flush();
70+
71+
session.persist( applicationEvents );
72+
applicationEvents.getEvents().add( event3 );
73+
}
74+
);
75+
76+
scope.inTransaction(
77+
session -> {
78+
assertThat( session.get( UserEvents.class, userEvents.id ).getEvents() ).hasSize( 2 );
79+
assertThat( session.get( ApplicationEvents.class, applicationEvents.id ).getEvents() ).hasSize( 1 );
80+
}
81+
);
8782
}
8883

8984
@Entity(name = "LDE")
@@ -100,8 +95,8 @@ public static class LocalDateEvent {
10095
@MappedSuperclass
10196
public static abstract class AbstractEventsEntityModel {
10297

103-
@ManyToMany(fetch = FetchType.LAZY )
104-
private List<LocalDateEvent> events = new ArrayList<>( );
98+
@ManyToMany(fetch = FetchType.LAZY)
99+
private List<LocalDateEvent> events = new ArrayList<>();
105100

106101
public List<LocalDateEvent> getEvents() {
107102
return events;

0 commit comments

Comments
 (0)