Merge 25.7 to develop (#2551)

Author: labkey-teamcity

src/org/labkey/test/TestFileUtils.java

@@ -64,6 +64,8 @@
 import java.nio.file.Paths;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.security.Security;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -105,6 +107,9 @@ public static String getFileContents(final File file)
         return getFileContents(path);
     }
 
+    /**
+     * Get text content of a file. Will throw an error for non-text files (e.g. PDF).
+     */
     public static String getFileContents(Path path)
     {
         try
@@ -117,6 +122,21 @@ public static String getFileContents(Path path)
         }
     }
 
+    /**
+     * Compute MD5 hash for the given file. Useful checking file equivalence.
+     */
+    public static String getMD5Hash(Path path)
+    {
+        try
+        {
+            return new String(MessageDigest.getInstance("MD5").digest(Files.readAllBytes(path)), StandardCharsets.UTF_8);
+        }
+        catch (IOException | NoSuchAlgorithmException fail)
+        {
+            throw new RuntimeException(fail);
+        }
+    }
+
     public static String getStreamContentsAsString(InputStream is) throws IOException
     {
         return StringUtils.join(IOUtils.readLines(is, Charset.defaultCharset()).toArray(), System.lineSeparator());

src/org/labkey/test/pages/reports/ScriptReportPage.java

@@ -17,8 +17,9 @@
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 
 import static org.labkey.test.components.ext4.Checkbox.Ext4Checkbox;
@@ -89,12 +90,25 @@ public String saveReport(String name, boolean isSaveAs, int wait)
         {
             saveReportWithName(name, isSaveAs);
         }
-        return Objects.requireNonNullElse(getReportId(), reportIdBeforeSave);
+        String reportIdAfterSave = getReportId();
+        return reportIdAfterSave == null ? reportIdBeforeSave : reportIdAfterSave;
     }
 
     public String getReportId()
     {
-        return getUrlParam("reportId", true);
+        String paramName = "reportId";
+
+        Map<String, String> params = WebTestHelper.parseUrlQuery(getURL());
+        String paramValue = params.get(paramName);
+
+        if (paramValue == null)
+        {
+            paramValue = params.entrySet().stream()
+                    .filter(entry -> entry.getKey().endsWith("." + paramName))
+                    .map(Map.Entry::getValue).findFirst().orElse(null);
+        }
+
+        return paramValue == null ? null : URLDecoder.decode(paramValue, StandardCharsets.UTF_8);
     }
 
     /**

src/org/labkey/test/tests/FileAttachmentColumnTest.java

@@ -550,9 +550,9 @@ private void validateSampleData(String sampleType, String folderPath, List<File>
                  {
                      // verify fie download behavior
                      File downloadedFile = doAndWaitForDownload(() -> optionalFileLink.get().click());
-                     checker().wrapAssertion(() -> Assertions.assertThat(TestFileUtils.getFileContents(downloadedFile))
+                     checker().wrapAssertion(() -> Assertions.assertThat(TestFileUtils.getMD5Hash(downloadedFile.toPath()))
                              .as("expect the downloaded file to be the expected file")
-                             .isEqualTo(TestFileUtils.getFileContents(file)));   // guard against renames like file2.xyz
+                             .isEqualTo(TestFileUtils.getMD5Hash(file.toPath())));   // guard against renames like file2.xyz
                  }
             }
         }
@@ -576,9 +576,9 @@ private void validateAssayRun(String assayName, String folderPath, String runNam
         if (optionalFileLink.isPresent())
         {
             var file = doAndWaitForDownload(()-> optionalFileLink.get().click());
-            checker().wrapAssertion(()-> Assertions.assertThat(TestFileUtils.getFileContents(file))
+            checker().wrapAssertion(()-> Assertions.assertThat(TestFileUtils.getMD5Hash(file.toPath()))
                     .as("expect the downloaded file to have equivalent content")
-                    .isEqualTo(TestFileUtils.getFileContents(runFile)));
+                    .isEqualTo(TestFileUtils.getMD5Hash(runFile.toPath())));
         }
 
         var resultsPage = runsPage.clickAssayIdLink(runName);
@@ -644,9 +644,9 @@ private void validateDatasetData(String datasetName, String folderPath, List<Fil
                 {
                     // verify fie download behavior
                     File downloadedFile = doAndWaitForDownload(() -> optionalFileLink.get().click());
-                    checker().wrapAssertion(() -> Assertions.assertThat(TestFileUtils.getFileContents(downloadedFile))
+                    checker().wrapAssertion(() -> Assertions.assertThat(TestFileUtils.getMD5Hash(downloadedFile.toPath()))
                             .as("expect the downloaded file to be the expected file")
-                            .isEqualTo(TestFileUtils.getFileContents(file)));   // guard against renames like file2.xyz
+                            .isEqualTo(TestFileUtils.getMD5Hash(file.toPath())));   // guard against renames like file2.xyz
                 }
             }
         }

src/org/labkey/test/tests/SimpleModuleTest.java

@@ -850,7 +850,7 @@ private void validateThumbnails(String thumbnailImage, @Nullable String thumbnai
             Locator popup = Locator.tag("div").withAttribute("id", "helpDiv").descendant("img").withAttributeContaining("src", popupImage).
                     withAttributeContaining("style", popupWidth != null ? "width:" + popupWidth : "max-width:300px");
             shortWait().until(ExpectedConditions.visibilityOfElementLocated(By.cssSelector("#helpDiv")));
-            String src = StringUtils.trimToEmpty(popup.findElement(getDriver()).getDomAttribute("src"));
+            String src = StringUtils.trimToEmpty(popup.findElement(getDriver()).getDomProperty("src"));
 
             fireEvent(thumbnail, SeleniumEvent.mouseout);
             Locator.tagWithClass("th", "labkey-selectors").findElement(getDriver()).click(); // safe out-click in the first header cell
@@ -1230,7 +1230,7 @@ private void verifyReportThumbnail(@LoggedParam String reportTitle)
         WebElement reportLink = waitForElement(Locator.xpath("//a[text()='" + reportTitle + "']"));
         mouseOver(reportLink);
         WebElement thumbnail = waitForElement(Locator.xpath("//div[@class='thumbnail']/img").notHidden());
-        String thumbnailData = WebTestHelper.getHttpResponse(thumbnail.getDomAttribute("src")).getResponseBody();
+        String thumbnailData = WebTestHelper.getHttpResponse(thumbnail.getDomProperty("src")).getResponseBody();
 
         int lengthToCompare = 5000;
         int diff = LevenshteinDistance.getDefaultInstance().apply(expectedThumbnail.substring(0, lengthToCompare), thumbnailData.substring(0, lengthToCompare));