Skip to content

Test Fixes for LKS Sample Type Test #2634

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 4 commits into from
Aug 15, 2025
Merged

Test Fixes for LKS Sample Type Test #2634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2c30983
Wait for search indexer after inserting rows.
labkey-danield Aug 15, 2025
d22af1e
Exclude (){} from default value in name expression.
labkey-danield Aug 15, 2025
de195b1
Merge branch 'develop' into fb_miscTestFixes
labkey-danield Aug 15, 2025
1925cd2
Exclude _ from default value in name expression.
labkey-danield Aug 15, 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
3 changes: 2 additions & 1 deletion src/org/labkey/test/tests/SampleTypeNameExpressionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,9 @@ public class SampleTypeNameExpressionTest extends BaseWebDriverTest
{
private static final String PROJECT_NAME = "SampleType_Name_Expression_Test";

// Issue 53548: Naming Pattern with a default value containing a () or {} cannot be saved.
private static final String DEFAULT_SAMPLE_PARENT_VALUE = "SS" +
EscapeUtil.escapeForNameExpression(TestDataGenerator.randomString(3));
EscapeUtil.escapeForNameExpression(TestDataGenerator.randomString(3, "{}()_"));

private static final String PARENT_SAMPLE_TYPE = "PS" + DOMAIN_TRICKY_CHARACTERS;
private static final String PARENT_SAMPLE_TYPE_INPUT = escapeForNameExpression(PARENT_SAMPLE_TYPE);
Expand Down
2 changes: 2 additions & 0 deletions src/org/labkey/test/tests/SampleTypeRenameTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ public void testSampleTypeFieldRename() throws IOException, CommandException
testDataGenerator.addCustomRow(Map.of(FIELD_INT, intVal++));
testDataGenerator.insertRows();

SearchAdminAPIHelper.waitForIndexer();

goToProjectHome();
SampleTypeHelper sampleHelper = new SampleTypeHelper(this);
UpdateSampleTypePage updatePage = sampleHelper.goToEditSampleType(sampleTypeName);
Expand Down