Merge 25.5 to develop

Author: labkey-teamcity

src/org/labkey/test/tests/core/admin/ShortUrlTest.java

@@ -73,7 +73,7 @@ private void doSetup()
     public void testShortUrl() throws Exception
     {
         String shortUrl = nextUrlKey();
-        String targetUrl = buildRelativeUrl("project", getProjectName(), "begin");
+        String targetUrl = WebTestHelper.getContextPath() + buildRelativeUrl("project", getProjectName(), "begin");
 
         ShortUrlAdminPage adminPage = ShortUrlAdminPage.beginAt(this);
         adminPage.createNewShortUrl(shortUrl, targetUrl);
@@ -95,7 +95,7 @@ public void testShortUrl() throws Exception
         });
 
         log("Update shortUrl target");
-        String updatedTargetUrl = buildRelativeUrl("project", "home", "begin");
+        String updatedTargetUrl = WebTestHelper.getContextPath() + buildRelativeUrl("project", "home", "begin");
 
         adminPage = ShortUrlAdminPage.beginAt(this);
         adminPage.createNewShortUrl(shortUrl, updatedTargetUrl);
@@ -149,7 +149,7 @@ public void testTrickyCharacters() throws Exception
         assertEquals("Row count with filter", 1, drt.getDataRowCount());
 
         String shortUrl = nextUrlKey();
-        String targetUrl = getCurrentRelativeURL();
+        String targetUrl = WebTestHelper.getContextPath() + getCurrentRelativeURL();
 
         ShortUrlAdminPage adminPage = ShortUrlAdminPage.beginAt(this);
         adminPage.createNewShortUrl(shortUrl, targetUrl);