From d5c8e0362a886795ffc3ec5fb1d41f81d6865f41 Mon Sep 17 00:00:00 2001 From: labkey-danield Date: Mon, 18 Aug 2025 07:58:43 -0700 Subject: [PATCH 1/2] Exclude special characters from name expression. (Backport fix). --- src/org/labkey/test/tests/SampleTypeNameExpressionTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/org/labkey/test/tests/SampleTypeNameExpressionTest.java b/src/org/labkey/test/tests/SampleTypeNameExpressionTest.java index 827209e16e..264af5e0fe 100644 --- a/src/org/labkey/test/tests/SampleTypeNameExpressionTest.java +++ b/src/org/labkey/test/tests/SampleTypeNameExpressionTest.java @@ -71,7 +71,10 @@ public class SampleTypeNameExpressionTest extends BaseWebDriverTest { private static final String PROJECT_NAME = "SampleType_Name_Expression_Test"; - private static final String DEFAULT_SAMPLE_PARENT_VALUE = "SS" + TestDataGenerator.randomString(3).replaceAll("[_)]", "."); // '_' is used as delimiter to get batchRandomId and ) is used to close the defaultValue() + + // 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, "{}()_")); private static final String PARENT_SAMPLE_TYPE = "PS" + DOMAIN_TRICKY_CHARACTERS; private static final String PARENT_SAMPLE_TYPE_INPUT = escapeForNameExpression(PARENT_SAMPLE_TYPE); From 23039a476d8fc2c3b50f045148016efe77b0ac60 Mon Sep 17 00:00:00 2001 From: labkey-danield Date: Mon, 18 Aug 2025 08:01:44 -0700 Subject: [PATCH 2/2] Added a waitForIndexer. (Backport fix). --- src/org/labkey/test/tests/SampleTypeRenameTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/org/labkey/test/tests/SampleTypeRenameTest.java b/src/org/labkey/test/tests/SampleTypeRenameTest.java index f5f8d40a16..e61a745ea0 100644 --- a/src/org/labkey/test/tests/SampleTypeRenameTest.java +++ b/src/org/labkey/test/tests/SampleTypeRenameTest.java @@ -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);