Skip to content

Fix domain/field name validation for trial tests #2658

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

Closed
labkey-tchad wants to merge 3 commits into from
Closed

Fix domain/field name validation for trial tests #2658

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4db1d5b
Fix domain/field name validation for trial tests
labkey-tchad Aug 29, 2025
c410ce3
Merge remote-tracking branch 'origin/develop' into fb_noRandomRemote
labkey-tchad Aug 29, 2025
3bf08b1
Update comment
labkey-tchad Aug 29, 2025
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
29 changes: 28 additions & 1 deletion src/org/labkey/test/util/TestDataGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import org.labkey.remoteapi.query.SelectRowsResponse;
import org.labkey.remoteapi.query.Sort;
import org.labkey.serverapi.reader.TabLoader;
import org.labkey.test.TestProperties;
import org.labkey.test.WebTestHelper;
import org.labkey.test.params.FieldDefinition;
import org.labkey.test.util.data.ColumnNameMapper;
Expand Down Expand Up @@ -594,7 +595,8 @@ public static String randomDomainName(@Nullable String namePart, @Nullable Integ
}

// Multiple spaces in the UI are collapsed into a single space. If we need to test for handling of multiple spaces, we'll not use this generator
domainName = domainName.replaceAll("\\s+", " ");
// Capitalize to make it easier to match grid header labels and audit events
domainName = StringUtils.capitalize(domainName).replaceAll("\\s+", " ");

TestLogger.log("Generated random domain name for domainKind " + _domainKind + ": " + domainName);
return domainName;
Expand Down Expand Up @@ -644,6 +646,31 @@ public static String randomFieldName(@NotNull String part, @Nullable Integer num

private static boolean isDomainAndFieldNameInvalid(DomainUtils.DomainKind domainKind, @Nullable String domainName, @Nullable String fieldName)
{
if (TestProperties.isTrialServer()) // WebTestHelper.getRemoteApiConnection() won't work against trial server before logging in via UI
{
if (domainName != null)
{
int maxLength = switch (domainKind)
{
case Assay -> 200 - 13; // Make room for "{$domainName} Batch Fields" domain
case SampleSet -> 100;
default -> 200; // Sources, lists, and datasets allow 200 character names
};
if (domainName.length() > maxLength)
return true;
}
if (fieldName != null)
{
if (fieldName.length() > 200 || Pattern.matches(".*:[a-zA-Z]{3}.*", fieldName)) // Avoid illegal patterns like ":Date"
{
return true;
}
}
else
{
return false;
}
}
SimplePostCommand command = new SimplePostCommand("property", "validateDomainAndFieldNames");
JSONObject domainDesign = new JSONObject();
if (domainName != null)
Expand Down