From 2c30983b7f87b98acfb2a3b7437e86f0e28fd9ba Mon Sep 17 00:00:00 2001 From: labkey-danield Date: Thu, 14 Aug 2025 18:50:03 -0700 Subject: [PATCH 1/3] Wait for search indexer after inserting rows. --- 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); From d22af1e423fb37fd1b3c61e715ba7cb57fbdbc4a Mon Sep 17 00:00:00 2001 From: labkey-danield Date: Thu, 14 Aug 2025 18:59:16 -0700 Subject: [PATCH 2/3] Exclude (){} from default value in name expression. --- src/org/labkey/test/tests/SampleTypeNameExpressionTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/org/labkey/test/tests/SampleTypeNameExpressionTest.java b/src/org/labkey/test/tests/SampleTypeNameExpressionTest.java index 92a15c23ff..c07cfdfbec 100644 --- a/src/org/labkey/test/tests/SampleTypeNameExpressionTest.java +++ b/src/org/labkey/test/tests/SampleTypeNameExpressionTest.java @@ -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); From 1925cd29973e57082b26265573d8690d5b8da605 Mon Sep 17 00:00:00 2001 From: labkey-danield Date: Fri, 15 Aug 2025 12:02:08 -0700 Subject: [PATCH 3/3] Exclude _ from default value in name expression. --- src/org/labkey/test/tests/SampleTypeNameExpressionTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/labkey/test/tests/SampleTypeNameExpressionTest.java b/src/org/labkey/test/tests/SampleTypeNameExpressionTest.java index c07cfdfbec..b94a595909 100644 --- a/src/org/labkey/test/tests/SampleTypeNameExpressionTest.java +++ b/src/org/labkey/test/tests/SampleTypeNameExpressionTest.java @@ -75,7 +75,7 @@ public class SampleTypeNameExpressionTest extends BaseWebDriverTest // 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);