Skip to content

Avoid creating screenshots with illegal characters #2790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-tchad merged 2 commits into from
Dec 3, 2025
Merged

Avoid creating screenshots with illegal characters #2790

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50f1e29
Avoid creating screenshots with illegal characters
labkey-tchad Nov 20, 2025
860eeed
Merge branch 'release25.11-SNAPSHOT' into 25.11_fb_randomTestFailures
labkey-danield Nov 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions src/org/labkey/test/util/ArtifactCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String, AtomicInteger> _shotCounters = new HashMap<>();
private static final Pattern _illegalFileCharactersPattern = SystemUtils.IS_OS_WINDOWS
? Pattern.compile("[\\\\/:*?|\"<>]")
: Pattern.compile("/");
private static final Map<String, AtomicInteger> _shotCounters = new ConcurrentHashMap<>();

private final WebDriverWrapper _driver;
private final String _dumpDirName;
Expand Down Expand Up @@ -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()
Expand Down