Skip to content

Rename ambiguous parameters #2945

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-danield wants to merge 1 commit into from
+5 −5
Closed

Rename ambiguous parameters #2945

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
10 changes: 5 additions & 5 deletions src/org/labkey/test/util/TestDataGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,12 +660,12 @@ public static String randomFieldName(String part, @Nullable String exclusion, Do
return randomFieldName(part, null, null, exclusion, domainKind);
}

public static String randomFieldName(@NotNull String part, @Nullable Integer numStartChars, @Nullable Integer numEndChars, @Nullable String exclusion, @Nullable DomainKind domainKind)
public static String randomFieldName(@NotNull String part, @Nullable Integer minNumStartChars, @Nullable Integer minNumEndChars, @Nullable String exclusion, @Nullable DomainKind domainKind)
{
return randomFieldName(part, numStartChars, numEndChars, exclusion, domainKind, null);
return randomFieldName(part, minNumStartChars, minNumEndChars, exclusion, domainKind, null);
}

public static String randomFieldName(@NotNull String part, @Nullable Integer numStartChars, @Nullable Integer numEndChars, @Nullable String exclusion, @Nullable DomainKind domainKind, @Nullable Integer maxLength)
public static String randomFieldName(@NotNull String part, @Nullable Integer minNumStartChars, @Nullable Integer minNumEndChars, @Nullable String exclusion, @Nullable DomainKind domainKind, @Nullable Integer maxLength)
{
DomainKind _domainKind = domainKind == null ? DomainKind.SampleSet : domainKind;

Expand All @@ -675,10 +675,10 @@ public static String randomFieldName(@NotNull String part, @Nullable Integer num
+ WIDE_PLACEHOLDER + REPEAT_PLACEHOLDER + ALL_CHARS_PLACEHOLDER;

int currentTries = 0;
RandomName randomFieldName = randomName(part, getNumChars(numStartChars, 5), getNumChars(numEndChars, 50), chars, exclusion);
RandomName randomFieldName = randomName(part, getNumChars(minNumStartChars, 5), getNumChars(minNumEndChars, 50), chars, exclusion);
while ((maxLength != null && randomFieldName.name().length() > maxLength) || isDomainAndFieldNameInvalid(_domainKind, null, randomFieldName))
{
randomFieldName = randomName(part, getNumChars(numStartChars, 5), getNumChars(numEndChars, 50), chars, exclusion);
randomFieldName = randomName(part, getNumChars(minNumStartChars, 5), getNumChars(minNumEndChars, 50), chars, exclusion);
if (++currentTries >= MAX_RANDOM_TRIES)
throw new IllegalStateException("Failed to generate a valid field name after " + MAX_RANDOM_TRIES + " tries. Last generated name: " + randomFieldName);
}
Expand Down
Loading