[bot] Fast-forward for 25.12.0

src/org/labkey/test/TestProperties.java

@@ -20,6 +20,7 @@
 import org.labkey.serverapi.reader.Readers;
 import org.labkey.test.util.CspLogUtil;
 import org.labkey.test.util.TestLogger;
+import org.labkey.test.util.Version;
 import org.openqa.selenium.Dimension;
 
 import java.io.File;
@@ -73,6 +74,31 @@ public abstract class TestProperties
             TestLogger.error("Failed to load " + propFile.getName() + " file. Running with hard-coded defaults");
             ioe.printStackTrace(System.err);
         }
+
+        final List<String> gradleProperties = List.of("labkeyVersion");
+        final File serverPropFile = new File(TestFileUtils.getLabKeyRoot(), "gradle.properties");
+        if (serverPropFile.exists())
+        {
+            try (Reader propReader = Readers.getReader(serverPropFile))
+            {
+                TestLogger.log("Loading properties from " + serverPropFile.getName());
+                Properties properties = new Properties();
+                properties.load(propReader);
+                for (String key : gradleProperties)
+                {
+                    if (properties.containsKey(key))
+                    {
+                        System.setProperty(key, properties.getProperty(key));
+                    }
+                }
+            }
+            catch (IOException ioe)
+            {
+                TestLogger.error("Failed to load " + serverPropFile.getName() + " file.");
+                ioe.printStackTrace(System.err);
+            }
+        }
+
     }
 
     private static ZoneId browserZoneId = null;
@@ -83,6 +109,19 @@ public static void load()
         CspLogUtil.init();
     }
 
+    /// Get the local enlistment version, stripping everything past the minor version.
+    /// - `"25.11.0"` -> `"25.11"`
+    /// - `"25.11-SNAPSHOT"` -> `"25.11"`
+    /// @return Enlistment Version or `null` if unable to determine
+    public static Version getProductVersion()
+    {
+        Version version = new Version(System.getProperty("labkeyVersion", "1"));
+        if (version.size() >= 2)
+            return version.trim(2);
+        else
+            return null;
+    }
+
     public static boolean isTestCleanupSkipped()
     {
         return !getBooleanProperty("clean", false);

src/org/labkey/test/tests/upgrade/BaseUpgradeTest.java

@@ -36,7 +36,7 @@ public abstract class BaseUpgradeTest extends BaseWebDriverTest
 
     protected static final boolean isUpgradeSetupPhase = TestProperties.getBooleanProperty("webtest.upgradeSetup", true);
     protected static final Version previousVersion = Optional.ofNullable(trimToNull(System.getProperty("webtest.upgradePreviousVersion")))
-        .map(Version::new).orElse(null);
+        .map(Version::new).orElse(TestProperties.getProductVersion());
 
     @Override
     protected boolean skipCleanup(boolean afterTest)
@@ -114,7 +114,7 @@ private static class UpgradeVersionCheck implements TestRule
                 @Override
                 public void evaluate() throws Throwable
                 {
-                    Assume.assumeTrue("Test doesn't support upgrading from version: " + previousVersion,
+                    Assume.assumeTrue("Test not valid when upgrading from version: " + previousVersion,
                         VersionRange.versionRange(earliestVersion, latestVersion).contains(previousVersion)
                     );
                     base.evaluate();

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<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;
@@ -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()

src/org/labkey/test/util/AuditLogHelper.java

@@ -188,10 +188,16 @@ public DataRegionTable goToAuditEventView(String eventType)
      */
     public SelectRowsResponse getAuditLogsFromLKS(String containerPath, AuditEvent auditEventName, List<String> columnNames,
                                                         @Nullable List<Filter> filters, @Nullable Integer maxRows, @Nullable ContainerFilter containerFilter) throws IOException, CommandException
+    {
+        return getAuditLogsFromLKS(containerPath, _wrapper.getCurrentProject(), auditEventName, columnNames, filters, maxRows, containerFilter);
+    }
+
+    public SelectRowsResponse getAuditLogsFromLKS(String containerPath, @NotNull String projectName, AuditEvent auditEventName, List<String> columnNames,
+                                                  @Nullable List<Filter> filters, @Nullable Integer maxRows, @Nullable ContainerFilter containerFilter) throws IOException, CommandException
     {
         SelectRowsCommand cmd = new SelectRowsCommand("auditLog", auditEventName.getName());
         cmd.setColumns(columnNames);
-        cmd.addFilter("ProjectId/Name", _wrapper.getCurrentProject(), Filter.Operator.EQUAL);
+        cmd.addFilter("ProjectId/Name", projectName, Filter.Operator.EQUAL);
         if (filters != null)
             filters.forEach(cmd::addFilter);
         if (maxRows != null)
@@ -208,7 +214,7 @@ public List<Map<String, Object>> getAuditLogsForTransactionId(String containerPa
     }
 
     public List<Map<String, Object>> getAuditLogsForTransactionId(String containerPath, AuditEvent auditEventName, List<String> columnNames,
-                                                         Integer transactionId, List<Filter> eventFilters, @Nullable ContainerFilter containerFilter) throws IOException, CommandException
+                                                         Integer transactionId, @Nullable List<Filter> eventFilters, @Nullable ContainerFilter containerFilter) throws IOException, CommandException
     {
         List<Filter> transactionFilter = new ArrayList<>();
         if (transactionId != null)
@@ -218,6 +224,22 @@ public List<Map<String, Object>> getAuditLogsForTransactionId(String containerPa
         return getAuditLogsFromLKS(containerPath, auditEventName, columnNames, transactionFilter, null, containerFilter).getRows();
     }
 
+    public List<Map<String, Object>> getAuditLogsForTransactionId(String containerPath,
+                                                                  AuditEvent auditEventName,
+                                                                  List<String> columnNames,
+                                                                  String projectName,
+                                                                  Integer transactionId,
+                                                                  List<Filter> eventFilters,
+                                                                  @Nullable ContainerFilter containerFilter) throws IOException, CommandException
+    {
+        List<Filter> transactionFilter = new ArrayList<>();
+        if (transactionId != null)
+            transactionFilter.add(new Filter("TransactionId", transactionId, Filter.Operator.EQUAL));
+        if (eventFilters != null && !eventFilters.isEmpty())
+            transactionFilter.addAll(eventFilters);
+        return getAuditLogsFromLKS(containerPath, projectName, auditEventName, columnNames, transactionFilter, null, containerFilter).getRows();
+    }
+
     public void checkAuditEventValuesForTransactionId(String containerPath, AuditEvent auditEventName, Integer transactionId, int rowCount, Map<String, Object> expectedValues) throws IOException, CommandException
     {
         checkAuditEventValuesForTransactionId(containerPath, auditEventName, transactionId, null, rowCount, expectedValues);

src/org/labkey/test/util/Version.java

@@ -15,24 +15,32 @@ public class Version implements Comparable<Version>
 {
     private final List<Integer> _version;
 
-    public Version(Integer... version)
+    private Version(List<Integer> version)
     {
         _version = validate(version);
     }
 
+    public Version(Integer... version)
+    {
+        this(List.of(version));
+    }
+
     public Version(String version)
     {
-        this(Arrays.stream(version.split("\\.")).map(Integer::parseInt).toArray(Integer[]::new));
+        this(Arrays.stream(version
+                .split("-", 2)[0] // Remove snapshot suffix
+                .split("\\.")) // Split the version into major, minor, patch, etc. parts
+                .map(Integer::parseInt).toList());
     }
 
     public Version(Double version)
     {
         this(version.toString());
     }
 
-    private static List<Integer> validate(Integer... versionParts)
+    private static List<Integer> validate(List<Integer> versionParts)
     {
-        List<Integer> partList = List.of(versionParts);
+        List<Integer> partList = List.copyOf(versionParts);
         if (partList.isEmpty())
         {
             throw new IllegalArgumentException("Version must have at least one part");
@@ -47,6 +55,19 @@ private static List<Integer> validate(Integer... versionParts)
         return partList;
     }
 
+    public Version trim(int maxParts)
+    {
+        if (maxParts == _version.size())
+            return this;
+        else
+            return new Version(_version.subList(0, maxParts));
+    }
+
+    public int size()
+    {
+        return _version.size();
+    }
+
     @Override
     public int compareTo(@NotNull Version o)
     {