Skip to content

Fix expected settings in audit event #2731

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-adam merged 1 commit into from
Oct 7, 2025
Merged

Fix expected settings in audit event #2731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions src/org/labkey/test/tests/AuditLogTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,8 +650,8 @@ public void testDomainPropertyEvents()

log("Validate that the expected rows are there.");

String eventInitValue = "Name=ChangeMyColumns&AllowDelete=true&AllowUpload=true&AllowExport=true&DiscussionSetting=0" +
"&EntireListIndexSetting=0&EntireListBodySetting=0&EachItemBodySetting=0&EntireListIndex=false&EachItemIndex=false&FileAttachmentIndex=false";
String eventInitValue = "Name=ChangeMyColumns&AllowDelete=true&AllowUpload=true&AllowExport=true&EntireListIndexSetting=0" +
"&EntireListBodySetting=0&EachItemBodySetting=0&EntireListIndex=false&EachItemIndex=false&FileAttachmentIndex=false";
AuditLogHelper.DetailedAuditEventRow expectedDomainEvent = new AuditLogHelper.DetailedAuditEventRow(null, LIST_CHECK_LOG, null,
"The domain " + LIST_CHECK_LOG + " was created. The column(s) of domain " + LIST_CHECK_LOG + " were modified.",
null, null, eventInitValue, null);
Expand Down Expand Up @@ -780,5 +780,4 @@ private void validateLastDomainAuditEvents(String domainName, String failComment

Assert.assertTrue(failComment + " See log for details.", pass);
}

}
12 changes: 7 additions & 5 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 @@ -56,11 +56,13 @@ public class AuditLogHelper
"Comment"
);

public static final String SCHEMA_XML_AUDIT = "<tables xmlns=\"http://labkey.org/data/xml\">\n" +
" <table tableName=\"%s\" tableDbType=\"NOT_IN_DB\">\n" +
" <auditLogging>%s</auditLogging>\n" +
" </table>\n" +
"</tables>\n";
public static final String SCHEMA_XML_AUDIT = """
<tables xmlns="http://labkey.org/data/xml">
<table tableName="%s" tableDbType="NOT_IN_DB">
<auditLogging>%s</auditLogging>
</table>
</tables>
""";


private final WebDriverWrapper _wrapper;
Expand Down