Merge branch 'develop' into fb_customizeView53197

Author: cnathe

src/org/labkey/test/WebDriverWrapper.java

@@ -1358,6 +1358,11 @@ public String getDisplayName()
         return whoAmI().getDisplayName();
     }
 
+    public int getCurrentUserId()
+    {
+        return whoAmI().getUserId().intValue();
+    }
+
     public String getCurrentDateTimeFormatString()
     {
         return (String)executeScript("return LABKEY.container.formats.dateTimeFormat");
@@ -2962,10 +2967,11 @@ public void mouseOut()
         catch (WebDriverException ignore) { }
     }
 
-    public void mouseOver(Locator l)
+    public WebElement mouseOver(Locator l)
     {
         WebElement el = l.findElement(getDriver());
         mouseOver(el);
+        return el;
     }
 
     public void mouseOver(WebElement el)

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

@@ -56,6 +56,7 @@
 import org.labkey.test.params.list.IntListDefinition;
 import org.labkey.test.params.list.ListDefinition;
 import org.labkey.test.util.DataRegionTable;
+import org.labkey.test.util.LabKeyExpectedConditions;
 import org.labkey.test.util.LogMethod;
 import org.labkey.test.util.LoggedParam;
 import org.labkey.test.util.Maps;
@@ -1215,7 +1216,8 @@ private void doTestReportIcon()
     private void doTestReportCreatedDate()
     {
         log("Verify module report \"created\" date");
-        click(Locator.tag("span").withClass("fa-list-ul").notHidden());
+        WebElement detailsLink = Locator.tag("span").withClass("fa-list-ul").notHidden().findElement(getDriver());
+        doAndWaitForPageToLoad(() -> shortWait().until(LabKeyExpectedConditions.clickUntilStale(detailsLink)));
         waitForText("August 01 2015");
     }
 

src/org/labkey/test/tests/issues/IssuesTest.java

@@ -262,6 +262,8 @@ public void generalTest() throws Exception
         fields.add(new FieldDefinition("Note", new FieldDefinition.StringLookup("lists", getLookupTableName("issues", "Note"))));
         fields.add(new FieldDefinition("Module", new FieldDefinition.StringLookup("lists", getLookupTableName("issues", "Module"))));
 
+        fields.add(new FieldDefinition("StringWithDefault", FieldDefinition.ColumnType.String));
+
         clickProject(getProjectName());
         waitAndClickAndWait(Locator.linkContainingText(ISSUE_SUMMARY_WEBPART_NAME));
         IssuesAdminPage adminPage = _issuesHelper.goToAdmin();
@@ -272,6 +274,14 @@ public void generalTest() throws Exception
         }
         clickButton("Save");
 
+        // configure a string field with a default value
+        adminPage = _issuesHelper.goToAdmin();
+        adminPage.getFieldsPanel().getField("StringWithDefault")
+                .clickAdvancedSettings()
+                .clickDefaultValuesLink();  // should land us in
+        setFormElement(Locator.input("stringWithDefault"), "StringWithDefault (default value)");
+        clickButton("Save Defaults");
+
         clickProject(getProjectName());
         waitAndClickAndWait(Locator.linkContainingText(ISSUE_SUMMARY_WEBPART_NAME));
 
@@ -295,6 +305,9 @@ public void generalTest() throws Exception
         if (!isElementPresent(fifthStringLocator))
             fifthStringLocator = Locator.name("myfifthstring");
         selectOptionByText(fifthStringLocator, "Polonium");
+        // clear out the default value on insert
+        setFormElement(Locator.name("stringWithDefault"), "");
+
         clickButton("Save");
 
         // find issueId - parse the text from first space to :
@@ -305,6 +318,7 @@ public void generalTest() throws Exception
                 "Milestone", "My Integer", "My Second Integer", "My First String", "My Third String", "My Fourth String", "My Fifth String");
         assertTextNotPresent("MySecondString", "My Second String");
         assertElementPresent(Locator.linkWithText("http://www.issues.test"));
+        assertTextNotPresent("StringWithDefault", "StringWithDefault (default value)");
 
         // ListAction
         clickAndWait(Locator.linkWithText("Issues List"));
@@ -596,6 +610,8 @@ public void requiredFieldsTest()
     @Test
     public void viewSelectedDetailsTest()
     {
+
+
         DataRegionTable issuesTable = new DataRegionTable(ISSUE_LIST_REGION_NAME, getDriver());
 
         issuesTable.setFilter("Status", "Has Any Value", null);

src/org/labkey/test/tests/list/ListTest.java

@@ -49,6 +49,7 @@
 import org.labkey.test.pages.ImportDataPage;
 import org.labkey.test.pages.list.EditListDefinitionPage;
 import org.labkey.test.pages.list.GridPage;
+import org.labkey.test.pages.query.UpdateQueryRowPage;
 import org.labkey.test.params.FieldDefinition;
 import org.labkey.test.params.FieldDefinition.StringLookup;
 import org.labkey.test.params.FieldInfo;
@@ -508,6 +509,32 @@ public void testNameTrimming()
         checker().withScreenshot().verifyEquals("Name not trimmed as expected", trimmedName, editList.getName());
     }
 
+    @Test // Issue 52339
+    public void testLongName()
+    {
+        String listName = "A_+-:''.¡™£¢∞§¶•ªº–≠œ∑´®†¥¨ˆøπ“‘«æ…¬˚∆˙©√ƒ∂ßΩ≈ç√∫µ≤≥÷‹›fifl‡°·‚—±⁄€‹›‡‰Æ«»¢∫√∑∏∂";
+        String fieldWithDefault = TestDataGenerator.randomFieldName("With Default");
+        EditListDefinitionPage listEditPage = _listHelper.beginCreateList(getProjectName(), listName);
+        listEditPage.manuallyDefineFieldsWithAutoIncrementingKey("Key");
+        listEditPage.addField(new FieldDefinition(fieldWithDefault, ColumnType.String));
+        listEditPage.clickSave();
+
+        listEditPage = _listHelper.goToEditDesign(listName);
+        var page = listEditPage.getFieldsPanel()
+                .expand()
+                .getField(fieldWithDefault)
+                .clickAdvancedSettings()
+                .clickDefaultValuesLink();
+        var input = Locator.tagContainingText("td", "With Default").followingSibling("td").descendant("input").findElement(page.getDriver());
+        setFormElement(input, "42");
+        clickButton("Save Defaults");
+        _listHelper.beginAtList(getProjectName(), listName);
+
+        DataRegionTable list = new DataRegionTable("query", getDriver());
+        UpdateQueryRowPage updatePage = list.clickInsertNewRow();
+        checker().verifyEquals("Default value not as expected ", "42", updatePage.getTextInputValue(fieldWithDefault));
+        updatePage.submit();
+    }
     /* Issue 51572: Bug with creating a new list by uploading a csv file in "UTF-8 with BOM" format
      */
     @Test

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

@@ -171,24 +171,29 @@ public void checkAuditEventDiffCount(String containerPath, AuditEvent auditEvent
     }
     public void checkAuditEventDiffCount(String containerPath, AuditEvent auditEventName, List<Filter> filters, List<Integer> expectedDiffCounts) throws IOException, CommandException
     {
-        Integer maxRows = expectedDiffCounts.size();
-        List<Map<String, Object>> events = getAuditLogsFromLKS(containerPath, auditEventName, List.of("InventoryUpdateType", "NewRecordMap"), filters, maxRows, ContainerFilter.CurrentAndSubfolders).getRows();
+        checkAuditEventDiffCount(containerPath, auditEventName, "NewRecordMap", filters, expectedDiffCounts);
+    }
+
+    public void checkAuditEventDiffCount(String containerPath, AuditEvent auditEventName, String eventDiffFieldName, List<Filter> filters, List<Integer> expectedDiffCounts) throws IOException, CommandException
+    {
+        Integer maxRows = filters == null || filters.isEmpty() ? expectedDiffCounts.size() : null;
+        List<Map<String, Object>> events = getAuditLogsFromLKS(containerPath, auditEventName, List.of("InventoryUpdateType", eventDiffFieldName), filters, maxRows, ContainerFilter.CurrentAndSubfolders).getRows();
         assertEquals("Unexpected number of events", expectedDiffCounts.size(), events.size());
         for (int i = 0; i < expectedDiffCounts.size(); i++)
         {
             Map<String, Object> event = events.get(i);
             boolean isInventoryUpdateType = event.get("InventoryUpdateType") != null;
             int expectedDiffCount = isInventoryUpdateType ? 0 : expectedDiffCounts.get(i);
-            String dataChangesStr = (String) event.get("NewRecordMap");
+            String dataChangesStr = (String) event.get(eventDiffFieldName);
             String[] dataChanges = dataChangesStr != null ? dataChangesStr.split("&") : new String[0];
 
             // filter out SampleStateLabel as that is not a change, it is added for display purposes
             dataChanges = Stream.of(dataChanges).filter(s -> !s.toLowerCase().startsWith("samplestatelabel=")).toArray(String[]::new);
             // filter out RowId as that is not a change, it is added for display purposes
             dataChanges = Stream.of(dataChanges).filter(s -> !s.toLowerCase().startsWith("rowid=")).toArray(String[]::new);
 
-            TestLogger.log("Audit record data changes diff count check: " + dataChangesStr);
-            assertEquals("Audit record data changes did not include the expected number of diffs, expected " + expectedDiffCount + " but was " + dataChanges.length + ": " + dataChangesStr,
+            TestLogger.log("Audit record data changes diff count check (" + eventDiffFieldName + "): " + dataChangesStr);
+            assertEquals("Audit record data changes did not include the expected number of diffs in " + eventDiffFieldName + ", expected " + expectedDiffCount + " but was " + dataChanges.length + ": " + dataChangesStr,
                     expectedDiffCount, dataChanges.length);
         }
     }