Skip to content

Commit b206d3e

Browse files
mbelladembellade
committed
HHH-19871 --wip-- Envers migration to JUnit 6
- `org.hibernate.orm.test.envers.integration.accesstype`
1 parent 83256a3 commit b206d3e

File tree

5 files changed

+126
-129
lines changed

5 files changed

+126
-129
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,18 @@
1010
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
1111
import org.hibernate.boot.spi.MetadataImplementor;
1212
import org.hibernate.cfg.AvailableSettings;
13-
import org.hibernate.orm.test.envers.AbstractEnversTest;
1413
import org.hibernate.mapping.PersistentClass;
1514

1615
import org.hibernate.testing.orm.junit.JiraKey;
1716
import org.hibernate.testing.util.ServiceRegistryUtil;
18-
import org.junit.Test;
17+
import org.junit.jupiter.api.Test;
1918

2019
import static org.junit.Assert.assertNotNull;
2120

2221
/**
2322
* @author Steve Ebersole
2423
*/
25-
public class BasicModelingTest extends AbstractEnversTest {
24+
public class BasicModelingTest {
2625
@Test
2726
@JiraKey( value = "HHH-9042" )
2827
public void testMetamodelBuilding() {

‎hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/AttributeAccessorTest.java‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,41 +9,42 @@
99

1010
import org.hibernate.annotations.AttributeAccessor;
1111
import org.hibernate.envers.Audited;
12-
import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase;
12+
import org.hibernate.envers.AuditReaderFactory;
1313
import org.hibernate.property.access.internal.PropertyAccessStrategyBasicImpl;
1414
import org.hibernate.property.access.spi.PropertyAccess;
15-
import org.junit.Test;
1615

1716
import org.hibernate.testing.orm.junit.JiraKey;
17+
import org.hibernate.testing.orm.junit.Jpa;
18+
import org.hibernate.testing.envers.junit.EnversTest;
19+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
20+
import org.junit.jupiter.api.Test;
1821

19-
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
20-
import static org.junit.Assert.assertEquals;
21-
import static org.junit.Assert.assertTrue;
22+
import static org.junit.jupiter.api.Assertions.assertEquals;
23+
import static org.junit.jupiter.api.Assertions.assertTrue;
2224

2325
/**
2426
* @author Chris Cranford
2527
*/
2628
@JiraKey(value = "HHH-12063")
27-
public class AttributeAccessorTest extends BaseEnversJPAFunctionalTestCase {
28-
@Override
29-
protected Class<?>[] getAnnotatedClasses() {
30-
return new Class<?>[] { Foo.class };
31-
}
32-
29+
@Jpa(annotatedClasses = { AttributeAccessorTest.Foo.class })
30+
@EnversTest
31+
public class AttributeAccessorTest {
3332
@Test
34-
public void testAttributeAccessor() {
33+
public void testAttributeAccessor(EntityManagerFactoryScope scope) {
34+
scope.getEntityManagerFactory(); // force building the metamodel
35+
3536
// Verify that the accessor was triggered during metadata building phase.
3637
assertTrue( BasicAttributeAccessor.invoked );
3738

3839
// Create an audited entity
39-
doInJPA( this::entityManagerFactory, entityManager -> {
40+
scope.inTransaction( entityManager -> {
4041
final Foo foo = new Foo( 1, "ABC" );
4142
entityManager.persist( foo );
4243
} );
4344

4445
// query the entity.
45-
doInJPA( this::entityManagerFactory, entityManager -> {
46-
final Foo foo = getAuditReader().find( Foo.class, 1, 1 );
46+
scope.inEntityManager( entityManager -> {
47+
final Foo foo = AuditReaderFactory.get( entityManager ).find( Foo.class, 1, 1 );
4748
assertEquals( "ABC", foo.getName() );
4849
} );
4950
}

‎hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/FieldAccessType.java‎

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,52 +4,54 @@
44
*/
55
package org.hibernate.orm.test.envers.integration.accesstype;
66

7-
import java.util.Arrays;
8-
import jakarta.persistence.EntityManager;
7+
import org.hibernate.envers.AuditReaderFactory;
8+
import org.hibernate.testing.envers.junit.EnversTest;
9+
import org.hibernate.testing.orm.junit.BeforeClassTemplate;
10+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
11+
import org.hibernate.testing.orm.junit.Jpa;
12+
import org.junit.jupiter.api.Test;
913

10-
import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase;
11-
import org.hibernate.orm.test.envers.Priority;
14+
import java.util.Arrays;
1215

13-
import org.junit.Assert;
14-
import org.junit.Test;
16+
import static org.junit.jupiter.api.Assertions.assertEquals;
1517

1618
/**
1719
* @author Adam Warski (adam at warski dot org)
1820
*/
19-
public class FieldAccessType extends BaseEnversJPAFunctionalTestCase {
21+
@Jpa(annotatedClasses = {FieldAccessTypeEntity.class})
22+
@EnversTest
23+
public class FieldAccessType {
2024
private Integer id1;
2125

22-
@Override
23-
protected Class<?>[] getAnnotatedClasses() {
24-
return new Class[] {FieldAccessTypeEntity.class};
25-
}
26-
27-
@Test
28-
@Priority(10)
29-
public void initData() {
30-
EntityManager em = getEntityManager();
31-
em.getTransaction().begin();
32-
FieldAccessTypeEntity fate = new FieldAccessTypeEntity( "data" );
33-
em.persist( fate );
34-
id1 = fate.readId();
35-
em.getTransaction().commit();
36-
37-
em.getTransaction().begin();
38-
fate = em.find( FieldAccessTypeEntity.class, id1 );
39-
fate.writeData( "data2" );
40-
em.getTransaction().commit();
26+
@BeforeClassTemplate
27+
public void initData(EntityManagerFactoryScope scope) {
28+
scope.inTransaction( em -> {
29+
FieldAccessTypeEntity fate = new FieldAccessTypeEntity( "data" );
30+
em.persist( fate );
31+
id1 = fate.readId();
32+
} );
33+
34+
scope.inTransaction( em -> {
35+
FieldAccessTypeEntity fate = em.find( FieldAccessTypeEntity.class, id1 );
36+
fate.writeData( "data2" );
37+
} );
4138
}
4239

4340
@Test
44-
public void testRevisionsCounts() {
45-
Assert.assertEquals( Arrays.asList( 1, 2 ), getAuditReader().getRevisions( FieldAccessTypeEntity.class, id1 ) );
41+
public void testRevisionsCounts(EntityManagerFactoryScope scope) {
42+
scope.inEntityManager( em -> {
43+
assertEquals( Arrays.asList( 1, 2 ),
44+
AuditReaderFactory.get( em ).getRevisions( FieldAccessTypeEntity.class, id1 ) );
45+
} );
4646
}
4747

4848
@Test
49-
public void testHistoryOfId1() {
50-
FieldAccessTypeEntity ver1 = new FieldAccessTypeEntity( id1, "data" );
51-
FieldAccessTypeEntity ver2 = new FieldAccessTypeEntity( id1, "data2" );
52-
Assert.assertEquals( ver1, getAuditReader().find( FieldAccessTypeEntity.class, id1, 1 ) );
53-
Assert.assertEquals( ver2, getAuditReader().find( FieldAccessTypeEntity.class, id1, 2 ) );
49+
public void testHistoryOfId1(EntityManagerFactoryScope scope) {
50+
scope.inEntityManager( em -> {
51+
FieldAccessTypeEntity ver1 = new FieldAccessTypeEntity( id1, "data" );
52+
FieldAccessTypeEntity ver2 = new FieldAccessTypeEntity( id1, "data2" );
53+
assertEquals( ver1, AuditReaderFactory.get( em ).find( FieldAccessTypeEntity.class, id1, 1 ) );
54+
assertEquals( ver2, AuditReaderFactory.get( em ).find( FieldAccessTypeEntity.class, id1, 2 ) );
55+
} );
5456
}
5557
}

‎hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/ImmutableClassAccessType.java‎

Lines changed: 32 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -4,58 +4,49 @@
44
*/
55
package org.hibernate.orm.test.envers.integration.accesstype;
66

7-
import java.util.Arrays;
8-
import jakarta.persistence.EntityManager;
9-
10-
import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase;
11-
import org.hibernate.orm.test.envers.Priority;
7+
import org.hibernate.envers.AuditReaderFactory;
8+
import org.hibernate.testing.envers.junit.EnversTest;
9+
import org.hibernate.testing.orm.junit.BeforeClassTemplate;
10+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
11+
import org.hibernate.testing.orm.junit.Jpa;
12+
import org.junit.jupiter.api.Test;
1213

13-
import org.junit.Test;
14+
import java.util.Arrays;
1415

15-
import static org.junit.Assert.assertEquals;
16+
import static org.junit.jupiter.api.Assertions.assertEquals;
1617

17-
public class ImmutableClassAccessType extends BaseEnversJPAFunctionalTestCase {
18+
@Jpa(annotatedClasses = {Country.class})
19+
@EnversTest
20+
public class ImmutableClassAccessType {
1821
private Country country;
1922

20-
@Override
21-
protected Class<?>[] getAnnotatedClasses() {
22-
return new Class[] {Country.class};
23-
}
24-
25-
@Test
26-
@Priority(10)
27-
public void initData() {
28-
EntityManager em = getEntityManager();
29-
23+
@BeforeClassTemplate
24+
public void initData(EntityManagerFactoryScope scope) {
3025
// Revision 1
31-
em.getTransaction().begin();
32-
country = Country.of( 123, "Germany" );
33-
em.persist( country );
34-
em.getTransaction().commit();
35-
26+
scope.inTransaction( em -> {
27+
country = Country.of( 123, "Germany" );
28+
em.persist( country );
29+
} );
3630
}
3731

3832
@Test
39-
public void testRevisionsCounts() {
40-
assert Arrays.asList( 1 )
41-
.equals(
42-
getAuditReader().getRevisions(
43-
Country.class,
44-
country.getCode()
45-
)
46-
);
33+
public void testRevisionsCounts(EntityManagerFactoryScope scope) {
34+
scope.inEntityManager( em -> {
35+
assertEquals(
36+
Arrays.asList( 1 ),
37+
AuditReaderFactory.get( em ).getRevisions( Country.class, country.getCode() )
38+
);
39+
} );
4740
}
4841

4942
@Test
50-
public void testHistoryOfId1() {
51-
Country country1 = getEntityManager().find(
52-
Country.class,
53-
country.getCode()
54-
);
55-
assertEquals( country1, country );
56-
57-
Country history = getAuditReader().find( Country.class, country1.getCode(), 1 );
58-
assertEquals( country, history );
43+
public void testHistoryOfId1(EntityManagerFactoryScope scope) {
44+
scope.inEntityManager( em -> {
45+
Country country1 = em.find( Country.class, country.getCode() );
46+
assertEquals( country1, country );
47+
48+
Country history = AuditReaderFactory.get( em ).find( Country.class, country1.getCode(), 1 );
49+
assertEquals( country, history );
50+
} );
5951
}
60-
6152
}

‎hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/PropertyAccessType.java‎

Lines changed: 41 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4,61 +4,65 @@
44
*/
55
package org.hibernate.orm.test.envers.integration.accesstype;
66

7-
import java.util.Arrays;
8-
import jakarta.persistence.EntityManager;
7+
import org.hibernate.envers.AuditReaderFactory;
8+
import org.hibernate.testing.envers.junit.EnversTest;
9+
import org.hibernate.testing.orm.junit.BeforeClassTemplate;
10+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
11+
import org.hibernate.testing.orm.junit.Jpa;
12+
import org.junit.jupiter.api.Test;
913

10-
import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase;
11-
import org.hibernate.orm.test.envers.Priority;
14+
import java.util.Arrays;
1215

13-
import org.junit.Test;
16+
import static org.junit.jupiter.api.Assertions.assertEquals;
17+
import static org.junit.jupiter.api.Assertions.assertTrue;
1418

1519
/**
1620
* @author Adam Warski (adam at warski dot org)
1721
*/
18-
public class PropertyAccessType extends BaseEnversJPAFunctionalTestCase {
22+
@Jpa(annotatedClasses = {PropertyAccessTypeEntity.class})
23+
@EnversTest
24+
public class PropertyAccessType {
1925
private Integer id1;
2026

21-
@Override
22-
protected Class<?>[] getAnnotatedClasses() {
23-
return new Class[] {PropertyAccessTypeEntity.class};
24-
}
25-
26-
@Test
27-
@Priority(10)
28-
public void initData() {
29-
EntityManager em = getEntityManager();
30-
em.getTransaction().begin();
31-
PropertyAccessTypeEntity pate = new PropertyAccessTypeEntity( "data" );
32-
em.persist( pate );
33-
id1 = pate.getId();
34-
em.getTransaction().commit();
27+
@BeforeClassTemplate
28+
public void initData(EntityManagerFactoryScope scope) {
29+
scope.inTransaction( em -> {
30+
PropertyAccessTypeEntity pate = new PropertyAccessTypeEntity( "data" );
31+
em.persist( pate );
32+
id1 = pate.getId();
33+
} );
3534

36-
em.getTransaction().begin();
37-
pate = em.find( PropertyAccessTypeEntity.class, id1 );
38-
pate.writeData( "data2" );
39-
em.getTransaction().commit();
35+
scope.inTransaction( em -> {
36+
PropertyAccessTypeEntity pate = em.find( PropertyAccessTypeEntity.class, id1 );
37+
pate.writeData( "data2" );
38+
} );
4039
}
4140

4241
@Test
43-
public void testRevisionsCounts() {
44-
assert Arrays.asList( 1, 2 ).equals( getAuditReader().getRevisions( PropertyAccessTypeEntity.class, id1 ) );
42+
public void testRevisionsCounts(EntityManagerFactoryScope scope) {
43+
scope.inEntityManager( em -> {
44+
assertEquals( Arrays.asList( 1, 2 ),
45+
AuditReaderFactory.get( em ).getRevisions( PropertyAccessTypeEntity.class, id1 ) );
46+
} );
4547
}
4648

4749
@Test
48-
public void testHistoryOfId1() {
49-
PropertyAccessTypeEntity ver1 = new PropertyAccessTypeEntity( id1, "data" );
50-
PropertyAccessTypeEntity ver2 = new PropertyAccessTypeEntity( id1, "data2" );
50+
public void testHistoryOfId1(EntityManagerFactoryScope scope) {
51+
scope.inEntityManager( em -> {
52+
PropertyAccessTypeEntity ver1 = new PropertyAccessTypeEntity( id1, "data" );
53+
PropertyAccessTypeEntity ver2 = new PropertyAccessTypeEntity( id1, "data2" );
5154

52-
PropertyAccessTypeEntity rev1 = getAuditReader().find( PropertyAccessTypeEntity.class, id1, 1 );
53-
PropertyAccessTypeEntity rev2 = getAuditReader().find( PropertyAccessTypeEntity.class, id1, 2 );
55+
PropertyAccessTypeEntity rev1 = AuditReaderFactory.get( em ).find( PropertyAccessTypeEntity.class, id1, 1 );
56+
PropertyAccessTypeEntity rev2 = AuditReaderFactory.get( em ).find( PropertyAccessTypeEntity.class, id1, 2 );
5457

55-
assert rev1.isIdSet();
56-
assert rev2.isIdSet();
58+
assertTrue( rev1.isIdSet() );
59+
assertTrue( rev2.isIdSet() );
5760

58-
assert rev1.isDataSet();
59-
assert rev2.isDataSet();
61+
assertTrue( rev1.isDataSet() );
62+
assertTrue( rev2.isDataSet() );
6063

61-
assert rev1.equals( ver1 );
62-
assert rev2.equals( ver2 );
64+
assertEquals( ver1, rev1 );
65+
assertEquals( ver2, rev2 );
66+
} );
6367
}
6468
}

0 commit comments

Comments
 (0)