HHH-19871 Drop JUnit 4 usage in Hibernate Envers #11131
Conversation
|
Thanks for your pull request! This pull request appears to follow the contribution rules. › This message was automatically generated. |
have you tried this one: (Last time I've played around with this it had some strange behavior, but I don't remember the sepcifics anymore 🙂) |
|
Hey @marko-bekhta, yes I saw that (there's also this) but I'm not sure how that would help - |
|
Ah I meant to use the other pair of anotations in the evnerse test classes rather than |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
...org/hibernate/orm/test/envers/integration/query/AssociationRevisionsOfEntitiesQueryTest.java
Dismissed
Show dismissed
Hide dismissed
|
As discussed offline, there are a few alternatives to improve on the |
mbellade
force-pushed
the
envers-junit
branch
2 times, most recently
from
dfd4d86 to
798f410
Compare
| List<?> revisionInfos = AuditReaderFactory.get( em ).createQuery() | ||
| .forRevisionsOfEntity( NotAuditedTestEntity.class, false ) | ||
| .getResultList(); |
Check notice
Code scanning / CodeQL
Unread local variable Note test
| final var domainModel = scope.getDomainModel(); | ||
|
|
||
| assertThrows( AssertionFailedError.class, () -> { | ||
| final Long expectedDefaultLength = new Long( DEFAULT_LENGTH ); |
Check notice
Code scanning / CodeQL
Inefficient primitive constructor Note test
|
|
||
| final org.hibernate.mapping.Column colDef = auditTable.getColumn( toIdentifier( "columnWithDefinition" ) ); | ||
| assertEquals( "varchar(10)", colDef.getSqlType() ); | ||
| assertEquals( new Long( 10 ), colDef.getLength() ); |
Check notice
Code scanning / CodeQL
Inefficient primitive constructor Note test
| public void blockTest() { | ||
| final AuditReader reader = getAuditReader(); | ||
| public void blockTest(EntityManagerFactoryScope scope) { | ||
| final AuditReader reader = scope.fromEntityManager( em -> AuditReaderFactory.get( em ) ); |
Check notice
Code scanning / CodeQL
Unread local variable Note test
mbellade
force-pushed
the
envers-junit
branch
3 times, most recently
from
ab22c63 to
fd09d92
Compare
| em.getTransaction().commit(); | ||
| scope.inTransaction( em -> { | ||
| ComponentTestEntity cte1 = em.find( ComponentTestEntity.class, id1 ); | ||
| ComponentTestEntity cte2 = em.find( ComponentTestEntity.class, id2 ); |
Check notice
Code scanning / CodeQL
Unread local variable Note test
| @@ -222,4 +226,33 @@ | |||
| entityManager.close(); | |||
| } | |||
| } | |||
|
|
|||
| public static AuditStrategy getAuditStrategy(EntityManager entityManager) { | |||
Check notice
Code scanning / CodeQL
Confusing overloading of methods Note test
|
|
||
| private void assertEnumProperty(Class<?> entityClass, Class<?> typeClass, String propertyName, EnumType expectedType) { | ||
| doInJPA( this::entityManagerFactory, entityManager -> { | ||
| private void assertEnumProperty(EntityManagerFactoryScope scope, Class<?> entityClass, Class<?> typeClass, String propertyName, EnumType expectedType) { |
Check notice
Code scanning / CodeQL
Useless parameter Note test
|
|
||
| private void checkEntities() { | ||
|
|
||
| private void checkEntities(SessionImplementor session, AuditReader auditReader) { |
Check notice
Code scanning / CodeQL
Useless parameter Note test
|
|
||
| private void checkEntities() { | ||
|
|
||
| private void checkEntities(SessionImplementor session, AuditReader auditReader) { |
Check notice
Code scanning / CodeQL
Useless parameter Note test
- Extension hooks and hibernate-testing changes - org.hibernate.orm.test.envers.integration.query`
- `org.hibernate.orm.test.envers.integration.accesstype`
- `org.hibernate.orm.test.envers.integration.auditReader`
- `org.hibernate.orm.test.envers.integration.basic`
- `org.hibernate.orm.test.envers.integration.blob` - `org.hibernate.orm.test.envers.integration.cache`
- `org.hibernate.orm.test.envers.integration.collection`
- `org.hibernate.orm.test.envers.integration.components`
mbellade
force-pushed
the
envers-junit
branch
from
759da8d to
9d5369c
Compare
- `org.hibernate.orm.test.envers.integration.customtype` - `org.hibernate.orm.test.envers.integration.data` - `org.hibernate.orm.test.envers.integration.dynamic` - `org.hibernate.orm.test.envers.integration.dynamicmodel` - `org.hibernate.orm.test.envers.integration.entityNames` - `org.hibernate.orm.test.envers.integration.generated`
- `org.hibernate.orm.test.envers.integration.flush`
mbellade
force-pushed
the
envers-junit
branch
from
9d5369c to
72e1f20
Compare
2 participants
https://hibernate.atlassian.net/browse/HHH-19871
Drafting a possible migration path for Envers tests from JUnit 4 -> 6. This approach is the "least invasive", adding on top of the existing hibernate-testing annotations like
@Jpaadding only the required Envers machinery, while relying on existing JUnit 6 features like@ClassTemplates to run tests with multiple audit strategies.Migrated the following test packages:
org.hibernate.orm.test.envers.integration.queryorg.hibernate.orm.test.envers.integration.accesstypeorg.hibernate.orm.test.envers.integration.auditReaderorg.hibernate.orm.test.envers.integration.basicorg.hibernate.orm.test.envers.integration.bloborg.hibernate.orm.test.envers.integration.cacheorg.hibernate.orm.test.envers.integration.collectionorg.hibernate.orm.test.envers.integration.componentsorg.hibernate.orm.test.envers.integration.customtypeorg.hibernate.orm.test.envers.integration.dataorg.hibernate.orm.test.envers.integration.dynamicorg.hibernate.orm.test.envers.integration.dynamicmodelorg.hibernate.orm.test.envers.integration.entityNamesorg.hibernate.orm.test.envers.integration.flushorg.hibernate.orm.test.envers.integration.generatedBy submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license
and can be relicensed under the terms of the LGPL v2.1 license in the future at the maintainers' discretion.
For more information on licensing, please check here.