Add fuzz names for domains to Selenium Tests - LKB/FM

src/org/labkey/test/BaseWebDriverTest.java

@@ -67,6 +67,7 @@
 import org.labkey.test.params.ContainerInfo;
 import org.labkey.test.params.FieldDefinition;
 import org.labkey.test.params.FieldKey;
+import org.labkey.test.params.SchemaKey;
 import org.labkey.test.teamcity.TeamCityUtils;
 import org.labkey.test.util.APIAssayHelper;
 import org.labkey.test.util.APIContainerHelper;
@@ -140,6 +141,7 @@
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -2187,32 +2189,38 @@ public void searchFor(final String projectName, String searchFor, final Integer
             assertTextPresent(searchFor);
         }
     }
-    public void selectSchema(String schemaName)
+
+    /**
+     * @param schemaKey encoded schema key
+     */
+    public void selectSchema(String schemaKey)
     {
-        String[] schemaParts = schemaName.split("\\.");
-        selectSchema(schemaParts);
+        selectSchema(SchemaKey.parse(schemaKey));
     }
-    // Helper methods for interacting with the query schema browser
+
     public void selectSchema(String[] schemaParts)
     {
-        StringBuilder schemaWithParents = new StringBuilder();
-        String separator = "";
-        for (String schemaPart : schemaParts)
+        selectSchema(SchemaKey.fromParts(schemaParts));
+    }
+
+    public void selectSchema(SchemaKey schemaKey)
+    {
+        Iterator<SchemaKey> iterator = schemaKey.getIterator();
+        while (iterator.hasNext())
         {
-            schemaWithParents.append(separator).append(schemaPart);
-            separator = ".";
+            schemaKey = iterator.next();
 
-            Locator.XPathLocator loc = Locator.tag("tr").withClass("x4-grid-row").append("/td/div/span").withText(schemaPart).precedingSibling("img").withClass("x4-tree-icon");
+            Locator.XPathLocator loc = Locator.tag("tr").withClass("x4-grid-row").append("/td/div/span").withText(schemaKey.getName()).precedingSibling("img").withClass("x4-tree-icon");
 
             //first load of schemas might a few seconds
             shortWait().until(ExpectedConditions.elementToBeClickable(loc));
-            Locator.XPathLocator selectedSchema = Locator.xpath("//tr").withClass("x4-grid-row-selected").append("/td/div/span").withText(schemaPart);
+            Locator.XPathLocator selectedSchema = Locator.xpath("//tr").withClass("x4-grid-row-selected").append("/td/div/span").withText(schemaKey.getName());
 
-            if (getDriver().getCurrentUrl().endsWith("schemaName=" + schemaPart))
+            if (getDriver().getCurrentUrl().endsWith("schemaName=" + EscapeUtil.encode(schemaKey.toString())))
                 waitForElement(selectedSchema);
             if (isElementPresent(selectedSchema))
                 continue; // already selected
-            log("Selecting schema " + schemaWithParents + " in the schema browser...");
+            log("Selecting schema " + schemaKey.getFullName() + " in the schema browser...");
             waitForElementToDisappear(Locator.xpath("//tbody[starts-with(@id, 'treeview')]/tr[not(starts-with(@id, 'treeview'))]"));
             // select/expand tree node
             try
@@ -2243,19 +2251,23 @@ public void selectSchema(String[] schemaParts)
 
     public void selectQuery(String schemaName, String queryName)
     {
-        selectQuery(schemaName.split("\\."), queryName);
+        selectQuery(SchemaKey.parse(schemaName), queryName);
+    }
+
+    public void selectQuery(String[] schemaParts, String queryName)
+    {
+        selectQuery(SchemaKey.fromParts(schemaParts), queryName);
     }
 
-    public void selectQuery(String[] schemaPart, String queryName)
+    public void selectQuery(SchemaKey schemaKey, String queryName)
     {
-        String schemaName = StringUtils.join(schemaPart, ".");
-        log("Selecting query " + schemaName + "." + queryName + " in the schema browser...");
-        selectSchema(schemaPart);
+        log("Selecting query " + schemaKey.getFullName() + "." + queryName + " in the schema browser...");
+        selectSchema(schemaKey);
         mouseOver(Locator.byClass(".x4-tab-button")); // Move away from schema tree to dismiss tooltip
-        waitAndClick(Ext4Helper.Locators.tab(schemaName)); // Click schema tab to make sure query list is visible
+        waitAndClick(Ext4Helper.Locators.tab(schemaKey.getFullName())); // Click schema tab to make sure query list is visible
         WebElement queryLink = Locator.tagWithClass("table", "lk-qd-coltable").append(Locator.tagWithClass("span", "labkey-link")).withText(queryName).notHidden().waitForElement(getDriver(), WAIT_FOR_JAVASCRIPT);
         queryLink.click();
-        waitForElement(Locator.tagWithClass("div", "lk-qd-name").startsWith(schemaName + "." + queryName), 30000);
+        waitForElement(Locator.tagWithClass("div", "lk-qd-name").startsWith(schemaKey.getFullName() + "." + queryName), 30000);
     }
 
     public DataRegionTable viewQueryData(String schemaName, String queryName)

src/org/labkey/test/WebDriverWrapper.java

@@ -2462,11 +2462,17 @@ public static File[] getNewFiles(int minFileCount, File downloadDir, @Nullable F
                 },
                 "File(s) did not appear in download dir: " + downloadDir.toString(), WAIT_FOR_PAGE);
 
+        List<File> tempFiles = new ArrayList<>();
         waitFor(() -> {
                     final File[] files = downloadDir.listFiles(tempFilesFilter);
+                    tempFiles.clear();
+                    if (files != null)
+                    {
+                        tempFiles.addAll(Arrays.asList(files));
+                    }
                     return files != null && files.length == 0;
                 },
-                "Temp files remain in download dir: " + downloadDir, WAIT_FOR_PAGE);
+            () -> "Temp files remain in download dir: " + downloadDir + ": " + tempFiles.stream().map(File::getName).collect(Collectors.joining(", ")), WAIT_FOR_PAGE);
 
         MutableInt downloadSize = new MutableInt(-1);
         MutableInt stabilityDuration = new MutableInt(0);

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

@@ -83,6 +83,7 @@ public EntityBulkUpdateDialog setEditableState(CharSequence fieldIdentifier, boo
             toggle.set(enable);
             if (enable) _changeCounter++;
             else _changeCounter--;
+            getWrapper().mouseOut(); // Toggle is dangerously close to field info tooltip
         }
         return this;
     }
@@ -335,7 +336,7 @@ public List<String> getFieldNames()
         List<WebElement> labels = Locator.tagWithClass("label", "control-label").withAttribute("for")
                 .waitForElements(elementCache(), 2_000);
 
-        return labels.stream().map(a -> FieldKey.fromFieldKey(a.getDomAttribute("for")).getName()).toList();
+        return labels.stream().map(a -> FieldKey.fromFieldKey(a.getDomAttribute("for")).getFullName()).toList();
     }
 
     public EntityBulkUpdateDialog waitForFieldsToBe(List<String> expectedFieldNames, int waitMilliseconds)

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

@@ -170,7 +170,7 @@ public String getLabel()
 
         public String getName()
         {
-            return getFieldKey().getName();
+            return getFieldKey().getFullName();
         }
 
         public int getDomIndex()
@@ -192,14 +192,7 @@ protected FieldKey fieldKeySupplier()
                 path = getElement().getDomAttribute("id");
             }
 
-            if (path != null)
-            {
-                return FieldKey.fromFieldKey(path);
-            }
-            else
-            {
-                return FieldKey.EMPTY;
-            }
+            return FieldKey.fromFieldKey(path);
         }
     }
 }

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

@@ -22,6 +22,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static org.labkey.test.util.TextUtils.normalizeSpace;
 import static org.labkey.test.util.selenium.WebElementUtils.getTextContent;
 
 /**
@@ -180,13 +181,13 @@ public WebElement getAvailableFieldElement(FieldKey fieldKey)
             if(iterator.hasNext())
             {
                 // If the field is already expanded don't try to expand it.
-                if(!isFieldKeyExpanded(elementCache().findAvailableField(fieldKey.toString())))
-                    expandOrCollapseByFieldKey(fieldKey.toString(), true);
+                if(!isFieldKeyExpanded(elementCache().findAvailableField(fieldKey)))
+                    expandOrCollapseByFieldKey(fieldKey, true);
             }
 
         }
 
-        return elementCache().findAvailableField(fieldKey.toString());
+        return elementCache().findAvailableField(fieldKey);
     }
 
     /**
@@ -195,7 +196,7 @@ public WebElement getAvailableFieldElement(FieldKey fieldKey)
      * @param fieldKey The data-fieldkey value of the field to expand.
      * @param expand True to expand false to collapse.
      */
-    private void expandOrCollapseByFieldKey(String fieldKey, boolean expand)
+    private void expandOrCollapseByFieldKey(FieldKey fieldKey, boolean expand)
     {
 
         WebElement listItem = elementCache().findAvailableField(fieldKey);
@@ -433,7 +434,7 @@ public FieldSelectionDialog setFieldLabel(String fieldName, String newFieldLabel
      */
     public FieldSelectionDialog setFieldLabel(FieldKey fieldKey, String newFieldLabel)
     {
-        WebElement listItem = elementCache().findSelectedField(fieldKey.toString());
+        WebElement listItem = elementCache().findSelectedField(fieldKey);
         WebElement updateIcon = Locator.tagWithClass("span", "edit-inline-field__toggle").findWhenNeeded(listItem);
         updateIcon.click();
 
@@ -453,9 +454,9 @@ public FieldSelectionDialog setFieldLabel(FieldKey fieldKey, String newFieldLabe
 
         getWrapper().mouseOver(elementCache().title); // Dismiss tooltip
 
-        WebDriverWrapper.waitFor(()->!elementCache().fieldLabelEdit.isDisplayed() &&
-                        elementCache().getListItemElement(elementCache().selectedFieldsPanel, newFieldLabel).isDisplayed(),
+        WebDriverWrapper.waitFor(()->!elementCache().fieldLabelEdit.isDisplayed(),
                 String.format("New field label '%s' is not in the list.", newFieldLabel), 500);
+        Assert.assertEquals("Label after update", normalizeSpace(newFieldLabel), elementCache().getFieldLabel(fieldKey));
 
         return this;
     }
@@ -503,10 +504,10 @@ private List<WebElement> getSelectedListItems(String fieldLabel)
      * @param beforeTarget Will the field being moved go before (above) or after (below) the target field.
      * @return This dialog.
      */
-    public FieldSelectionDialog repositionField(String fieldToMove, String targetField, boolean beforeTarget)
+    public FieldSelectionDialog repositionField(FieldKey fieldToMove, FieldKey targetField, boolean beforeTarget)
     {
-        WebElement elementToMove = elementCache().getListItemElement(elementCache().selectedFieldsPanel, fieldToMove);
-        WebElement elementTarget = elementCache().getListItemElement(elementCache().selectedFieldsPanel, targetField);
+        WebElement elementToMove = elementCache().findSelectedField(fieldToMove);
+        WebElement elementTarget = elementCache().findSelectedField(targetField);
 
         int yBefore =  elementToMove.getRect().getY();
 
@@ -633,28 +634,27 @@ protected List<WebElement> getListItemElements(WebElement panel, String fieldLab
                     .findElements(panel);
         }
 
-        // Will get the first list item that matches the fieldLabel.
-        protected WebElement getListItemElement(WebElement panel, String fieldLabel)
+        protected String getFieldLabel(FieldKey fieldKey)
         {
-            return Locator.tagWithClass("div", "list-group-item")
-                    .withDescendant(Locator.tagWithClass("div", "field-caption").withText(fieldLabel))
-                    .findElement(panel);
+            return Locator.tagWithClass("div", "field-caption")
+                .findElement(findFieldRow(fieldKey, selectedFieldsPanel))
+                .getText();
         }
 
-        protected WebElement findSelectedField(String fieldKey)
+        protected WebElement findSelectedField(FieldKey fieldKey)
         {
             return findFieldRow(fieldKey, selectedFieldsPanel);
         }
 
-        protected WebElement findAvailableField(String fieldKey)
+        protected WebElement findAvailableField(FieldKey fieldKey)
         {
             return findFieldRow(fieldKey, availableFieldsPanel);
         }
 
-        protected WebElement findFieldRow(String fieldKey, WebElement panel)
+        protected WebElement findFieldRow(FieldKey fieldKey, WebElement panel)
         {
             return Locator.tagWithClass("div", "list-group-item")
-                .withAttributeIgnoreCase("data-fieldkey", fieldKey)
+                .withAttributeIgnoreCase("data-fieldkey", fieldKey.toString())
                 .findElement(panel);
         }