Skip to content

Commit 1099aef

Browse files
dreab8dreab8
committed
HHH-19846 Drop JUnit 4 usage
1 parent 26efb90 commit 1099aef

File tree

7 files changed

+284
-283
lines changed

7 files changed

+284
-283
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
public class InheritanceManyToManyForeignKeyTest {
4343

4444
@Test
45-
@SkipForDialect(dialectClass = SybaseDialect.class,
45+
@SkipForDialect(dialectClass = SybaseDialect.class, matchSubTypes = true,
4646
reason = "Only dates between January 1, 1753 and December 31, 9999 are accepted.")
4747
public void testForeignKeyNameUnicity(SessionFactoryScope scope) {
4848
UserEvents userEvents = new UserEvents();
@@ -120,6 +120,5 @@ public static class ApplicationEvents extends AbstractEventsEntityModel {
120120
@Id
121121
@GeneratedValue
122122
private Long id;
123-
124123
}
125124
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WithClauseJoinRewriteTest.java‎

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

7-
import org.hibernate.Session;
8-
import org.hibernate.Transaction;
7+
import org.hibernate.testing.orm.junit.DomainModel;
98
import org.hibernate.testing.orm.junit.JiraKey;
10-
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
11-
import org.junit.Test;
129

1310
import jakarta.persistence.Column;
1411
import jakarta.persistence.Entity;
@@ -21,6 +18,10 @@
2118
import jakarta.persistence.MappedSuperclass;
2219
import jakarta.persistence.Table;
2320
import jakarta.persistence.Version;
21+
import org.hibernate.testing.orm.junit.SessionFactory;
22+
import org.hibernate.testing.orm.junit.SessionFactoryScope;
23+
import org.junit.jupiter.api.Test;
24+
2425
import java.util.HashSet;
2526
import java.util.List;
2627
import java.util.Set;
@@ -30,36 +31,34 @@
3031
*
3132
* @author Steve Ebersole
3233
*/
33-
public class WithClauseJoinRewriteTest extends BaseCoreFunctionalTestCase {
34-
35-
@Override
36-
protected Class[] getAnnotatedClasses() {
37-
return new Class[]{
38-
AbstractObject.class,
39-
AbstractConfigurationObject.class,
40-
ConfigurationObject.class
41-
};
42-
}
34+
@DomainModel(
35+
annotatedClasses = {
36+
WithClauseJoinRewriteTest.AbstractObject.class,
37+
WithClauseJoinRewriteTest.AbstractConfigurationObject.class,
38+
WithClauseJoinRewriteTest.ConfigurationObject.class
39+
}
40+
)
41+
@SessionFactory
42+
public class WithClauseJoinRewriteTest {
4343

4444
@Test
4545
@JiraKey(value = "HHH-11230")
46-
public void testInheritanceReAliasing() {
47-
Session s = openSession();
48-
Transaction tx = s.beginTransaction();
49-
50-
// Just assert that the query is successful
51-
List<Object[]> results = s.createQuery(
52-
"SELECT usedBy.id, usedBy.name, COUNT(inverse.id) " +
53-
"FROM " + AbstractConfigurationObject.class.getName() + " config " +
54-
"INNER JOIN config.usedBy usedBy " +
55-
"LEFT JOIN usedBy.uses inverse ON inverse.id = config.id " +
56-
"WHERE config.id = 0 " +
57-
"GROUP BY usedBy.id, usedBy.name",
58-
Object[].class
59-
).getResultList();
60-
61-
tx.commit();
62-
s.close();
46+
public void testInheritanceReAliasing(SessionFactoryScope scope) {
47+
scope.inTransaction(
48+
session -> {
49+
50+
// Just assert that the query is successful
51+
List<Object[]> results = session.createQuery(
52+
"SELECT usedBy.id, usedBy.name, COUNT(inverse.id) " +
53+
"FROM " + AbstractConfigurationObject.class.getName() + " config " +
54+
"INNER JOIN config.usedBy usedBy " +
55+
"LEFT JOIN usedBy.uses inverse ON inverse.id = config.id " +
56+
"WHERE config.id = 0 " +
57+
"GROUP BY usedBy.id, usedBy.name",
58+
Object[].class
59+
).getResultList();
60+
}
61+
);
6362
}
6463

6564
@Entity

‎hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntitiesWithPackageNamesStartingWithKeywordsTest.java‎

Lines changed: 47 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -6,121 +6,72 @@
66

77
import from.In;
88
import in.from.Any;
9-
10-
import org.hibernate.Session;
119
import org.hibernate.query.Query;
12-
import org.hibernate.resource.transaction.spi.TransactionStatus;
13-
14-
import org.junit.Test;
15-
10+
import org.hibernate.testing.orm.junit.DomainModel;
1611
import org.hibernate.testing.orm.junit.JiraKey;
17-
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
12+
import org.hibernate.testing.orm.junit.SessionFactory;
13+
import org.hibernate.testing.orm.junit.SessionFactoryScope;
14+
import org.junit.jupiter.api.AfterEach;
15+
import org.junit.jupiter.api.Test;
1816

1917
/**
2018
* @author Andrea Boriero
2119
*/
2220
@JiraKey(value = "HHH-10953")
23-
public class UpdateEntitiesWithPackageNamesStartingWithKeywordsTest extends BaseCoreFunctionalTestCase {
24-
@Override
25-
protected Class<?>[] getAnnotatedClasses() {
26-
return new Class[] {Any.class, In.class};
21+
@DomainModel(
22+
annotatedClasses = {
23+
Any.class, In.class
24+
}
25+
)
26+
@SessionFactory
27+
public class UpdateEntitiesWithPackageNamesStartingWithKeywordsTest {
28+
29+
30+
@AfterEach
31+
public void tearDown(SessionFactoryScope scope) {
32+
scope.getSessionFactory().getSchemaManager().truncateMappedObjects();
2733
}
2834

2935
@Test
30-
public void testUpdateEntityWithPackageNameStartingWithIn() {
36+
public void testUpdateEntityWithPackageNameStartingWithIn(SessionFactoryScope scope) {
3137
Any entity = new Any();
3238
entity.setProp( "1" );
33-
try (Session session = openSession()) {
3439

35-
session.getTransaction().begin();
36-
try {
37-
session.persist( entity );
38-
session.getTransaction().commit();
39-
}
40-
catch (Exception e) {
41-
if ( session.getTransaction().getStatus() == TransactionStatus.ACTIVE ) {
42-
session.getTransaction().rollback();
43-
}
44-
throw e;
45-
}
46-
}
47-
try (Session session = openSession()) {
48-
session.getTransaction().begin();
49-
try {
50-
final Query query = session.createQuery( "UPDATE Any set prop = :prop WHERE id = :id " );
51-
query.setParameter( "prop", "1" );
52-
query.setParameter( "id", entity.getId() );
53-
query.executeUpdate();
54-
session.getTransaction().commit();
55-
}
56-
catch (Exception e) {
57-
if ( session.getTransaction().getStatus() == TransactionStatus.ACTIVE ) {
58-
session.getTransaction().rollback();
59-
}
60-
throw e;
61-
}
62-
}
63-
try (Session session = openSession()) {
64-
session.getTransaction().begin();
65-
try {
66-
session.createQuery( "DELETE FROM Any" ).executeUpdate();
67-
session.getTransaction().commit();
68-
}
69-
catch (Exception e) {
70-
if ( session.getTransaction().getStatus() == TransactionStatus.ACTIVE ) {
71-
session.getTransaction().rollback();
40+
scope.inTransaction(
41+
session -> session.persist( entity )
42+
);
43+
44+
scope.inTransaction(
45+
session -> {
46+
final Query query = session.createQuery( "UPDATE Any set prop = :prop WHERE id = :id " );
47+
query.setParameter( "prop", "1" );
48+
query.setParameter( "id", entity.getId() );
49+
query.executeUpdate();
7250
}
73-
throw e;
74-
}
75-
}
51+
);
52+
scope.inTransaction(
53+
session -> session.createQuery( "DELETE FROM Any" ).executeUpdate()
54+
);
7655
}
7756

7857
@Test
79-
public void testUpdateEntityWithPackageNameStartingWithFrom() {
58+
public void testUpdateEntityWithPackageNameStartingWithFrom(SessionFactoryScope scope) {
8059
In entity = new In();
8160
entity.setProp( "1" );
82-
try (Session session = openSession()) {
83-
84-
session.getTransaction().begin();
85-
try {
86-
session.persist( entity );
87-
session.getTransaction().commit();
88-
}
89-
catch (Exception e) {
90-
if ( session.getTransaction().getStatus() == TransactionStatus.ACTIVE ) {
91-
session.getTransaction().rollback();
92-
}
93-
throw e;
94-
}
95-
}
96-
try (Session session = openSession()) {
97-
session.getTransaction().begin();
98-
try {
99-
final Query query = session.createQuery( "UPDATE In set prop = :prop WHERE id = :id " );
100-
query.setParameter( "prop", "1" );
101-
query.setParameter( "id", entity.getId() );
102-
query.executeUpdate();
103-
session.getTransaction().commit();
104-
}
105-
catch (Exception e) {
106-
if ( session.getTransaction().getStatus() == TransactionStatus.ACTIVE ) {
107-
session.getTransaction().rollback();
61+
scope.inTransaction(
62+
session -> session.persist( entity )
63+
);
64+
scope.inTransaction(
65+
session -> {
66+
final Query query = session.createQuery( "UPDATE In set prop = :prop WHERE id = :id " );
67+
query.setParameter( "prop", "1" );
68+
query.setParameter( "id", entity.getId() );
69+
query.executeUpdate();
10870
}
109-
throw e;
110-
}
111-
}
112-
try (Session session = openSession()) {
113-
session.getTransaction().begin();
114-
try {
115-
session.createQuery( "DELETE FROM In" ).executeUpdate();
116-
session.getTransaction().commit();
117-
}
118-
catch (Exception e) {
119-
if ( session.getTransaction().getStatus() == TransactionStatus.ACTIVE ) {
120-
session.getTransaction().rollback();
121-
}
122-
throw e;
123-
}
124-
}
71+
);
72+
73+
scope.inTransaction(
74+
session -> session.createQuery( "DELETE FROM In" ).executeUpdate()
75+
);
12576
}
12677
}

0 commit comments

Comments
 (0)