Skip to content

Commit 7f4c320

Browse files
dreab8dreab8
committed
HHH-19846 Drop JUnit 4 usage
1 parent 4dd3899 commit 7f4c320

File tree

5 files changed

+138
-161
lines changed

5 files changed

+138
-161
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/comments/UseSqlCommentTest.java‎

Lines changed: 28 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,45 +4,41 @@
44
*/
55
package org.hibernate.orm.test.comments;
66

7-
import java.util.List;
8-
import java.util.Map;
97
import jakarta.persistence.EntityManager;
108
import jakarta.persistence.TypedQuery;
119
import jakarta.persistence.criteria.CompoundSelection;
1210
import jakarta.persistence.criteria.CriteriaBuilder;
1311
import jakarta.persistence.criteria.CriteriaQuery;
1412
import jakarta.persistence.criteria.Path;
1513
import jakarta.persistence.criteria.Root;
16-
1714
import org.hibernate.cfg.AvailableSettings;
18-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
15+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
16+
import org.hibernate.testing.orm.junit.Jpa;
17+
import org.hibernate.testing.orm.junit.Setting;
18+
import org.junit.jupiter.api.BeforeAll;
19+
import org.junit.jupiter.api.Test;
1920

20-
import org.junit.Before;
21-
import org.junit.Test;
21+
import java.util.List;
2222

23-
import static org.hamcrest.CoreMatchers.is;
24-
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
25-
import static org.junit.Assert.assertThat;
23+
import static org.assertj.core.api.Assertions.assertThat;
2624

2725
/**
2826
* @author Andrea Boriero
2927
*/
30-
public class UseSqlCommentTest extends BaseEntityManagerFunctionalTestCase {
31-
32-
@Override
33-
protected Class<?>[] getAnnotatedClasses() {
34-
return new Class[] { TestEntity.class, TestEntity2.class };
35-
}
36-
37-
@Override
38-
protected void addMappings(Map settings) {
39-
settings.put( AvailableSettings.USE_SQL_COMMENTS, "true" );
40-
settings.put( AvailableSettings.FORMAT_SQL, "false" );
41-
}
42-
43-
@Before
44-
public void setUp() {
45-
doInJPA( this::entityManagerFactory, entityManager -> {
28+
@Jpa(
29+
annotatedClasses = {
30+
TestEntity.class, TestEntity2.class
31+
},
32+
properties = {
33+
@Setting(name = AvailableSettings.USE_SQL_COMMENTS, value = "true"),
34+
@Setting(name = AvailableSettings.FORMAT_SQL, value = "false"),
35+
}
36+
)
37+
public class UseSqlCommentTest {
38+
39+
@BeforeAll
40+
public void setUp(EntityManagerFactoryScope scope) {
41+
scope.inTransaction( entityManager -> {
4642
TestEntity testEntity = new TestEntity();
4743
testEntity.setId( "test1" );
4844
testEntity.setValue( "value1" );
@@ -56,22 +52,22 @@ public void setUp() {
5652
}
5753

5854
@Test
59-
public void testIt() {
55+
public void testIt(EntityManagerFactoryScope scope) {
6056
String appendLiteral = "*/select id as col_0_0_,value as col_1_0_ from testEntity2 where 1=1 or id=?--/*";
61-
doInJPA( this::entityManagerFactory, entityManager -> {
57+
scope.inTransaction( entityManager -> {
6258

6359
List<TestEntity> result = findUsingQuery( "test1", appendLiteral, entityManager );
6460

6561
TestEntity test1 = result.get( 0 );
66-
assertThat( test1.getValue(), is( appendLiteral ) );
62+
assertThat( test1.getValue() ).isEqualTo( appendLiteral );
6763
} );
6864

69-
doInJPA( this::entityManagerFactory, entityManager -> {
65+
scope.inTransaction( entityManager -> {
7066

7167
List<TestEntity> result = findUsingCriteria( "test1", appendLiteral, entityManager );
7268

7369
TestEntity test1 = result.get( 0 );
74-
assertThat( test1.getValue(), is( appendLiteral ) );
70+
assertThat( test1.getValue() ).isEqualTo( appendLiteral );
7571
} );
7672
}
7773

@@ -99,8 +95,8 @@ public List<TestEntity> findUsingQuery(String id, String appendLiteral, EntityMa
9995
TypedQuery<TestEntity> query =
10096
entityManager.createQuery(
10197
"select new " + TestEntity.class.getName() + "(id, '"
102-
+ appendLiteral.replace( "'", "''" )
103-
+ "') from TestEntity where id=:where_id",
98+
+ appendLiteral.replace( "'", "''" )
99+
+ "') from TestEntity where id=:where_id",
104100
TestEntity.class
105101
);
106102
query.setParameter( "where_id", id );

‎hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/CascadeToComponentCollectionTest.java‎

Lines changed: 66 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -4,114 +4,103 @@
44
*/
55
package org.hibernate.orm.test.component.cascading.collection;
66

7-
import java.util.Locale;
8-
9-
import org.junit.Test;
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.Test;
1011

11-
import org.hibernate.Session;
12-
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
12+
import java.util.Locale;
1313

14-
import static org.junit.Assert.assertEquals;
14+
import static org.assertj.core.api.Assertions.assertThat;
1515

1616
/**
1717
* @author Steve Ebersole
1818
*/
19-
public class CascadeToComponentCollectionTest extends BaseCoreFunctionalTestCase {
20-
21-
@Override
22-
protected String getBaseForMappings() {
23-
return "org/hibernate/orm/test/";
24-
}
25-
26-
@Override
27-
public String[] getMappings() {
28-
return new String[] { "component/cascading/collection/Mappings.hbm.xml" };
29-
}
19+
@DomainModel(
20+
xmlMappings = "org/hibernate/orm/test/component/cascading/collection/Mappings.hbm.xml"
21+
)
22+
@SessionFactory
23+
public class CascadeToComponentCollectionTest {
3024

3125
@Test
32-
public void testMerging() {
26+
public void testMerging(SessionFactoryScope scope) {
3327
// step1, we create a definition with one value
34-
Session session = openSession();
35-
session.beginTransaction();
36-
Definition definition = new Definition();
37-
Value value1 = new Value( definition );
38-
value1.getLocalizedStrings().addString( new Locale( "en_US" ), "hello" );
39-
session.persist( definition );
40-
session.getTransaction().commit();
41-
session.close();
28+
Definition d = new Definition();
29+
30+
scope.inTransaction( session -> {
31+
Value value1 = new Value( d );
32+
value1.getLocalizedStrings().addString( new Locale( "en_US" ), "hello" );
33+
session.persist( d );
34+
}
35+
);
4236

4337
// step2, we verify that the definition has one value; then we detach it
44-
session = openSession();
45-
session.beginTransaction();
46-
definition = ( Definition ) session.get( Definition.class, definition.getId() );
47-
assertEquals( 1, definition.getValues().size() );
48-
session.getTransaction().commit();
49-
session.close();
38+
Definition def = scope.fromTransaction( session -> {
39+
Definition definition = session.find( Definition.class, d.getId() );
40+
assertThat( definition.getValues() ).hasSize( 1 );
41+
return definition;
42+
}
43+
);
5044

5145
// step3, we add a new value during detachment
52-
Value value2 = new Value( definition );
46+
Value value2 = new Value( def );
5347
value2.getLocalizedStrings().addString( new Locale( "es" ), "hola" );
5448

5549
// step4 we merge the definition
56-
session = openSession();
57-
session.beginTransaction();
58-
session.merge( definition );
59-
session.getTransaction().commit();
60-
session.close();
50+
scope.inTransaction( session ->
51+
session.merge( def )
52+
);
6153

6254
// step5, final test
63-
session = openSession();
64-
session.beginTransaction();
65-
definition = ( Definition ) session.get( Definition.class, definition.getId() );
66-
assertEquals( 2, definition.getValues().size() );
67-
for ( Object o : definition.getValues() ) {
68-
assertEquals( 1, ((Value) o).getLocalizedStrings().getStringsCopy().size() );
69-
}
70-
session.getTransaction().commit();
71-
session.close();
55+
scope.inTransaction( session -> {
56+
Definition definition = session.find( Definition.class, d.getId() );
57+
assertThat( definition.getValues() ).hasSize( 2 );
58+
for ( Value o : definition.getValues() ) {
59+
assertThat( o.getLocalizedStrings().getStringsCopy() ).hasSize( 1 );
60+
}
61+
}
62+
);
7263
}
7364

7465
@SuppressWarnings("unused")
7566
@Test
76-
public void testMergingOriginallyNullComponent() {
67+
public void testMergingOriginallyNullComponent(SessionFactoryScope scope) {
7768
// step1, we create a definition with one value, but with a null component
78-
Session session = openSession();
79-
session.beginTransaction();
80-
Definition definition = new Definition();
81-
Value value1 = new Value( definition );
82-
session.persist( definition );
83-
session.getTransaction().commit();
84-
session.close();
69+
Definition d = new Definition();
70+
scope.inTransaction( session -> {
71+
Value value1 = new Value( d );
72+
session.persist( d );
73+
}
74+
);
8575

8676
// step2, we verify that the definition has one value; then we detach it
87-
session = openSession();
88-
session.beginTransaction();
89-
definition = ( Definition ) session.get( Definition.class, definition.getId() );
90-
assertEquals( 1, definition.getValues().size() );
91-
session.getTransaction().commit();
92-
session.close();
77+
Definition def = scope.fromTransaction( session -> {
78+
Definition definition = session.find( Definition.class, d.getId() );
79+
assertThat( definition.getValues() ).hasSize( 1 );
80+
return definition;
81+
}
82+
);
9383

9484
// step3, we add a new value during detachment
95-
( ( Value ) definition.getValues().iterator().next() ).getLocalizedStrings().addString( new Locale( "en_US" ), "hello" );
96-
Value value2 = new Value( definition );
85+
def.getValues().iterator().next().getLocalizedStrings()
86+
.addString( new Locale( "en_US" ), "hello" );
87+
Value value2 = new Value( def );
9788
value2.getLocalizedStrings().addString( new Locale( "es" ), "hola" );
9889

9990
// step4 we merge the definition
100-
session = openSession();
101-
session.beginTransaction();
102-
session.merge( definition );
103-
session.getTransaction().commit();
104-
session.close();
91+
scope.inTransaction( session ->
92+
session.merge( def )
93+
);
10594

10695
// step5, final test
107-
session = openSession();
108-
session.beginTransaction();
109-
definition = ( Definition ) session.get( Definition.class, definition.getId() );
110-
assertEquals( 2, definition.getValues().size() );
111-
for ( Object o : definition.getValues() ) {
112-
assertEquals( 1, ((Value) o).getLocalizedStrings().getStringsCopy().size() );
113-
}
114-
session.getTransaction().commit();
115-
session.close();
96+
scope.inTransaction(
97+
session -> {
98+
Definition definition = session.find( Definition.class, def.getId() );
99+
assertThat( definition.getValues().size() ).isEqualTo( 2 );
100+
for ( Value o : definition.getValues() ) {
101+
assertThat( o.getLocalizedStrings().getStringsCopy() ).hasSize( 1 );
102+
}
103+
}
104+
);
116105
}
117106
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/Definition.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Copyright Red Hat Inc. and Hibernate Authors
44
*/
55
package org.hibernate.orm.test.component.cascading.collection;
6+
67
import java.util.HashSet;
78
import java.util.Set;
89

@@ -13,7 +14,7 @@
1314
*/
1415
public class Definition {
1516
private Long id;
16-
private Set values = new HashSet();
17+
private Set<Value> values = new HashSet<>();
1718

1819
public Long getId() {
1920
return id;
@@ -23,11 +24,11 @@ public void setId(Long id) {
2324
this.id = id;
2425
}
2526

26-
public Set getValues() {
27+
public Set<Value> getValues() {
2728
return values;
2829
}
2930

30-
public void setValues(Set values) {
31+
public void setValues(Set<Value> values) {
3132
this.values = values;
3233
}
3334
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/LocalizedStrings.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Copyright Red Hat Inc. and Hibernate Authors
44
*/
55
package org.hibernate.orm.test.component.cascading.collection;
6+
67
import java.util.HashMap;
78
import java.util.Locale;
89
import java.util.Map;
@@ -13,7 +14,7 @@
1314
* @author Steve Ebersole
1415
*/
1516
public class LocalizedStrings {
16-
private Map strings = new HashMap();
17+
private Map<Locale,String> strings = new HashMap<>();
1718

1819
public void addString(Locale locale, String value) {
1920
strings.put( locale, value );
@@ -23,7 +24,7 @@ public String getString(Locale locale) {
2324
return ( String ) strings.get( locale );
2425
}
2526

26-
public Map getStringsCopy() {
27+
public Map<Locale,String> getStringsCopy() {
2728
return java.util.Collections.unmodifiableMap( strings );
2829
}
2930
}

0 commit comments

Comments
 (0)