Skip to content

Fix Flakey Test Issues #3097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-danield merged 2 commits into from
Jul 13, 2026
+17 −7
Merged

Fix Flakey Test Issues #3097

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80861da
Modify AuditLogHelper.checkAuditEventValuesForTransactionId to do a s…
labkey-danield Jul 9, 2026
8df1458
Update AuditLogHelper.checkAuditEventValuesForTransactionId to be a s…
labkey-danield Jul 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions src/org/labkey/test/util/AuditLogHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,19 +261,29 @@ public void checkAuditEventValuesForTransactionId(String containerPath, AuditEve

public void checkAuditEventValuesForTransactionId(String containerPath, AuditEvent auditEventName, Integer transactionId, List<Map<String, Object>> expectedValues) throws IOException, CommandException
{
List<String> columnNames = expectedValues.get(0).keySet().stream().map(Object::toString).toList();
List<String> columnNames = expectedValues.getFirst().keySet().stream().map(Object::toString).toList();
checkAuditEventValuesForTransactionId(containerPath, auditEventName, columnNames, transactionId, expectedValues);
}

public void checkAuditEventValuesForTransactionId(String containerPath, AuditEvent auditEventName, List<String> columnNames, Integer transactionId, List<Map<String, Object>> expectedValues) throws IOException, CommandException
{
List<Map<String, Object>> events = getAuditLogsForTransactionId(containerPath, auditEventName, columnNames, transactionId, ContainerFilter.CurrentAndSubfolders);
assertEquals("Unexpected number of events for transactionId " + transactionId, expectedValues.size(), events.size());
for (int i = 0; i < expectedValues.size(); i++)
{
for (String key : expectedValues.get(i).keySet())
assertEquals("Event " + i + " value for " + key + " not as expected", expectedValues.get(i).get(key), events.get(i).get(key));
}

List<Map<String, Object>> unmatched = expectedValues.stream()
.filter(expectedRow -> {
Set<String> keysOfInterest = expectedRow.keySet();
return events.stream().noneMatch(actualRow -> {
Map<String, Object> actualFiltered = actualRow.entrySet().stream()
.filter(e -> keysOfInterest.contains(e.getKey()))
.collect(HashMap::new,
(m, e) -> m.put(e.getKey(), e.getValue()),
HashMap::putAll);
return actualFiltered.equals(expectedRow);
});
})
.toList();

assertTrue("Expected rows with no match in actual: " + unmatched, unmatched.isEmpty());
}

public Map<String, Object> getTransactionAuditLogDetails(Integer transactionAuditId)
Expand Down