Envers verification wip

TIER · May 9, 2019 · f2e3416 · f2e3416
1 parent cb37e82
commit f2e3416
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/...c/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolver.java b/...c/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolver.java
@@ -11,6 +11,7 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
+import org.hibernate.envers.AuditOverride;
 import org.hibernate.envers.Audited;
 
 import javax.persistence.CascadeType;
@@ -39,6 +40,7 @@
         @JsonSubTypes.Type(value = FilesystemMetadataResolver.class, name = "FilesystemMetadataResolver"),
         @JsonSubTypes.Type(value = ResourceBackedMetadataResolver.class, name = "ResourceBackedMetadataResolver")})
 @Audited
+@AuditOverride(forClass = AbstractAuditable.class)
 public class MetadataResolver extends AbstractAuditable {
 
     @JsonProperty("@type")

diff --git a/...boleth/admin/ui/repository/envers/MetadataResolverEntityBasicEnversVersioningTests.groovy b/...boleth/admin/ui/repository/envers/MetadataResolverEntityBasicEnversVersioningTests.groovy
@@ -43,16 +43,26 @@ class MetadataResolverEntityBasicEnversVersioningTests extends Specification {
 
     def "test basic audit and version data is created when persisting base metadata resolver with envers enabled"() {
         when:
-        doInExplicitTransaction {
+        MetadataResolver mdr = doInExplicitTransaction {
             metadataResolverRepository.save(create {new MetadataResolver()})
         }
-        def metadataResolverHistory = metadataResolverHistory()
+        def metadataResolverHistory = resolverHistory()
+
+        then:
+        metadataResolverHistory
+
+        when:
+        mdr.name = 'Updated'
+        doInExplicitTransaction {
+            metadataResolverRepository.save(mdr)
+        }
+        metadataResolverHistory = resolverHistory()
 
         then:
         metadataResolverHistory
     }
 
-    private metadataResolverHistory() {
+    private resolverHistory() {
         def auditReader = AuditReaderFactory.get(entityManager)
         AuditQuery auditQuery = auditReader
                 .createQuery()
@@ -83,7 +93,8 @@ class MetadataResolverEntityBasicEnversVersioningTests extends Specification {
     //start/commit transaction making envers data written out and verifiable
     private doInExplicitTransaction(Closure uow) {
         def txStatus = txMgr.getTransaction(new DefaultTransactionDefinition(PROPAGATION_REQUIRES_NEW))
-        uow()
+        def entity = uow()
         txMgr.commit(txStatus)
+        entity
     }
 }