Skip to content

Commit 1afa149

Browse files
sebersolesebersole
committed
HHH-19846 - Drop JUnit 4 usage
Not converted... * org.hibernate.orm.test.hql.PostgreSQLFunctionSelectClauseTest - registering custom function * org.hibernate.orm.test.hql.PostgreSQLFunctionWhereClauseTest - aux-db-object * org.hibernate.orm.test.id.usertype - type registrations * org.hibernate.orm.test.idgen.enhanced.HiloOptimizerConcurrencyTest - recreation of SF during tests * org.hibernate.orm.test.type.AbstractJavaTimeTypeTest subtypes - crazy parameterization (see org.hibernate.orm.test.tm.InterceptorTransactionTest)
1 parent 68bc095 commit 1afa149

File tree

5 files changed

+252
-306
lines changed

5 files changed

+252
-306
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/subselect/CompositeIdTypeBindingTest.java‎

Lines changed: 47 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -4,81 +4,67 @@
44
*/
55
package org.hibernate.orm.test.subselect;
66

7+
import org.hibernate.testing.orm.junit.DomainModel;
8+
import org.hibernate.testing.orm.junit.JiraKey;
9+
import org.hibernate.testing.orm.junit.SessionFactory;
10+
import org.hibernate.testing.orm.junit.SessionFactoryScope;
11+
import org.junit.jupiter.api.AfterEach;
12+
import org.junit.jupiter.api.BeforeEach;
13+
import org.junit.jupiter.api.Test;
14+
715
import java.util.ArrayList;
816
import java.util.List;
917

10-
import org.hibernate.Session;
11-
import org.hibernate.testing.orm.junit.JiraKey;
12-
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
13-
import org.junit.Assert;
14-
import org.junit.Test;
18+
import static org.junit.jupiter.api.Assertions.assertEquals;
19+
import static org.junit.jupiter.api.Assertions.assertNotNull;
1520

1621
/**
1722
* @author Strong Liu
1823
*/
19-
@JiraKey( value = "HHH-8312")
20-
public class CompositeIdTypeBindingTest extends BaseCoreFunctionalTestCase {
21-
@Override
22-
protected Class<?>[] getAnnotatedClasses() {
23-
return new Class[] { Employee.class, EmployeeGroup.class };
24-
}
25-
26-
@Test
27-
public void testCompositeTypeBinding() {
28-
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
29-
// prepare test data
30-
Session session = openSession();
31-
session.beginTransaction();
24+
@SuppressWarnings("JUnitMalformedDeclaration")
25+
@JiraKey("HHH-8312")
26+
@DomainModel(annotatedClasses = { Employee.class, EmployeeGroup.class })
27+
@SessionFactory
28+
public class CompositeIdTypeBindingTest {
3229

33-
EmployeeGroup employeegroup = new EmployeeGroup( new EmployeeGroupId( "a", "b" ) );
34-
employeegroup.addEmployee( new Employee( "stliu" ) );
35-
employeegroup.addEmployee( new Employee( "david" ) );
36-
session.persist( employeegroup );
30+
@BeforeEach
31+
public void createTestData(SessionFactoryScope factoryScope) {
32+
factoryScope.inTransaction( (session) -> {
33+
var employeegroup = new EmployeeGroup( new EmployeeGroupId( "a", "b" ) );
34+
employeegroup.addEmployee( new Employee( "stliu" ) );
35+
employeegroup.addEmployee( new Employee( "david" ) );
36+
session.persist( employeegroup );
3737

38-
employeegroup = new EmployeeGroup( new EmployeeGroupId( "c", "d" ) );
39-
employeegroup.addEmployee( new Employee( "gail" ) );
40-
employeegroup.addEmployee( new Employee( "steve" ) );
41-
session.persist( employeegroup );
42-
43-
session.getTransaction().commit();
44-
session.close();
45-
46-
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
47-
// Perform the test
48-
session = openSession();
49-
session.beginTransaction();
50-
51-
List<EmployeeGroupId> parameters = new ArrayList<EmployeeGroupId>();
52-
parameters.add( new EmployeeGroupId( "a", "b" ) );
53-
parameters.add( new EmployeeGroupId( "c", "d" ) );
54-
parameters.add( new EmployeeGroupId( "e", "f" ) );
38+
employeegroup = new EmployeeGroup( new EmployeeGroupId( "c", "d" ) );
39+
employeegroup.addEmployee( new Employee( "gail" ) );
40+
employeegroup.addEmployee( new Employee( "steve" ) );
41+
session.persist( employeegroup );
42+
});
43+
}
5544

56-
List result = session.createQuery( "select eg from EmployeeGroup eg where eg.id in (:employeegroupIds)" )
57-
.setParameterList( "employeegroupIds", parameters ).list();
45+
@AfterEach
46+
void tearDown(SessionFactoryScope factoryScope) {
47+
factoryScope.dropData();
48+
}
5849

59-
Assert.assertEquals( 2, result.size() );
50+
@Test
51+
public void testCompositeTypeBinding(SessionFactoryScope factoryScope) {
52+
factoryScope.inTransaction( (session) -> {
53+
List<EmployeeGroupId> parameters = new ArrayList<>();
54+
parameters.add( new EmployeeGroupId( "a", "b" ) );
55+
parameters.add( new EmployeeGroupId( "c", "d" ) );
56+
parameters.add( new EmployeeGroupId( "e", "f" ) );
6057

61-
employeegroup = (EmployeeGroup) result.get( 0 );
58+
List<EmployeeGroup> result = session.createQuery( "select eg from EmployeeGroup eg where eg.id in (:employeegroupIds)", EmployeeGroup.class )
59+
.setParameterList( "employeegroupIds", parameters ).list();
6260

63-
Assert.assertEquals( "a", employeegroup.getId().getGroupName() );
64-
Assert.assertNotNull( employeegroup.getEmployees() );
65-
Assert.assertEquals( 2, employeegroup.getEmployees().size() );
66-
session.getTransaction().commit();
67-
session.close();
61+
assertEquals( 2, result.size() );
6862

63+
var employeegroup = result.get( 0 );
6964

70-
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
71-
// clean up test data
72-
session = openSession();
73-
session.beginTransaction();
74-
List<EmployeeGroup> egs = session.createQuery( "from EmployeeGroup" ).list();
75-
for ( EmployeeGroup eg : egs ) {
76-
eg.getEmployees().clear();
77-
}
78-
session.flush();
79-
session.createQuery( "delete from EmployeeGroup" ).executeUpdate();
80-
session.createQuery( "delete from Employee" ).executeUpdate();
81-
session.getTransaction().commit();
82-
session.close();
65+
assertEquals( "a", employeegroup.getId().getGroupName() );
66+
assertNotNull( employeegroup.getEmployees() );
67+
assertEquals( 2, employeegroup.getEmployees().size() );
68+
} );
8369
}
8470
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SetSubselectTest.java‎

Lines changed: 22 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -4,79 +4,52 @@
44
*/
55
package org.hibernate.orm.test.subselect;
66

7-
import org.hibernate.Session;
8-
import org.hibernate.resource.transaction.spi.TransactionStatus;
9-
10-
import org.junit.Test;
11-
12-
import org.hibernate.testing.orm.junit.JiraKey;
13-
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
7+
import org.hibernate.testing.orm.junit.DomainModel;
8+
import org.hibernate.testing.orm.junit.SessionFactory;
9+
import org.hibernate.testing.orm.junit.SessionFactoryScope;
10+
import org.junit.jupiter.api.AfterEach;
11+
import org.junit.jupiter.api.Test;
1412

13+
import static org.hamcrest.MatcherAssert.assertThat;
1514
import static org.hamcrest.core.Is.is;
16-
import static org.junit.Assert.assertThat;
17-
import static org.junit.Assert.fail;
1815

1916
/**
2017
* @author Andrea Boriero
2118
*/
22-
@JiraKey(value = "")
23-
public class SetSubselectTest extends BaseCoreFunctionalTestCase {
24-
25-
@Override
26-
protected String getBaseForMappings() {
27-
return "org/hibernate/orm/test/";
28-
}
29-
30-
@Override
31-
public String[] getMappings() {
32-
return new String[] {"subselect/Book.hbm.xml"};
19+
@SuppressWarnings("JUnitMalformedDeclaration")
20+
@DomainModel(xmlMappings = "org/hibernate/orm/test/subselect/Book.hbm.xml")
21+
@SessionFactory
22+
public class SetSubselectTest {
23+
@AfterEach
24+
void tearDown(SessionFactoryScope factoryScope) {
25+
factoryScope.dropData();
3326
}
3427

3528
@Test
36-
public void testSubselect() {
37-
Session s = openSession();
38-
39-
s.getTransaction().begin();
40-
try {
29+
public void testSubselect(SessionFactoryScope factoryScope) {
30+
factoryScope.inTransaction( session -> {
4131
Author b = new Author();
4232
b.setName( "Camilleri" );
4333
b.setId( 1 );
44-
45-
s.persist( b );
34+
session.persist( b );
4635

4736
Book book = new Book();
4837
book.setId( 2 );
4938
book.setAuthorId( 1 );
5039
book.setTitle( "Il sognaglio" );
51-
s.persist( book );
40+
session.persist( book );
5241

5342
Book book2 = new Book();
5443
book2.setId( 3 );
5544
book2.setAuthorId( 1 );
5645
book2.setTitle( "Il casellante" );
46+
session.persist( book2 );
47+
} );
5748

58-
s.persist( book2 );
59-
60-
s.getTransaction().commit();
61-
}
62-
catch (Exception e) {
63-
if ( s.getTransaction().getStatus() == TransactionStatus.ACTIVE ) {
64-
s.getTransaction().rollback();
65-
}
66-
fail( e.getMessage() );
67-
}
68-
finally {
69-
s.close();
70-
}
71-
72-
s = openSession();
73-
try {
74-
Author author = s.get( Author.class, 1 );
49+
factoryScope.inTransaction( session -> {
50+
Author author = session.find( Author.class, 1 );
7551
assertThat( author.getBooks().size(), is( 2 ) );
76-
}
77-
finally {
78-
s.close();
79-
}
52+
} );
8053
}
8154

8255
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SubselectAndSingleAttributeIdClassTest.java‎

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
import org.hibernate.testing.orm.junit.JiraKey;
1616
import org.hibernate.testing.orm.junit.SessionFactory;
1717
import org.hibernate.testing.orm.junit.SessionFactoryScope;
18-
import org.junit.jupiter.api.BeforeAll;
18+
import org.junit.jupiter.api.AfterEach;
19+
import org.junit.jupiter.api.BeforeEach;
1920
import org.junit.jupiter.api.Test;
2021

2122
import jakarta.persistence.Column;
@@ -32,6 +33,7 @@
3233
import static org.junit.jupiter.api.Assertions.assertNotNull;
3334

3435

36+
@SuppressWarnings("JUnitMalformedDeclaration")
3537
@DomainModel(
3638
annotatedClasses = {
3739
SubselectAndSingleAttributeIdClassTest.MyEntity.class,
@@ -43,40 +45,40 @@
4345
@JiraKey( "HHH-17221" )
4446
public class SubselectAndSingleAttributeIdClassTest {
4547

46-
@BeforeAll
48+
@BeforeEach
4749
public void setUp(SessionFactoryScope scope) {
48-
scope.inTransaction(
49-
session -> {
50-
MyEntity entity = new MyEntity( 1, List.of(
51-
new MyChild( 11, List.of( new MyGrandchild( 111 ), new MyGrandchild( 112 ) ) ),
52-
new MyChild( 12, List.of( new MyGrandchild( 121 ), new MyGrandchild( 122 ) ) )
53-
) );
54-
session.persist( entity );
55-
entity.getChildren().forEach( c -> {
56-
session.persist( c );
57-
c.getGrandchildren().forEach( session::persist );
58-
} );
50+
scope.inTransaction(session -> {
51+
MyEntity entity = new MyEntity( 1, List.of(
52+
new MyChild( 11, List.of( new MyGrandchild( 111 ), new MyGrandchild( 112 ) ) ),
53+
new MyChild( 12, List.of( new MyGrandchild( 121 ), new MyGrandchild( 122 ) ) )
54+
) );
55+
session.persist( entity );
56+
entity.getChildren().forEach( c -> {
57+
session.persist( c );
58+
c.getGrandchildren().forEach( session::persist );
59+
} );
60+
} );
61+
}
5962

60-
}
61-
);
63+
@AfterEach
64+
void tearDown(SessionFactoryScope factoryScope) {
65+
factoryScope.dropData();
6266
}
6367

6468
@Test
6569
public void testSelect(SessionFactoryScope scope) {
66-
scope.inTransaction(
67-
session -> {
68-
TypedQuery<MyEntity> query = session.createQuery(
69-
"select e from MyEntity e where id = 1",
70-
MyEntity.class
71-
);
72-
for ( MyEntity entity : query.getResultList() ) {
73-
assertNotNull( entity.getChildren(), "Children are null" );
74-
for ( MyChild child : entity.getChildren() ) {
75-
assertFalse( child.getGrandchildren().isEmpty(), "GRANDCHILDRENDS are empty" );
76-
}
77-
}
70+
scope.inTransaction(session -> {
71+
TypedQuery<MyEntity> query = session.createQuery(
72+
"select e from MyEntity e where id = 1",
73+
MyEntity.class
74+
);
75+
for ( MyEntity entity : query.getResultList() ) {
76+
assertNotNull( entity.getChildren(), "Children are null" );
77+
for ( MyChild child : entity.getChildren() ) {
78+
assertFalse( child.getGrandchildren().isEmpty(), "GRANDCHILDRENDS are empty" );
7879
}
79-
);
80+
}
81+
} );
8082
}
8183

8284

0 commit comments

Comments
 (0)