Skip to content

Commit 7470134

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) * org.hibernate.orm.test.cdi.general.hibernatesearch.extended.HibernateSearchExtendedCdiSupportTest - not sure yet, all the other tests here pass with conversion - shelved for now
1 parent 618d27d commit 7470134

29 files changed

+1029
-1208
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/locking/AbstractSkipLockedTest.java‎

Lines changed: 0 additions & 239 deletions
This file was deleted.

‎hibernate-core/src/test/java/org/hibernate/orm/test/locking/CompositeIdBatchDeletionTest.java‎

Lines changed: 48 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import static jakarta.persistence.FetchType.LAZY;
3535
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
3636

37+
@SuppressWarnings("JUnitMalformedDeclaration")
3738
@DomainModel(
3839
annotatedClasses = {
3940
CompositeIdBatchDeletionTest.Operator.class,
@@ -55,85 +56,69 @@ public class CompositeIdBatchDeletionTest {
5556

5657
@BeforeEach
5758
public void setUp(SessionFactoryScope scope) {
58-
scope.inTransaction(
59-
session -> {
60-
Operator operator = new Operator( OPERATOR_ID );
61-
Operator operator2 = new Operator( OPERATOR_ID_2 );
62-
Product product = new Product( PRODUCT_ID, operator, "test" );
63-
Product product2 = new Product( PRODUCT_ID_2, operator, "test 2" );
64-
session.persist( operator );
65-
session.persist( operator2 );
66-
session.persist( product );
67-
session.persist( product2 );
68-
69-
}
70-
);
59+
scope.inTransaction(session -> {
60+
var operator = new Operator( OPERATOR_ID );
61+
var operator2 = new Operator( OPERATOR_ID_2 );
62+
var product = new Product( PRODUCT_ID, operator, "test" );
63+
var product2 = new Product( PRODUCT_ID_2, operator, "test 2" );
64+
session.persist( operator );
65+
session.persist( operator2 );
66+
session.persist( product );
67+
session.persist( product2 );
68+
69+
} );
7170
}
7271

7372
@AfterEach
7473
public void tearDown(SessionFactoryScope scope) {
75-
scope.getSessionFactory().getSchemaManager().truncate();
74+
scope.dropData();
7675
}
7776

7877
@Test
7978
public void testDelete(SessionFactoryScope scope) {
80-
ProductPK productPK = new ProductPK( PRODUCT_ID, OPERATOR_ID );
81-
scope.inTransaction(
82-
session -> {
83-
Product product = session.find( Product.class, productPK );
84-
session.remove( product );
85-
}
86-
);
87-
88-
scope.inTransaction(
89-
session -> {
90-
Product product = session.find( Product.class, productPK );
91-
assertThat( product ).isNull();
92-
}
93-
);
79+
var productPK = new ProductPK( PRODUCT_ID, OPERATOR_ID );
80+
scope.inTransaction(session -> {
81+
var product = session.find( Product.class, productPK );
82+
session.remove( product );
83+
} );
84+
85+
scope.inTransaction(session -> {
86+
Product product = session.find( Product.class, productPK );
87+
assertThat( product ).isNull();
88+
} );
9489
}
9590

9691
@Test
9792
public void testUpdate(SessionFactoryScope scope) {
98-
ProductPK productPK = new ProductPK( PRODUCT_ID, OPERATOR_ID );
99-
100-
String newDescription = "new description";
101-
102-
scope.inTransaction(
103-
session -> {
104-
Product product = session.find( Product.class, productPK );
105-
product.setDescription( newDescription );
106-
}
107-
);
108-
109-
scope.inTransaction(
110-
session -> {
111-
Product product = session.find( Product.class, productPK );
112-
assertThat( product ).isNotNull();
113-
assertThat( product.getDescription() ).isEqualTo( newDescription );
114-
}
115-
);
93+
var productPK = new ProductPK( PRODUCT_ID, OPERATOR_ID );
94+
var newDescription = "new description";
95+
96+
scope.inTransaction( session -> {
97+
var product = session.find( Product.class, productPK );
98+
product.setDescription( newDescription );
99+
} );
100+
101+
scope.inTransaction( session -> {
102+
var product = session.find( Product.class, productPK );
103+
assertThat( product ).isNotNull();
104+
assertThat( product.getDescription() ).isEqualTo( newDescription );
105+
} );
116106
}
117107

118108
@Test
119109
public void testDelete2(SessionFactoryScope scope) {
120-
121-
ProductPK productPK = new ProductPK( PRODUCT_ID, OPERATOR_ID );
122-
ProductPK productPK2 = new ProductPK( PRODUCT_ID_2, OPERATOR_ID_2 );
123-
scope.inTransaction(
124-
session -> {
125-
session.getReference( Product.class, productPK2 );
126-
Product product = session.find( Product.class, productPK );
127-
session.remove( product );
128-
}
129-
);
130-
131-
scope.inTransaction(
132-
session -> {
133-
Product product = session.find( Product.class, productPK );
134-
assertThat( product ).isNull();
135-
}
136-
);
110+
var productPK = new ProductPK( PRODUCT_ID, OPERATOR_ID );
111+
var productPK2 = new ProductPK( PRODUCT_ID_2, OPERATOR_ID_2 );
112+
scope.inTransaction( session -> {
113+
session.getReference( Product.class, productPK2 );
114+
var product = session.find( Product.class, productPK );
115+
session.remove( product );
116+
} );
117+
118+
scope.inTransaction(session -> {
119+
Product product = session.find( Product.class, productPK );
120+
assertThat( product ).isNull();
121+
} );
137122
}
138123

139124
@IdClass(ProductPK.class)

0 commit comments

Comments
 (0)