Skip to content

Commit 00b1bfd

Browse files
jrenaatjrenaat
committed
HHH-19846 - Remove JUnit4: org.hibernate.orm.test.mapping.embeddable.*
Signed-off-by: Jan Schatteman <[email protected]>
1 parent 2cf5cc9 commit 00b1bfd

17 files changed

+516
-564
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableImplicitOverrideTest.java‎

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,39 @@
1515
import org.hibernate.boot.MetadataBuilder;
1616
import org.hibernate.boot.model.naming.ImplicitNamingStrategyComponentPathImpl;
1717

18-
import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
19-
import org.junit.Test;
20-
21-
import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
18+
import org.hibernate.cfg.MappingSettings;
19+
import org.hibernate.testing.orm.junit.DomainModel;
20+
import org.hibernate.testing.orm.junit.ServiceRegistry;
21+
import org.hibernate.testing.orm.junit.SessionFactory;
22+
import org.hibernate.testing.orm.junit.SessionFactoryScope;
23+
import org.hibernate.testing.orm.junit.SettingProvider;
24+
import org.junit.jupiter.api.Test;
2225

2326
/**
2427
* @author Vlad Mihalcea
2528
*/
26-
public class EmbeddableImplicitOverrideTest
27-
extends BaseNonConfigCoreFunctionalTestCase {
28-
29-
@Override
30-
protected Class<?>[] getAnnotatedClasses() {
31-
return new Class<?>[] {
32-
Book.class,
33-
Country.class
34-
};
29+
@DomainModel(
30+
annotatedClasses = {EmbeddableImplicitOverrideTest.Book.class, EmbeddableImplicitOverrideTest.Country.class}
31+
)
32+
@SessionFactory
33+
@ServiceRegistry(
34+
settingProviders = {
35+
@SettingProvider(
36+
settingName = MappingSettings.IMPLICIT_NAMING_STRATEGY,
37+
provider = EmbeddableImplicitOverrideTest.ImplicitNamingStrategySettingProvider.class)
38+
}
39+
)
40+
public class EmbeddableImplicitOverrideTest {
41+
42+
public static class ImplicitNamingStrategySettingProvider implements SettingProvider.Provider<ImplicitNamingStrategyComponentPathImpl> {
43+
@Override
44+
public ImplicitNamingStrategyComponentPathImpl getSetting() {
45+
return ImplicitNamingStrategyComponentPathImpl.INSTANCE;
46+
}
3547
}
3648

37-
@Override
38-
protected void initialize(MetadataBuilder metadataBuilder) {
39-
super.initialize(metadataBuilder);
49+
// Preserved because of the doc inclusion
50+
private void doesNothing(MetadataBuilder metadataBuilder) {
4051
//tag::embeddable-multiple-ImplicitNamingStrategyComponentPathImpl[]
4152
metadataBuilder.applyImplicitNamingStrategy(
4253
ImplicitNamingStrategyComponentPathImpl.INSTANCE
@@ -45,8 +56,8 @@ protected void initialize(MetadataBuilder metadataBuilder) {
4556
}
4657

4758
@Test
48-
public void testLifecycle() {
49-
doInHibernate(this::sessionFactory, session -> {
59+
public void testLifecycle(SessionFactoryScope scope) {
60+
scope.inTransaction( session -> {
5061
Country canada = new Country();
5162
canada.setName("Canada");
5263
session.persist(canada);
@@ -56,7 +67,7 @@ public void testLifecycle() {
5667
session.persist(usa);
5768
});
5869

59-
doInHibernate(this::sessionFactory, session -> {
70+
scope.inTransaction( session -> {
6071
Country canada = session.byNaturalId(Country.class).using("name", "Canada").load();
6172
Country usa = session.byNaturalId(Country.class).using("name", "USA").load();
6273

‎hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableOverrideTest.java‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,23 @@
1919

2020
import org.hibernate.Session;
2121
import org.hibernate.annotations.NaturalId;
22-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
2322

24-
import org.junit.Test;
25-
26-
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
23+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
24+
import org.hibernate.testing.orm.junit.Jpa;
25+
import org.junit.jupiter.api.Test;
2726

2827
/**
2928
* @author Vlad Mihalcea
3029
*/
31-
public class EmbeddableOverrideTest extends BaseEntityManagerFunctionalTestCase {
32-
33-
@Override
34-
protected Class<?>[] getAnnotatedClasses() {
35-
return new Class<?>[] {
36-
Book.class,
37-
Country.class
38-
};
39-
}
30+
@Jpa(annotatedClasses = {
31+
EmbeddableOverrideTest.Book.class,
32+
EmbeddableOverrideTest.Country.class
33+
})
34+
public class EmbeddableOverrideTest {
4035

4136
@Test
42-
public void testLifecycle() {
43-
doInJPA(this::entityManagerFactory, entityManager -> {
37+
public void testLifecycle(EntityManagerFactoryScope scope) {
38+
scope.inTransaction( entityManager -> {
4439
Country canada = new Country();
4540
canada.setName("Canada");
4641
entityManager.persist(canada);
@@ -50,7 +45,7 @@ public void testLifecycle() {
5045
entityManager.persist(usa);
5146
});
5247

53-
doInJPA(this::entityManagerFactory, entityManager -> {
48+
scope.inTransaction( entityManager -> {
5449
Session session = entityManager.unwrap(Session.class);
5550
Country canada = session.byNaturalId(Country.class).using("name", "Canada").load();
5651
Country usa = session.byNaturalId(Country.class).using("name", "USA").load();

‎hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/JsonEmbeddableArrayTest.java‎

Lines changed: 59 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@
1919
import java.util.UUID;
2020

2121
import org.hibernate.annotations.JdbcTypeCode;
22+
import org.hibernate.testing.orm.junit.DomainModel;
2223
import org.hibernate.testing.orm.junit.FailureExpected;
23-
import org.hibernate.type.SqlTypes;
24-
24+
import org.hibernate.testing.orm.junit.SessionFactory;
25+
import org.hibernate.testing.orm.junit.SessionFactoryScope;
2526
import org.hibernate.testing.orm.domain.gambit.EntityOfBasics;
2627
import org.hibernate.testing.orm.domain.gambit.MutableValue;
27-
import org.hibernate.testing.orm.junit.BaseSessionFactoryFunctionalTest;
2828
import org.hibernate.testing.orm.junit.DialectFeatureChecks;
2929
import org.hibernate.testing.orm.junit.RequiresDialectFeature;
30+
import org.hibernate.type.SqlTypes;
3031
import org.junit.jupiter.api.AfterEach;
3132
import org.junit.jupiter.api.BeforeEach;
3233
import org.junit.jupiter.api.Test;
@@ -39,18 +40,13 @@
3940
import static org.junit.jupiter.api.Assertions.assertNull;
4041

4142
@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsJsonAggregate.class)
42-
public class JsonEmbeddableArrayTest extends BaseSessionFactoryFunctionalTest {
43-
44-
@Override
45-
protected Class<?>[] getAnnotatedClasses() {
46-
return new Class<?>[] {
47-
JsonEmbeddableArrayTest.JsonArrayHolder.class
48-
};
49-
}
43+
@DomainModel(annotatedClasses = {JsonEmbeddableArrayTest.JsonArrayHolder.class})
44+
@SessionFactory
45+
public class JsonEmbeddableArrayTest {
5046

5147
@BeforeEach
52-
public void setUp() {
53-
inTransaction(
48+
public void setUp(SessionFactoryScope scope) {
49+
scope.inTransaction(
5450
session -> {
5551
session.persist( new JsonArrayHolder( 1L, EmbeddableAggregate.createAggregateArray1() ));
5652
session.persist( new JsonArrayHolder( 2L, EmbeddableAggregate.createAggregateArray2() ));
@@ -59,30 +55,30 @@ public void setUp() {
5955
}
6056

6157
@AfterEach
62-
protected void cleanupTest() {
63-
sessionFactoryScope().getSessionFactory().getSchemaManager().truncate();
58+
protected void cleanupTest(SessionFactoryScope scope) {
59+
scope.dropData();
6460
}
6561

6662
@Test
67-
public void testUpdate() {
68-
sessionFactoryScope().inTransaction(
69-
entityManager -> {
70-
JsonArrayHolder jsonArrayHolder = entityManager.find( JsonArrayHolder.class, 1L );
63+
public void testUpdate(SessionFactoryScope scope) {
64+
scope.inTransaction(
65+
session -> {
66+
JsonArrayHolder jsonArrayHolder = session.find( JsonArrayHolder.class, 1L );
7167
jsonArrayHolder.setAggregateArray( EmbeddableAggregate.createAggregateArray2() );
72-
entityManager.flush();
73-
entityManager.clear();
68+
session.flush();
69+
session.clear();
7470
EmbeddableAggregate.assertArraysEquals(
7571
EmbeddableAggregate.createAggregateArray2(),
76-
entityManager.find( JsonArrayHolder.class, 1L ).getAggregateArray() );
72+
session.find( JsonArrayHolder.class, 1L ).getAggregateArray() );
7773
}
7874
);
7975
}
8076

8177
@Test
82-
public void testFetch() {
83-
sessionFactoryScope().inSession(
84-
entityManager -> {
85-
List<JsonArrayHolder> jsonArrayHolders = entityManager.createQuery( "from JsonArrayHolder b where b.id = 1", JsonArrayHolder.class ).getResultList();
78+
public void testFetch(SessionFactoryScope scope) {
79+
scope.inSession(
80+
session -> {
81+
List<JsonArrayHolder> jsonArrayHolders = session.createQuery( "from JsonArrayHolder b where b.id = 1", JsonArrayHolder.class ).getResultList();
8682
assertEquals( 1, jsonArrayHolders.size() );
8783
assertEquals( 1L, jsonArrayHolders.get( 0 ).getId() );
8884
EmbeddableAggregate.assertArraysEquals( EmbeddableAggregate.createAggregateArray1(), jsonArrayHolders.get( 0 ).getAggregateArray() );
@@ -91,10 +87,10 @@ public void testFetch() {
9187
}
9288

9389
@Test
94-
public void testFetchNull() {
95-
sessionFactoryScope().inSession(
96-
entityManager -> {
97-
List<JsonArrayHolder> jsonArrayHolders = entityManager.createQuery( "from JsonArrayHolder b where b.id = 2", JsonArrayHolder.class ).getResultList();
90+
public void testFetchNull(SessionFactoryScope scope) {
91+
scope.inSession(
92+
session -> {
93+
List<JsonArrayHolder> jsonArrayHolders = session.createQuery( "from JsonArrayHolder b where b.id = 2", JsonArrayHolder.class ).getResultList();
9894
assertEquals( 1, jsonArrayHolders.size() );
9995
assertEquals( 2L, jsonArrayHolders.get( 0 ).getId() );
10096
EmbeddableAggregate.assertEquals( EmbeddableAggregate.createAggregateArray2()[0], jsonArrayHolders.get( 0 ).getAggregateArray()[0] );
@@ -103,10 +99,10 @@ public void testFetchNull() {
10399
}
104100

105101
@Test
106-
public void testDomainResult() {
107-
sessionFactoryScope().inSession(
108-
entityManager -> {
109-
List<EmbeddableAggregate[]> structs = entityManager.createQuery( "select b.aggregateArray from JsonArrayHolder b where b.id = 1", EmbeddableAggregate[].class ).getResultList();
102+
public void testDomainResult(SessionFactoryScope scope) {
103+
scope.inSession(
104+
session -> {
105+
List<EmbeddableAggregate[]> structs = session.createQuery( "select b.aggregateArray from JsonArrayHolder b where b.id = 1", EmbeddableAggregate[].class ).getResultList();
110106
assertEquals( 1, structs.size() );
111107
EmbeddableAggregate.assertArraysEquals( EmbeddableAggregate.createAggregateArray1(), structs.get( 0 ) );
112108
}
@@ -115,10 +111,10 @@ public void testDomainResult() {
115111

116112
@Test
117113
@FailureExpected(jiraKey = "HHH-18717", reason = "Requires array functions to work with JSON_ARRAY")
118-
public void testSelectionItems() {
119-
sessionFactoryScope().inSession(
120-
entityManager -> {
121-
List<Tuple> tuples = entityManager.createQuery(
114+
public void testSelectionItems(SessionFactoryScope scope) {
115+
scope.inSession(
116+
session -> {
117+
List<Tuple> tuples = session.createQuery(
122118
"select " +
123119
"b.aggregateArray[0].theInt," +
124120
"b.aggregateArray[0].theDouble," +
@@ -182,60 +178,60 @@ public void testSelectionItems() {
182178
}
183179

184180
@Test
185-
public void testDeleteWhere() {
186-
sessionFactoryScope().inTransaction(
187-
entityManager -> {
188-
entityManager.createMutationQuery( "delete JsonArrayHolder b where b.aggregateArray is not null" ).executeUpdate();
189-
assertNull( entityManager.find( JsonArrayHolder.class, 1L ) );
181+
public void testDeleteWhere(SessionFactoryScope scope) {
182+
scope.inTransaction(
183+
session -> {
184+
session.createMutationQuery( "delete JsonArrayHolder b where b.aggregateArray is not null" ).executeUpdate();
185+
assertNull( session.find( JsonArrayHolder.class, 1L ) );
190186

191187
}
192188
);
193189
}
194190

195191
@Test
196-
public void testUpdateAggregate() {
197-
sessionFactoryScope().inTransaction(
198-
entityManager -> {
199-
entityManager.createMutationQuery( "update JsonArrayHolder b set b.aggregateArray = null" ).executeUpdate();
200-
assertNull( entityManager.find( JsonArrayHolder.class, 1L ).getAggregateArray() );
192+
public void testUpdateAggregate(SessionFactoryScope scope) {
193+
scope.inTransaction(
194+
session -> {
195+
session.createMutationQuery( "update JsonArrayHolder b set b.aggregateArray = null" ).executeUpdate();
196+
assertNull( session.find( JsonArrayHolder.class, 1L ).getAggregateArray() );
201197
}
202198
);
203199
}
204200

205201
@Test
206202
@FailureExpected(jiraKey = "HHH-18717", reason = "Requires array functions to work with JSON_ARRAY")
207-
public void testUpdateAggregateMember() {
208-
sessionFactoryScope().inTransaction(
209-
entityManager -> {
210-
entityManager.createMutationQuery( "update JsonArrayHolder b set b.aggregateArray[0].theString = null where b.id = 1" ).executeUpdate();
203+
public void testUpdateAggregateMember(SessionFactoryScope scope) {
204+
scope.inTransaction(
205+
session -> {
206+
session.createMutationQuery( "update JsonArrayHolder b set b.aggregateArray[0].theString = null where b.id = 1" ).executeUpdate();
211207
EmbeddableAggregate[] struct = EmbeddableAggregate.createAggregateArray1();
212208
struct[0].setTheString( null );
213-
EmbeddableAggregate.assertArraysEquals( struct, entityManager.find( JsonArrayHolder.class, 1L ).getAggregateArray() );
209+
EmbeddableAggregate.assertArraysEquals( struct, session.find( JsonArrayHolder.class, 1L ).getAggregateArray() );
214210
}
215211
);
216212
}
217213

218214
@Test
219215
@FailureExpected(jiraKey = "HHH-18717", reason = "Requires array functions to work with JSON_ARRAY")
220-
public void testUpdateMultipleAggregateMembers() {
221-
sessionFactoryScope().inTransaction(
222-
entityManager -> {
223-
entityManager.createMutationQuery( "update JsonArrayHolder b set b.aggregateArray.theString = null, b.aggregateArray[0].theUuid = null" ).executeUpdate();
216+
public void testUpdateMultipleAggregateMembers(SessionFactoryScope scope) {
217+
scope.inTransaction(
218+
session -> {
219+
session.createMutationQuery( "update JsonArrayHolder b set b.aggregateArray.theString = null, b.aggregateArray[0].theUuid = null" ).executeUpdate();
224220
EmbeddableAggregate[] struct = EmbeddableAggregate.createAggregateArray1();
225221
struct[0].setTheString( null );
226222
struct[0].setTheUuid( null );
227-
EmbeddableAggregate.assertArraysEquals( struct, entityManager.find( JsonArrayHolder.class, 1L ).getAggregateArray() );
223+
EmbeddableAggregate.assertArraysEquals( struct, session.find( JsonArrayHolder.class, 1L ).getAggregateArray() );
228224
}
229225
);
230226
}
231227

232228
@Test
233229
@FailureExpected(jiraKey = "HHH-18717", reason = "Requires array functions to work with JSON_ARRAY")
234-
public void testUpdateAllAggregateMembers() {
235-
sessionFactoryScope().inTransaction(
236-
entityManager -> {
230+
public void testUpdateAllAggregateMembers(SessionFactoryScope scope) {
231+
scope.inTransaction(
232+
session -> {
237233
EmbeddableAggregate[] struct = EmbeddableAggregate.createAggregateArray1();
238-
entityManager.createMutationQuery(
234+
session.createMutationQuery(
239235
"update JsonArrayHolder b set " +
240236
"b.aggregateArray[0].theInt = :theInt," +
241237
"b.aggregateArray[0].theDouble = :theDouble," +
@@ -290,7 +286,7 @@ public void testUpdateAllAggregateMembers() {
290286
.setParameter( "theOffsetDateTime", struct[0].getTheOffsetDateTime() )
291287
.setParameter( "mutableValue", struct[0].getMutableValue() )
292288
.executeUpdate();
293-
EmbeddableAggregate.assertArraysEquals( EmbeddableAggregate.createAggregateArray1(), entityManager.find( JsonArrayHolder.class, 2L ).getAggregateArray() );
289+
EmbeddableAggregate.assertArraysEquals( EmbeddableAggregate.createAggregateArray1(), session.find( JsonArrayHolder.class, 2L ).getAggregateArray() );
294290
}
295291
);
296292
}

0 commit comments

Comments
 (0)