Use WorkbookUtil.createSafeSheetName(value, '_'); to create the valid sheet name.

labkey-danield · labkey-danield · commit dc5cef651ce6 · 2025-10-06T15:00:10.000-07:00
diff --git a/src/org/labkey/test/util/EscapeUtil.java b/src/org/labkey/test/util/EscapeUtil.java
@@ -16,6 +16,7 @@
 package org.labkey.test.util;
 
 import org.apache.commons.text.StringEscapeUtils;
+import org.apache.poi.ss.util.WorkbookUtil;
 import org.eclipse.jetty.util.URIUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -227,7 +228,7 @@ public static String escapeForNameExpression(String value)
      */
     public static String escapeForExcelSheetName(String value)
     {
-        return excelPageNeedsEscaping.matcher(value).replaceAll("_");
+        return WorkbookUtil.createSafeSheetName(value, '_');
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`package org.labkey.test.util;`
`17`	`17`
`18`	`18`	`import org.apache.commons.text.StringEscapeUtils;`
	`19`	`+import org.apache.poi.ss.util.WorkbookUtil;`
`19`	`20`	`import org.eclipse.jetty.util.URIUtil;`
`20`	`21`	`import org.jetbrains.annotations.NotNull;`
`21`	`22`	`import org.jetbrains.annotations.Nullable;`
`@@ -227,7 +228,7 @@ public static String escapeForNameExpression(String value)`
`227`	`228`	`*/`
`228`	`229`	`public static String escapeForExcelSheetName(String value)`
`229`	`230`	`{`
`230`		`- return excelPageNeedsEscaping.matcher(value).replaceAll("_");`
	`231`	`+ return WorkbookUtil.createSafeSheetName(value, '_');`
`231`	`232`	`}`
`232`	`233`
`233`	`234`	`/**`