From 50f1e29f1ad47125959c2ad2092a4c414bc319c8 Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Thu, 20 Nov 2025 12:52:49 -0800 Subject: [PATCH] Avoid creating screenshots with illegal characters --- src/org/labkey/test/util/ArtifactCollector.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/org/labkey/test/util/ArtifactCollector.java b/src/org/labkey/test/util/ArtifactCollector.java index cfd10f23f1..62694cd0a0 100644 --- a/src/org/labkey/test/util/ArtifactCollector.java +++ b/src/org/labkey/test/util/ArtifactCollector.java @@ -49,22 +49,18 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Base64; -import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicInteger; -import java.util.regex.Pattern; import static org.labkey.test.TestProperties.isTestRunningOnTeamCity; import static org.labkey.test.WebTestHelper.isLocalServer; public class ArtifactCollector { - private static final Map _shotCounters = new HashMap<>(); - private static final Pattern _illegalFileCharactersPattern = SystemUtils.IS_OS_WINDOWS - ? Pattern.compile("[\\\\/:*?|\"<>]") - : Pattern.compile("/"); + private static final Map _shotCounters = new ConcurrentHashMap<>(); private final WebDriverWrapper _driver; private final String _dumpDirName; @@ -172,7 +168,7 @@ public static void dumpThreads() private String buildBaseName(@NotNull String suffix) { - return getAndIncrementShotCounter() + "_" + _illegalFileCharactersPattern.matcher(suffix).replaceAll("_"); + return TestFileUtils.makeLegalFileName(getAndIncrementShotCounter() + "_" + suffix); } private int getAndIncrementShotCounter()