Update locator for product menu icon links

Author: labkey-susanh

src/org/labkey/test/components/ui/navigation/ProductMenu.java

@@ -243,12 +243,12 @@ protected class ElementCache extends Component<?>.ElementCache
         private final WebElement folderColumn = Locator.tagWithClass("div", "col-folders").findWhenNeeded(menuContent);
         private final WebElement sectionContent = Locator.tagWithClass("div", "sections-content").findWhenNeeded(menuContent);
 
-        public Locator.XPathLocator dashboardIconLoc = Locator.tagWithClass("i", "fa-home");
+        public Locator.XPathLocator dashboardIconLoc = Locator.tagWithClass("span", "fa-home");
         public WebElement activeDashboardIcon = Locator.tagWithClass("div", "col-folders")
                 .descendant(Locator.tagWithClass("li", "active"))
                 .descendant(dashboardIconLoc)
                 .findWhenNeeded(menuContent);
-        public Locator.XPathLocator administrationIconLoc = Locator.tagWithClass("i", "fa-gear");
+        public Locator.XPathLocator administrationIconLoc = Locator.tagWithClass("span", "fa-gear");
         public WebElement activeAdministrationIcon = Locator.tagWithClass("div", "col-folders")
                 .descendant(Locator.tagWithClass("li", "active"))
                 .descendant(administrationIconLoc)

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

@@ -431,7 +431,10 @@ private Map<String, Object> generateRow()
         final Map<String, Object> newRow = new CaseInsensitiveHashMap<>();
         for (String columnName : _columns.keySet())
         {
-            _dataSuppliers.computeIfAbsent(columnName, k -> getDefaultDataSupplier(_columns.get(k)));
+            if (!_dataSuppliers.containsKey(columnName))
+            {
+                _dataSuppliers.put(columnName, getDefaultDataSupplier(_columns.get(columnName)));
+            }
 
             if (_autoGeneratedFields.contains(columnName))
             {