Skip to content

Commit c3b6616

Browse files
mbelladembellade
committed
HHH-19871 --wip-- Envers migration to JUnit 6
- `org.hibernate.orm.test.envers.integration.components`
1 parent 6907124 commit c3b6616

18 files changed

+1381
-1395
lines changed

‎hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestEntity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ public boolean equals(Object o) {
6262

6363
StrTestEntity that = (StrTestEntity) o;
6464

65-
if ( id != null ? !id.equals( that.id ) : that.id != null ) {
65+
if ( id != null ? !id.equals( that.getId() ) : that.getId() != null ) {
6666
return false;
6767
}
68-
if ( str != null ? !str.equals( that.str ) : that.str != null ) {
68+
if ( str != null ? !str.equals( that.getStr() ) : that.getStr() != null ) {
6969
return false;
7070
}
7171

‎hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/Components.java‎

Lines changed: 108 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -5,163 +5,162 @@
55
package org.hibernate.orm.test.envers.integration.components;
66

77
import java.util.Arrays;
8-
import jakarta.persistence.EntityManager;
98

10-
import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase;
11-
import org.hibernate.orm.test.envers.Priority;
9+
import org.hibernate.envers.AuditReaderFactory;
1210
import org.hibernate.orm.test.envers.entities.components.Component1;
1311
import org.hibernate.orm.test.envers.entities.components.Component2;
1412
import org.hibernate.orm.test.envers.entities.components.ComponentTestEntity;
13+
import org.hibernate.testing.envers.junit.EnversTest;
14+
import org.hibernate.testing.orm.junit.BeforeClassTemplate;
15+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
16+
import org.hibernate.testing.orm.junit.Jpa;
17+
import org.junit.jupiter.api.Test;
1518

16-
import org.junit.Test;
19+
import static org.junit.jupiter.api.Assertions.assertEquals;
20+
import static org.junit.jupiter.api.Assertions.assertNull;
1721

1822
/**
1923
* @author Adam Warski (adam at warski dot org)
2024
*/
21-
public class Components extends BaseEnversJPAFunctionalTestCase {
25+
@EnversTest
26+
@Jpa(annotatedClasses = {ComponentTestEntity.class})
27+
public class Components {
2228
private Integer id1;
2329
private Integer id2;
2430
private Integer id3;
2531
private Integer id4;
2632

27-
@Override
28-
protected Class<?>[] getAnnotatedClasses() {
29-
return new Class[] {ComponentTestEntity.class};
30-
}
31-
32-
@Test
33-
@Priority(10)
34-
public void initData() {
33+
@BeforeClassTemplate
34+
public void initData(EntityManagerFactoryScope scope) {
3535
// Revision 1
36-
EntityManager em = getEntityManager();
37-
em.getTransaction().begin();
38-
39-
ComponentTestEntity cte1 = new ComponentTestEntity( new Component1( "a", "b" ), new Component2( "x", "y" ) );
40-
ComponentTestEntity cte2 = new ComponentTestEntity(
41-
new Component1( "a2", "b2" ), new Component2(
42-
"x2",
43-
"y2"
44-
)
45-
);
46-
ComponentTestEntity cte3 = new ComponentTestEntity(
47-
new Component1( "a3", "b3" ), new Component2(
48-
"x3",
49-
"y3"
50-
)
51-
);
52-
ComponentTestEntity cte4 = new ComponentTestEntity( null, null );
53-
54-
em.persist( cte1 );
55-
em.persist( cte2 );
56-
em.persist( cte3 );
57-
em.persist( cte4 );
58-
59-
em.getTransaction().commit();
36+
scope.inTransaction( em -> {
37+
ComponentTestEntity cte1 = new ComponentTestEntity( new Component1( "a", "b" ), new Component2( "x", "y" ) );
38+
ComponentTestEntity cte2 = new ComponentTestEntity(
39+
new Component1( "a2", "b2" ), new Component2(
40+
"x2",
41+
"y2"
42+
)
43+
);
44+
ComponentTestEntity cte3 = new ComponentTestEntity(
45+
new Component1( "a3", "b3" ), new Component2(
46+
"x3",
47+
"y3"
48+
)
49+
);
50+
ComponentTestEntity cte4 = new ComponentTestEntity( null, null );
51+
52+
em.persist( cte1 );
53+
em.persist( cte2 );
54+
em.persist( cte3 );
55+
em.persist( cte4 );
56+
57+
id1 = cte1.getId();
58+
id2 = cte2.getId();
59+
id3 = cte3.getId();
60+
id4 = cte4.getId();
61+
} );
6062

6163
// Revision 2
62-
em = getEntityManager();
63-
em.getTransaction().begin();
64-
65-
cte1 = em.find( ComponentTestEntity.class, cte1.getId() );
66-
cte2 = em.find( ComponentTestEntity.class, cte2.getId() );
67-
cte3 = em.find( ComponentTestEntity.class, cte3.getId() );
68-
cte4 = em.find( ComponentTestEntity.class, cte4.getId() );
69-
70-
cte1.setComp1( new Component1( "a'", "b'" ) );
71-
cte2.getComp1().setStr1( "a2'" );
72-
cte3.getComp2().setStr6( "y3'" );
73-
cte4.setComp1( new Component1() );
74-
cte4.getComp1().setStr1( "n" );
75-
cte4.setComp2( new Component2() );
76-
cte4.getComp2().setStr5( "m" );
77-
78-
em.getTransaction().commit();
64+
scope.inTransaction( em -> {
65+
ComponentTestEntity cte1 = em.find( ComponentTestEntity.class, id1 );
66+
ComponentTestEntity cte2 = em.find( ComponentTestEntity.class, id2 );
67+
ComponentTestEntity cte3 = em.find( ComponentTestEntity.class, id3 );
68+
ComponentTestEntity cte4 = em.find( ComponentTestEntity.class, id4 );
69+
70+
cte1.setComp1( new Component1( "a'", "b'" ) );
71+
cte2.getComp1().setStr1( "a2'" );
72+
cte3.getComp2().setStr6( "y3'" );
73+
cte4.setComp1( new Component1() );
74+
cte4.getComp1().setStr1( "n" );
75+
cte4.setComp2( new Component2() );
76+
cte4.getComp2().setStr5( "m" );
77+
} );
7978

8079
// Revision 3
81-
em = getEntityManager();
82-
em.getTransaction().begin();
83-
84-
cte1 = em.find( ComponentTestEntity.class, cte1.getId() );
85-
cte2 = em.find( ComponentTestEntity.class, cte2.getId() );
86-
cte3 = em.find( ComponentTestEntity.class, cte3.getId() );
87-
cte4 = em.find( ComponentTestEntity.class, cte4.getId() );
88-
89-
cte1.setComp2( new Component2( "x'", "y'" ) );
90-
cte3.getComp1().setStr2( "b3'" );
91-
cte4.setComp1( null );
92-
cte4.setComp2( null );
93-
94-
em.getTransaction().commit();
80+
scope.inTransaction( em -> {
81+
ComponentTestEntity cte1 = em.find( ComponentTestEntity.class, id1 );
82+
ComponentTestEntity cte2 = em.find( ComponentTestEntity.class, id2 );
83+
ComponentTestEntity cte3 = em.find( ComponentTestEntity.class, id3 );
84+
ComponentTestEntity cte4 = em.find( ComponentTestEntity.class, id4 );
85+
86+
cte1.setComp2( new Component2( "x'", "y'" ) );
87+
cte3.getComp1().setStr2( "b3'" );
88+
cte4.setComp1( null );
89+
cte4.setComp2( null );
90+
} );
9591

9692
// Revision 4
97-
em = getEntityManager();
98-
em.getTransaction().begin();
99-
100-
cte2 = em.find( ComponentTestEntity.class, cte2.getId() );
101-
102-
em.remove( cte2 );
103-
104-
em.getTransaction().commit();
105-
106-
id1 = cte1.getId();
107-
id2 = cte2.getId();
108-
id3 = cte3.getId();
109-
id4 = cte4.getId();
93+
scope.inTransaction( em -> {
94+
ComponentTestEntity cte2 = em.find( ComponentTestEntity.class, id2 );
95+
em.remove( cte2 );
96+
} );
11097
}
11198

11299
@Test
113-
public void testRevisionsCounts() {
114-
assert Arrays.asList( 1, 2 ).equals( getAuditReader().getRevisions( ComponentTestEntity.class, id1 ) );
115-
116-
assert Arrays.asList( 1, 2, 4 ).equals( getAuditReader().getRevisions( ComponentTestEntity.class, id2 ) );
117-
118-
assert Arrays.asList( 1, 3 ).equals( getAuditReader().getRevisions( ComponentTestEntity.class, id3 ) );
119-
120-
assert Arrays.asList( 1, 2, 3 ).equals( getAuditReader().getRevisions( ComponentTestEntity.class, id4 ) );
100+
public void testRevisionsCounts(EntityManagerFactoryScope scope) {
101+
scope.inEntityManager( em -> {
102+
final var auditReader = AuditReaderFactory.get( em );
103+
assertEquals( Arrays.asList( 1, 2 ), auditReader.getRevisions( ComponentTestEntity.class, id1 ) );
104+
assertEquals( Arrays.asList( 1, 2, 4 ), auditReader.getRevisions( ComponentTestEntity.class, id2 ) );
105+
assertEquals( Arrays.asList( 1, 3 ), auditReader.getRevisions( ComponentTestEntity.class, id3 ) );
106+
assertEquals( Arrays.asList( 1, 2, 3 ), auditReader.getRevisions( ComponentTestEntity.class, id4 ) );
107+
} );
121108
}
122109

123110
@Test
124-
public void testHistoryOfId1() {
111+
public void testHistoryOfId1(EntityManagerFactoryScope scope) {
125112
ComponentTestEntity ver1 = new ComponentTestEntity( id1, new Component1( "a", "b" ), null );
126113
ComponentTestEntity ver2 = new ComponentTestEntity( id1, new Component1( "a'", "b'" ), null );
127114

128-
assert getAuditReader().find( ComponentTestEntity.class, id1, 1 ).equals( ver1 );
129-
assert getAuditReader().find( ComponentTestEntity.class, id1, 2 ).equals( ver2 );
130-
assert getAuditReader().find( ComponentTestEntity.class, id1, 3 ).equals( ver2 );
131-
assert getAuditReader().find( ComponentTestEntity.class, id1, 4 ).equals( ver2 );
115+
scope.inEntityManager( em -> {
116+
final var auditReader = AuditReaderFactory.get( em );
117+
assertEquals( ver1, auditReader.find( ComponentTestEntity.class, id1, 1 ) );
118+
assertEquals( ver2, auditReader.find( ComponentTestEntity.class, id1, 2 ) );
119+
assertEquals( ver2, auditReader.find( ComponentTestEntity.class, id1, 3 ) );
120+
assertEquals( ver2, auditReader.find( ComponentTestEntity.class, id1, 4 ) );
121+
} );
132122
}
133123

134124
@Test
135-
public void testHistoryOfId2() {
125+
public void testHistoryOfId2(EntityManagerFactoryScope scope) {
136126
ComponentTestEntity ver1 = new ComponentTestEntity( id2, new Component1( "a2", "b2" ), null );
137127
ComponentTestEntity ver2 = new ComponentTestEntity( id2, new Component1( "a2'", "b2" ), null );
138128

139-
assert getAuditReader().find( ComponentTestEntity.class, id2, 1 ).equals( ver1 );
140-
assert getAuditReader().find( ComponentTestEntity.class, id2, 2 ).equals( ver2 );
141-
assert getAuditReader().find( ComponentTestEntity.class, id2, 3 ).equals( ver2 );
142-
assert getAuditReader().find( ComponentTestEntity.class, id2, 4 ) == null;
129+
scope.inEntityManager( em -> {
130+
final var auditReader = AuditReaderFactory.get( em );
131+
assertEquals( ver1, auditReader.find( ComponentTestEntity.class, id2, 1 ) );
132+
assertEquals( ver2, auditReader.find( ComponentTestEntity.class, id2, 2 ) );
133+
assertEquals( ver2, auditReader.find( ComponentTestEntity.class, id2, 3 ) );
134+
assertNull( auditReader.find( ComponentTestEntity.class, id2, 4 ) );
135+
} );
143136
}
144137

145138
@Test
146-
public void testHistoryOfId3() {
139+
public void testHistoryOfId3(EntityManagerFactoryScope scope) {
147140
ComponentTestEntity ver1 = new ComponentTestEntity( id3, new Component1( "a3", "b3" ), null );
148141
ComponentTestEntity ver2 = new ComponentTestEntity( id3, new Component1( "a3", "b3'" ), null );
149142

150-
assert getAuditReader().find( ComponentTestEntity.class, id3, 1 ).equals( ver1 );
151-
assert getAuditReader().find( ComponentTestEntity.class, id3, 2 ).equals( ver1 );
152-
assert getAuditReader().find( ComponentTestEntity.class, id3, 3 ).equals( ver2 );
153-
assert getAuditReader().find( ComponentTestEntity.class, id3, 4 ).equals( ver2 );
143+
scope.inEntityManager( em -> {
144+
final var auditReader = AuditReaderFactory.get( em );
145+
assertEquals( ver1, auditReader.find( ComponentTestEntity.class, id3, 1 ) );
146+
assertEquals( ver1, auditReader.find( ComponentTestEntity.class, id3, 2 ) );
147+
assertEquals( ver2, auditReader.find( ComponentTestEntity.class, id3, 3 ) );
148+
assertEquals( ver2, auditReader.find( ComponentTestEntity.class, id3, 4 ) );
149+
} );
154150
}
155151

156152
@Test
157-
public void testHistoryOfId4() {
153+
public void testHistoryOfId4(EntityManagerFactoryScope scope) {
158154
ComponentTestEntity ver1 = new ComponentTestEntity( id4, null, null );
159155
ComponentTestEntity ver2 = new ComponentTestEntity( id4, new Component1( "n", null ), null );
160156
ComponentTestEntity ver3 = new ComponentTestEntity( id4, null, null );
161157

162-
assert getAuditReader().find( ComponentTestEntity.class, id4, 1 ).equals( ver1 );
163-
assert getAuditReader().find( ComponentTestEntity.class, id4, 2 ).equals( ver2 );
164-
assert getAuditReader().find( ComponentTestEntity.class, id4, 3 ).equals( ver3 );
165-
assert getAuditReader().find( ComponentTestEntity.class, id4, 4 ).equals( ver3 );
158+
scope.inEntityManager( em -> {
159+
final var auditReader = AuditReaderFactory.get( em );
160+
assertEquals( ver1, auditReader.find( ComponentTestEntity.class, id4, 1 ) );
161+
assertEquals( ver2, auditReader.find( ComponentTestEntity.class, id4, 2 ) );
162+
assertEquals( ver3, auditReader.find( ComponentTestEntity.class, id4, 3 ) );
163+
assertEquals( ver3, auditReader.find( ComponentTestEntity.class, id4, 4 ) );
164+
} );
166165
}
167166
}

0 commit comments

Comments
 (0)