Merge branch 'develop' into fb_allowFileExtensionAutoTest

Author: labkey-danield

build.gradle

@@ -26,6 +26,7 @@ project.dependencies {
     implementation("commons-io:commons-io:${commonsIoVersion}")
     implementation("com.fasterxml.jackson.core:jackson-annotations:${jacksonAnnotationsVersion}")
     implementation("org.bouncycastle:bcprov-jdk18on:${bouncycastleVersion}")
+    implementation("org.apache.commons:commons-csv:${apacheCommonsCsvVersion}")
 
     //api "org.seleniumhq.selenium:selenium-server:${seleniumVersion}"
     implementation("org.seleniumhq.selenium:selenium-firefox-driver:${seleniumVersion}")

gradle.properties

@@ -1,10 +1,17 @@
+apacheCommonsCsvVersion=1.14.0
+
 aspectjVersion=1.9.23
+
 assertjVersion=3.27.3
+
 awaitilityVersion=4.3.0
 
 lookfirstSardineVersion=5.13
+
 jettyVersion=12.0.18
+
 seleniumVersion=4.27.0
+
 mockserverNettyVersion=5.15.0
 
 labkeySchemasTestVersion=25.3-SNAPSHOT

src/org/labkey/test/Locator.java

@@ -25,6 +25,7 @@
 import org.labkey.test.selenium.ReclickingWebElement;
 import org.labkey.test.selenium.RefindingWebElement;
 import org.labkey.test.util.TestLogger;
+import org.labkey.test.util.TextUtils;
 import org.labkey.test.util.selenium.WebDriverUtils;
 import org.openqa.selenium.By;
 import org.openqa.selenium.InvalidSelectorException;
@@ -185,23 +186,30 @@ protected WebDriver getWebDriver(SearchContext context)
      */
     public static WebElement waitForAnyElement(FluentWait<? extends SearchContext> wait, final Locator... locators)
     {
-        return wait.until(new Function<SearchContext, WebElement>()
+        try
         {
-            @Override
-            public WebElement apply(SearchContext context)
+            return wait.until(new Function<SearchContext, WebElement>()
             {
-                return findAnyElementOrNull(context, locators);
-            }
+                @Override
+                public WebElement apply(SearchContext context)
+                {
+                    return findAnyElementOrNull(context, locators);
+                }
 
-            @Override
-            public String toString()
-            {
-                List<String> locDescriptions = new ArrayList<>();
-                Arrays.stream(locators).forEach(loc -> locDescriptions.add(loc.getLoggableDescription()));
-                SearchContext searchContext = extractInputFromFluentWait(wait);
-                return String.join("\n--OR--\n", locDescriptions) + (searchContext instanceof WebDriver ? "" : "\nIN: " + searchContext.toString());
-            }
-        });
+                @Override
+                public String toString()
+                {
+                    List<String> locDescriptions = new ArrayList<>();
+                    Arrays.stream(locators).forEach(loc -> locDescriptions.add(loc.getLoggableDescription()));
+                    SearchContext searchContext = extractInputFromFluentWait(wait);
+                    return String.join("\n--OR--\n", locDescriptions) + (searchContext instanceof WebDriver ? "" : "\nIN: " + searchContext.toString());
+                }
+            });
+        }
+        catch (TimeoutException e)
+        {
+            throw new NoSuchElementException(e.getMessage(), e);
+        }
     }
 
     /**
@@ -210,28 +218,34 @@ public String toString()
      */
     public static List<WebElement> waitForElements(FluentWait<? extends SearchContext> wait, final Locator... locators)
     {
-        return wait.until(new Function<SearchContext, List<WebElement>>()
+        try
         {
-            @Override
-            public List<WebElement> apply(SearchContext context)
-            {
-                List<WebElement> els = findElements(context, locators);
-                if (els.size() > 0)
-                    return els;
-                else
-                    return null;
-            }
-
-            @Override
-            public String toString()
+            return wait.until(new Function<SearchContext, List<WebElement>>()
             {
-                List<String> locDescriptions = new ArrayList<>();
-                Arrays.stream(locators).forEach(loc -> locDescriptions.add(loc.getLoggableDescription()));
-                SearchContext searchContext = extractInputFromFluentWait(wait);
-                return String.join("\n--OR--\n", locDescriptions) + (searchContext instanceof WebDriver ? "" : "\nIN: " + searchContext.toString());
-            }
-        });
+                @Override
+                public List<WebElement> apply(SearchContext context)
+                {
+                    List<WebElement> els = findElements(context, locators);
+                    if (!els.isEmpty())
+                        return els;
+                    else
+                        return null;
+                }
 
+                @Override
+                public String toString()
+                {
+                    List<String> locDescriptions = new ArrayList<>();
+                    Arrays.stream(locators).forEach(loc -> locDescriptions.add(loc.getLoggableDescription()));
+                    SearchContext searchContext = extractInputFromFluentWait(wait);
+                    return String.join("\n--OR--\n", locDescriptions) + (searchContext instanceof WebDriver ? "" : "\nIN: " + searchContext.toString());
+                }
+            });
+        }
+        catch (TimeoutException e)
+        {
+            throw new NoSuchElementException(e.getMessage(), e);
+        }
     }
 
     public static List<WebElement> findElements(SearchContext context, final Locator... locators)
@@ -984,7 +998,7 @@ public static String xq(String value)
      */
     private static String ns(String value)
     {
-        return value.replaceAll("\\s+", " ").trim();
+        return TextUtils.normalizeSpace(value);
     }
 
     public static String cq(String value)

src/org/labkey/test/components/domain/DomainFieldRow.java

@@ -19,6 +19,7 @@
 import org.labkey.test.pages.core.admin.BaseSettingsPage.TIME_FORMAT;
 import org.labkey.test.params.FieldDefinition;
 import org.labkey.test.util.LabKeyExpectedConditions;
+import org.labkey.test.util.selenium.WebElementUtils;
 import org.openqa.selenium.ElementNotInteractableException;
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.SearchContext;
@@ -1795,8 +1796,8 @@ public WebElement hitSelectionCriteriaButton()
 
         public List<String> hitSelectionCriteria()
         {
-            return getWrapper().getTexts(Locator.tagWithClass("li", "hit-criteria-renderer__field-value")
-                    .findElements(this));
+            return Locator.tagWithClass("li", "hit-criteria-renderer__field-value")
+                    .findElements(this).stream().map(WebElementUtils::getTextContent).toList();
         }
 
         public RadioButton aliquotOption(ExpSchema.DerivationDataScopeType option)

src/org/labkey/test/components/domain/HitSelectionDialog.java

@@ -1,19 +1,14 @@
 package org.labkey.test.components.domain;
 
 import org.labkey.test.Locator;
-import org.labkey.test.components.Component;
-import org.labkey.test.components.WebDriverComponent;
 import org.labkey.test.components.bootstrap.ModalDialog;
-import org.labkey.test.components.html.Input;
 import org.labkey.test.components.ui.search.FilterExpressionPanel;
-import org.labkey.test.pages.LabKeyPage;
+import org.labkey.test.util.selenium.WebElementUtils;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 
 import java.util.List;
 
-import static org.labkey.test.components.html.Input.Input;
-
 
 public class HitSelectionDialog extends ModalDialog
 {
@@ -23,9 +18,9 @@ public HitSelectionDialog(WebDriver driver)
         super(new ModalDialogFinder(driver));
     }
 
-    public List<String> getAvailableFields()
+    public List<String> getAvailableFieldLabels()
     {
-        return getWrapper().getTexts(elementCache().findFieldOptions());
+        return elementCache().findFieldOptions().stream().map(WebElementUtils::getTextContent).toList();
     }
 
     public FilterExpressionPanel selectField(String fieldName)

src/org/labkey/test/components/react/BaseReactSelect.java

@@ -23,6 +23,7 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static org.labkey.test.WebDriverWrapper.WAIT_FOR_JAVASCRIPT;
@@ -365,7 +366,7 @@ public List<WebElement> getOptionElements()
      *
      * @return List of strings for the values in the list.
      */
-    public List<String> getOptions()
+    public List<String> getOptions(Function<WebElement, String> optionMapper)
     {
 
         boolean alreadyOpened = isExpanded();
@@ -374,16 +375,20 @@ public List<String> getOptions()
         if (!alreadyOpened)
             open();
 
-        List<WebElement> selectedItems = Locators.listItems.findElements(getComponentElement());
-        List<String> rawItems = getWrapper().getTexts(selectedItems);
+        List<WebElement> optionElements = Locators.listItems.findElements(getComponentElement());
+        List<String> rawItems = optionElements.stream().map(optionMapper).toList();
 
         // If it wasn't open before close it, otherwise leave it in the open state.
         if (!alreadyOpened)
             close();
 
-        return rawItems.stream().map(String::trim).collect(Collectors.toList());
+        return rawItems;
     }
 
+    public List<String> getOptions()
+    {
+        return getOptions(el -> el.getText().trim());
+    }
 
     public String getName()
     {

src/org/labkey/test/components/react/FilteringReactSelect.java

@@ -163,7 +163,7 @@ public FilteringReactSelect filterSelect(String value, Locator elementToWaitFor)
         return this;
     }
 
-    private List<WebElement> setFilter(String value)
+    public List<WebElement> setFilter(String value)
     {
         open();
         elementCache().input.sendKeys(value);

src/org/labkey/test/components/ui/entities/EntityBulkUpdateDialog.java

@@ -44,6 +44,7 @@ public EntityBulkUpdateDialog(WebDriver driver, UpdatingComponent updatingCompon
     {
         super(new ModalDialogFinder(driver).withTitle("Update "));
         _updatingComponent = updatingComponent;
+        getWrapper().mouseOver(elementCache().title); // avoid accidentally triggering tooltips
     }
 
     /**
@@ -212,9 +213,8 @@ public List<String> getFieldNames()
     {
         List<WebElement> labels = Locator.tagWithClass("label", "control-label").withAttribute("for")
                 .waitForElements(elementCache(), 2_000);
-        List<String> columns = new ArrayList<>();
-        labels.forEach(a -> columns.add(a.getDomAttribute("for")));
-        return columns;
+
+        return labels.stream().map(a -> EscapeUtil.fieldKeyDecodePart(a.getDomAttribute("for"))).toList();
     }
 
     public EntityBulkUpdateDialog waitForFieldsToBe(List<String> expectedFieldNames, int waitMilliseconds)

src/org/labkey/test/components/ui/grids/DetailTable.java

@@ -15,6 +15,7 @@
 import java.util.Map;
 
 import static org.labkey.test.WebDriverWrapper.WAIT_FOR_JAVASCRIPT;
+import static org.labkey.test.util.selenium.WebElementUtils.getTextContent;
 
 /**
  * This is a 'special' table that has only two columns, and no header. An example of this table can be seen in the
@@ -155,7 +156,7 @@ public Map<String, String> getTableDataByLabel()
         {
             List<WebElement> tds = tableRow.findElements(By.tagName("td"));
 
-            tableData.put(tds.get(0).getText(), tds.get(1).getText());
+            tableData.put(getTextContent(tds.get(0)), tds.get(1).getText());
         }
 
         return tableData;