diff --git a/src/org/labkey/test/util/AuditLogHelper.java b/src/org/labkey/test/util/AuditLogHelper.java index 97ddce324e..500bcb6acd 100644 --- a/src/org/labkey/test/util/AuditLogHelper.java +++ b/src/org/labkey/test/util/AuditLogHelper.java @@ -248,10 +248,14 @@ public Integer checkAuditEventDiffCountForLastTransaction(String containerPath, { Integer transactionId = getLastTransactionId(containerPath, auditEventName); List transactionFilter = List.of(new Filter("TransactionId", transactionId, Filter.Operator.EQUAL)); - int eventCount = getAuditLogsFromLKS(containerPath, auditEventName, List.of("NewRecordMap"), transactionFilter, null, ContainerFilter.CurrentAndSubfolders).getRows().size(); + List> events = getAuditLogsFromLKS(containerPath, auditEventName, List.of("Comment", "UserComment", "NewRecordMap"), transactionFilter, null, ContainerFilter.CurrentAndSubfolders).getRows(); if (expectedEventCount != null) - assertEquals("Unexpected number of events for transactionId " + transactionId, expectedEventCount.intValue(), eventCount); - List expectedChangeCounts = Collections.nCopies(eventCount, expectedDiffCount); + { + if (expectedEventCount.intValue() != events.size()) + TestLogger.log("Last audit event info: " + events.get(0)); + assertEquals("Unexpected number of events for transactionId " + transactionId, expectedEventCount.intValue(), events.size()); + } + List expectedChangeCounts = Collections.nCopies(events.size(), expectedDiffCount); checkAuditEventDiffCount(containerPath, auditEventName, transactionFilter, expectedChangeCounts); return transactionId; }