[bot] Merge 25.7 to develop (Conflicts)

src/org/labkey/serverapi/util/UsageReportingLevel.java

@@ -0,0 +1,11 @@
+package org.labkey.serverapi.util;
+
+/**
+ * org.labkey.api.util.UsageReportingLevel
+ */
+public enum UsageReportingLevel
+{
+    NONE,
+    ON,
+    ON_WITHOUT_UPGRADE_MESSAGE
+}

src/org/labkey/test/pages/admin/ConfigureSystemMaintenancePage.java

@@ -0,0 +1,47 @@
+package org.labkey.test.pages.admin;
+
+import org.labkey.test.Locator;
+import org.labkey.test.WebDriverWrapper;
+import org.labkey.test.WebTestHelper;
+import org.labkey.test.pages.LabKeyPage;
+import org.labkey.test.pages.pipeline.PipelineStatusDetailsPage;
+import org.openqa.selenium.WebDriver;
+
+public class ConfigureSystemMaintenancePage extends LabKeyPage<ConfigureSystemMaintenancePage.ElementCache>
+{
+    public ConfigureSystemMaintenancePage(WebDriver driver)
+    {
+        super(driver);
+    }
+
+    public static ConfigureSystemMaintenancePage beginAt(WebDriverWrapper webDriverWrapper)
+    {
+        webDriverWrapper.beginAt(WebTestHelper.buildURL("admin", "configureSystemMaintenance"));
+        return new ConfigureSystemMaintenancePage(webDriverWrapper.getDriver());
+    }
+
+    /**
+     * Run the specified maintenance task and switch to the window that opens
+     * @param description task description
+     */
+    public PipelineStatusDetailsPage runMaintenanceTask(String description)
+    {
+        click(Locator.tagWithAttribute("input", "type", "checkbox")
+            .followingSibling("a").withText(description));
+        getDriver().switchTo().window("systemMaintenance");
+
+        PipelineStatusDetailsPage pipelineStatusDetailsPage = new PipelineStatusDetailsPage(getDriver());
+        pipelineStatusDetailsPage.waitForComplete();
+        return pipelineStatusDetailsPage;
+    }
+
+    @Override
+    protected ElementCache newElementCache()
+    {
+        return new ElementCache();
+    }
+
+    protected class ElementCache extends LabKeyPage<ElementCache>.ElementCache
+    {
+    }
+}

src/org/labkey/test/pages/admin/FolderAliasesPage.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2017-2019 LabKey Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.labkey.test.pages.admin;
+
+import org.apache.commons.lang3.StringUtils;
+import org.labkey.test.Locator;
+import org.labkey.test.pages.LabKeyPage;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class FolderAliasesPage extends LabKeyPage<FolderAliasesPage.ElementCache>
+{
+    public FolderAliasesPage(WebDriver driver)
+    {
+        super(driver);
+    }
+
+    public List<String> getAliases()
+    {
+        String aliases = getFormElement(elementCache().aliases);
+        return Arrays.asList(aliases.split("\\R"));
+    }
+
+    public FolderAliasesPage setAliases(List<String> aliases)
+    {
+        setFormElement(elementCache().aliases, StringUtils.join(aliases, "\n"));
+        return this;
+    }
+
+    public FolderManagementPage clickSave()
+    {
+        elementCache().saveBtn.click();
+        return new FolderManagementPage(getDriver());
+    }
+    public FolderManagementPage clickCancel()
+    {
+        elementCache().cancelBtn.click();
+        return new FolderManagementPage(getDriver());
+    }
+
+    @Override
+    protected ElementCache newElementCache()
+    {
+        return new ElementCache();
+    }
+
+    protected class ElementCache extends LabKeyPage<?>.ElementCache
+    {
+        WebElement aliases = Locator.textarea("aliases").findWhenNeeded(this);
+
+        WebElement saveBtn = Locator.lkButton("Save Aliases").refindWhenNeeded(this);
+        WebElement cancelBtn = Locator.button("Cancel").refindWhenNeeded(this);
+    }
+}

src/org/labkey/test/pages/admin/FolderManagementPage.java

@@ -166,6 +166,12 @@ protected ElementCache newElementCache()
         return new ElementCache();
     }
 
+    public FolderAliasesPage goToAliases()
+    {
+        beginAt(WebTestHelper.buildRelativeUrl("admin", getCurrentContainerPath(), "folderAliases"));
+        return new FolderAliasesPage(getDriver());
+    }
+
     protected class ElementCache extends LabKeyPage.ElementCache
     {
         private final Map<String, WebElement> tabs = new HashMap<>();

src/org/labkey/test/pages/core/admin/ShowAdminPage.java

@@ -21,6 +21,7 @@
 import org.labkey.test.components.DomainDesignerPage;
 import org.labkey.test.pages.ConfigureReportsAndScriptsPage;
 import org.labkey.test.pages.LabKeyPage;
+import org.labkey.test.pages.admin.ConfigureSystemMaintenancePage;
 import org.labkey.test.pages.admin.ExternalSourcesPage;
 import org.labkey.test.pages.compliance.ComplianceSettingsAccountsPage;
 import org.labkey.test.pages.core.login.LoginConfigurePage;
@@ -230,10 +231,11 @@ public void clickSiteWideTerms()
         clickAndWait(elementCache().siteWideTermsLink);
     }
 
-    public void clickSystemMaintenance()
+    public ConfigureSystemMaintenancePage clickSystemMaintenance()
     {
         goToSettingsSection();
         clickAndWait(elementCache().systemMaintenanceLink);
+        return new ConfigureSystemMaintenancePage(getDriver());
     }
 
     public void clickSystemProperties()

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

@@ -34,6 +34,7 @@
 import org.labkey.test.categories.Hosting;
 import org.labkey.test.components.ext4.Window;
 import org.labkey.test.pages.FolderManagementFolderTree;
+import org.labkey.test.pages.admin.FolderAliasesPage;
 import org.labkey.test.pages.admin.FolderManagementPage;
 import org.labkey.test.pages.admin.ReorderFoldersPage;
 import org.labkey.test.pages.list.BeginPage;
@@ -44,9 +45,11 @@
 import org.labkey.test.util.LoggedParam;
 import org.labkey.test.util.PasswordUtil;
 import org.labkey.test.util.PortalHelper;
+import org.labkey.test.util.WikiHelper;
 import org.labkey.test.util.WorkbookHelper;
 import org.openqa.selenium.WebElement;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -99,6 +102,70 @@ public static void testSetup()
         init.moveTestProjectToTop();
     }
 
+    @Test
+    public void testAliases()
+    {
+        String firstContent = "This is the first folder";
+        String secondContent = "This is the second folder";
+        String originalName1 = "OriginalName1" + TRICKY_CHARACTERS_FOR_PROJECT_NAMES;
+        String originalName2 = "OriginalName2" + TRICKY_CHARACTERS_FOR_PROJECT_NAMES;
+        String newName = "NewName" + TRICKY_CHARACTERS_FOR_PROJECT_NAMES;
+        String additionalAlias = "AdditionalAlias" + TRICKY_CHARACTERS_FOR_PROJECT_NAMES;
+
+        // Create folders and give them a wiki as content so we can be sure we land in the right spot when following an alias
+        _containerHelper.createSubfolder(getProjectName(), originalName1);
+        createWikiAndAddToPortal(firstContent, originalName1);
+        _containerHelper.createSubfolder(getProjectName(), originalName2);
+        createWikiAndAddToPortal(secondContent, originalName2);
+
+        _containerHelper.renameFolder(getProjectName(), originalName1, newName, true);
+        navigateToFolder(getProjectName(), newName);
+        assertTextPresent(firstContent);
+
+        // Ensure the alias was created and works
+        beginAt(WebTestHelper.buildURL("project", getProjectName() + "/" + originalName1 , "begin"));
+        assertTextPresent(firstContent);
+        FolderAliasesPage aliasesPage = goToFolderManagement().goToAliases();
+        List<String> aliases = new ArrayList<>(aliasesPage.getAliases());
+        // Ensure it's being saved as lower case
+        assertEquals(Arrays.asList(("/" + getProjectName() + "/" + originalName1).toLowerCase()), aliases);
+        aliases.add("/" + getProjectName() + "/" + additionalAlias);
+        aliasesPage.setAliases(aliases);
+        aliasesPage.clickSave();
+
+        beginAt(WebTestHelper.buildURL("project", getProjectName() + "/" + originalName1 , "begin"));
+        assertTextPresent(firstContent);
+        beginAt(WebTestHelper.buildURL("project", getProjectName() + "/" + additionalAlias , "begin"));
+        assertTextPresent(firstContent);
+
+        // Steal the alias in another folder
+        navigateToFolder(getProjectName(), originalName2);
+        assertTextPresent(secondContent);
+        aliasesPage = goToFolderManagement().goToAliases();
+        aliasesPage.setAliases(Arrays.asList("/" + getProjectName() + "/" + additionalAlias));
+        aliasesPage.clickSave();
+        beginAt(WebTestHelper.buildURL("project", getProjectName() + "/" + additionalAlias , "begin"));
+        assertTextPresent(secondContent);
+    }
+
+    private void createWikiAndAddToPortal(String body, String folderName)
+    {
+        navigateToFolder(getProjectName(), folderName);
+        WikiHelper wikiHelper = new WikiHelper(this);
+        wikiHelper.createNewWikiPage("HTML");
+        String pageName = "ReferencePoint";
+        wikiHelper.setWikiName(pageName);
+        wikiHelper.setWikiTitle(pageName);
+        wikiHelper.setWikiBody(body);
+        wikiHelper.saveWikiPage();
+
+        navigateToFolder(getProjectName(), folderName);
+        PortalHelper portalHelper = new PortalHelper(this);
+        portalHelper.addBodyWebPart("Wiki");
+        wikiHelper.clickChooseAPage();
+        wikiHelper.saveChosenPage();
+    }
+
     @LogMethod
     private void moveTestProjectToTop()     // todo: use FolderManagementPage, ReorderFoldersPage
     {