Skip to content

Commit 2ab6ccf

Browse files
ettavoltettavolt
committed
BaseEntityManagerFunctionalTestCase instead of org.hibernate.testing.orm.junit.Jpa: Jupiter engine is not configured.
1 parent adcc54f commit 2ab6ccf

File tree

2 files changed

+53
-58
lines changed

2 files changed

+53
-58
lines changed

‎hibernate-core/src/test/java/org/hibernate/jpa/test/query/CriteriaUpdateWithParametersTest.java

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
package org.hibernate.jpa.test.query;
22

3-
import org.hibernate.testing.TestForIssue;
4-
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
5-
import org.hibernate.testing.orm.junit.Jpa;
6-
import org.junit.jupiter.api.Test;
7-
83
import javax.persistence.Entity;
94
import javax.persistence.Id;
105
import javax.persistence.Query;
@@ -14,15 +9,25 @@
149
import javax.persistence.criteria.Root;
1510
import javax.persistence.metamodel.EntityType;
1611

17-
@Jpa(
18-
annotatedClasses = CriteriaUpdateWithParametersTest.Person.class
19-
)
12+
import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
13+
14+
import org.hibernate.testing.TestForIssue;
15+
import org.hibernate.testing.transaction.TransactionUtil;
16+
import org.junit.Test;
17+
2018
@TestForIssue( jiraKey = "HHH-15113")
21-
public class CriteriaUpdateWithParametersTest {
19+
public class CriteriaUpdateWithParametersTest extends BaseEntityManagerFunctionalTestCase {
20+
21+
@Override
22+
protected Class<?>[] getAnnotatedClasses() {
23+
return new Class[] {
24+
Person.class
25+
};
26+
}
2227

2328
@Test
24-
public void testCriteriaUpdate(EntityManagerFactoryScope scope) {
25-
scope.inTransaction(
29+
public void testCriteriaUpdate() {
30+
TransactionUtil.doInJPA( this::entityManagerFactory,
2631
entityManager -> {
2732
final CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
2833
final CriteriaUpdate<Person> criteriaUpdate = criteriaBuilder.createCriteriaUpdate( Person.class );
@@ -50,8 +55,8 @@ public void testCriteriaUpdate(EntityManagerFactoryScope scope) {
5055
}
5156

5257
@Test
53-
public void testCriteriaUpdate2(EntityManagerFactoryScope scope) {
54-
scope.inTransaction(
58+
public void testCriteriaUpdate2() {
59+
TransactionUtil.doInJPA( this::entityManagerFactory,
5560
entityManager -> {
5661
final CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
5762
final CriteriaUpdate<Person> criteriaUpdate = criteriaBuilder.createCriteriaUpdate( Person.class );

‎hibernate-core/src/test/java/org/hibernate/jpa/test/transaction/batch/FailingAddToBatchTest.java

Lines changed: 35 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,15 @@
66
*/
77
package org.hibernate.jpa.test.transaction.batch;
88

9-
import static org.assertj.core.api.Assertions.assertThatThrownBy;
10-
import static org.hamcrest.MatcherAssert.assertThat;
11-
import static org.hamcrest.core.Is.is;
12-
import static org.junit.jupiter.api.Assertions.fail;
13-
149
import java.sql.PreparedStatement;
1510
import java.sql.SQLException;
1611
import java.util.ArrayList;
1712
import java.util.List;
13+
import java.util.Map;
1814
import java.util.concurrent.atomic.AtomicReference;
15+
import javax.persistence.Entity;
16+
import javax.persistence.GeneratedValue;
17+
import javax.persistence.Id;
1918

2019
import org.hibernate.cfg.AvailableSettings;
2120
import org.hibernate.engine.jdbc.batch.internal.BatchBuilderImpl;
@@ -24,48 +23,46 @@
2423
import org.hibernate.engine.jdbc.batch.spi.Batch;
2524
import org.hibernate.engine.jdbc.batch.spi.BatchKey;
2625
import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
26+
import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
2727

2828
import org.hibernate.testing.TestForIssue;
29-
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
30-
import org.hibernate.testing.orm.junit.Jpa;
31-
import org.hibernate.testing.orm.junit.Setting;
32-
import org.hibernate.testing.orm.junit.SettingProvider;
33-
import org.junit.jupiter.api.BeforeEach;
34-
import org.junit.jupiter.api.Test;
29+
import org.junit.Before;
30+
import org.junit.Test;
3531

36-
import javax.persistence.Entity;
37-
import javax.persistence.GeneratedValue;
38-
import javax.persistence.Id;
32+
import static org.assertj.core.api.Assertions.assertThatThrownBy;
33+
import static org.hamcrest.MatcherAssert.assertThat;
34+
import static org.hamcrest.core.Is.is;
35+
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
36+
import static org.junit.jupiter.api.Assertions.fail;
3937

4038
@TestForIssue(jiraKey = "HHH-15082")
41-
@Jpa(
42-
annotatedClasses = {
43-
FailingAddToBatchTest.MyEntity.class
44-
},
45-
integrationSettings = {
46-
@Setting(name = AvailableSettings.STATEMENT_BATCH_SIZE, value = "50")
47-
},
48-
settingProviders = {
49-
@SettingProvider(
50-
settingName = BatchBuilderInitiator.BUILDER,
51-
provider = FailingAddToBatchTest.BatchBuilderSettingProvider.class
52-
)
53-
}
54-
)
55-
public class FailingAddToBatchTest {
39+
public class FailingAddToBatchTest extends BaseEntityManagerFunctionalTestCase {
5640

5741
private static TestBatch testBatch;
5842

59-
@BeforeEach
43+
@Override
44+
protected void addConfigOptions(Map options) {
45+
options.put( AvailableSettings.STATEMENT_BATCH_SIZE, 50 );
46+
options.put( BatchBuilderInitiator.BUILDER, TestBatchBuilder.class.getName() );
47+
}
48+
49+
@Override
50+
protected Class<?>[] getAnnotatedClasses() {
51+
return new Class[] {
52+
MyEntity.class
53+
};
54+
}
55+
56+
@Before
6057
public void setup() {
6158
TestBatch.nextAddToBatchFailure.set( null );
6259
}
6360

6461
@Test
65-
public void testInsert(EntityManagerFactoryScope scope) {
62+
public void testInsert() {
6663
RuntimeException simulatedAddToBatchFailure = new RuntimeException( "Simulated RuntimeException" );
6764

68-
scope.inTransaction( em -> {
65+
doInJPA( this::entityManagerFactory, em -> {
6966
assertThatThrownBy( () -> {
7067
MyEntity entity = new MyEntity();
7168
entity.setText( "initial" );
@@ -80,8 +77,8 @@ public void testInsert(EntityManagerFactoryScope scope) {
8077
}
8178

8279
@Test
83-
public void testUpdate(EntityManagerFactoryScope scope) {
84-
Long id = scope.fromTransaction( em -> {
80+
public void testUpdate() {
81+
Long id = doInJPA( this::entityManagerFactory, em -> {
8582
MyEntity entity = new MyEntity();
8683
entity.setText( "initial" );
8784
em.persist( entity );
@@ -90,7 +87,7 @@ public void testUpdate(EntityManagerFactoryScope scope) {
9087

9188
RuntimeException simulatedAddToBatchFailure = new RuntimeException( "Simulated RuntimeException" );
9289

93-
scope.inTransaction( em -> {
90+
doInJPA( this::entityManagerFactory, em -> {
9491
assertThatThrownBy( () -> {
9592
MyEntity entity = em.find( MyEntity.class, id );
9693
TestBatch.nextAddToBatchFailure.set( simulatedAddToBatchFailure );
@@ -104,8 +101,8 @@ public void testUpdate(EntityManagerFactoryScope scope) {
104101
}
105102

106103
@Test
107-
public void testRemove(EntityManagerFactoryScope scope) {
108-
Long id = scope.fromTransaction( em -> {
104+
public void testRemove() {
105+
Long id = doInJPA( this::entityManagerFactory, em -> {
109106
MyEntity entity = new MyEntity();
110107
entity.setText( "initial" );
111108
em.persist( entity );
@@ -114,7 +111,7 @@ public void testRemove(EntityManagerFactoryScope scope) {
114111

115112
RuntimeException simulatedAddToBatchFailure = new RuntimeException( "Simulated RuntimeException" );
116113

117-
scope.inTransaction( em -> {
114+
doInJPA( this::entityManagerFactory, em -> {
118115
assertThatThrownBy( () -> {
119116
MyEntity entity = em.find( MyEntity.class, id );
120117
TestBatch.nextAddToBatchFailure.set( simulatedAddToBatchFailure );
@@ -162,13 +159,6 @@ public void setText(String text) {
162159
}
163160
}
164161

165-
public static class BatchBuilderSettingProvider implements SettingProvider.Provider<String> {
166-
@Override
167-
public String getSetting() {
168-
return TestBatchBuilder.class.getName();
169-
}
170-
}
171-
172162
public static class TestBatch extends BatchingBatch {
173163
private static final AtomicReference<RuntimeException> nextAddToBatchFailure = new AtomicReference<>();
174164

0 commit comments

Comments
 (0)