From 7829e4020b79a3c295a1ca55eb9963563eba3b4d Mon Sep 17 00:00:00 2001 From: labkey-danield Date: Tue, 29 Jul 2025 14:44:56 -0700 Subject: [PATCH] Allow for '_' to be in the default value used in the name expression. --- src/org/labkey/test/tests/SampleTypeNameExpressionTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/org/labkey/test/tests/SampleTypeNameExpressionTest.java b/src/org/labkey/test/tests/SampleTypeNameExpressionTest.java index 11cd7afea0..92a15c23ff 100644 --- a/src/org/labkey/test/tests/SampleTypeNameExpressionTest.java +++ b/src/org/labkey/test/tests/SampleTypeNameExpressionTest.java @@ -675,8 +675,10 @@ private void verifyNames(String sampleTypeName, String header, String nameExpres DataRegionTable materialTable = new DataRegionTable("Material", this); List names = materialTable.getColumnDataAsText("Name"); + // The next two lines assume the name expression has specific values in specific locations, and as far as I + // can tell, that is how the tests are written. assertTrue("First name (" + names.get(0) + ") expected to start with " + defaultValue + "_ but it did not", names.get(0).startsWith(defaultValue + "_")); - String batchRandomId = names.get(0).split("_")[1]; + String batchRandomId = names.get(0).substring(names.get(0).lastIndexOf("_") + 1); assertEquals("Second name not as expected", name2 + "_" + batchRandomId, names.get(1));