Merge remote-tracking branch 'origin/develop' into fb_htmlwriter

Author: labkey-adam

gradle.properties

@@ -1,16 +1,16 @@
 apacheCommonsCsvVersion=1.14.0
 
-aspectjVersion=1.9.23
+aspectjVersion=1.9.24
 
 assertjVersion=3.27.3
 
 awaitilityVersion=4.3.0
 
 lookfirstSardineVersion=5.13
 
-jettyVersion=12.0.18
+jettyVersion=12.0.21
 
-seleniumVersion=4.27.0
+seleniumVersion=4.33.0
 
 mockserverNettyVersion=5.15.0
 

modules/simpletest/module.properties

@@ -1,4 +1,4 @@
 Name: simpletest
-SchemaVersion: 25.000
+SchemaVersion: 25.001
 SupportedDatabases: mssql, pgsql
 ManageVersion: true

modules/simpletest/resources/schemas/dbscripts/postgresql/vehicle-25.000-25.001.sql

@@ -0,0 +1 @@
+CREATE UNIQUE INDEX AK_Name ON vehicle.Manufacturers (Name);

modules/simpletest/resources/schemas/dbscripts/sqlserver/vehicle-25.000-25.001.sql

@@ -0,0 +1 @@
+CREATE UNIQUE INDEX AK_Name ON vehicle.Manufacturers (Name);

src/org/labkey/test/BaseWebDriverTest.java

@@ -40,7 +40,7 @@
 import org.junit.runners.model.MultipleFailureException;
 import org.junit.runners.model.Statement;
 import org.junit.runners.model.TestTimedOutException;
-import org.labkey.api.query.QueryKey;
+import org.labkey.api.query.FieldKey;
 import org.labkey.junit.rules.TestWatcher;
 import org.labkey.remoteapi.CommandException;
 import org.labkey.remoteapi.CommandResponse;
@@ -218,7 +218,7 @@ public abstract class BaseWebDriverTest extends LabKeySiteWrapper implements Cle
 
     public static final double DELTA = 10E-10;
 
-    public static final String[] ILLEGAL_QUERY_KEY_CHARACTERS = QueryKey.ILLEGAL;
+    public static final String[] ILLEGAL_QUERY_KEY_CHARACTERS = FieldKey.ILLEGAL;
     public static final String ALL_ILLEGAL_QUERY_KEY_CHARACTERS = StringUtils.join(ILLEGAL_QUERY_KEY_CHARACTERS, "");
     // See TSVWriter.shouldQuote. Generally we are not able to use the tab and new line characters when creating field names in the UI, but including here for completeness
     public static final String[] TRICKY_IMPORT_FIELD_CHARACTERS = {"\\", "\"", "\\t", ",", "\\n", "\\r"};

src/org/labkey/test/TestFileUtils.java

@@ -48,13 +48,15 @@
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
+import java.io.BufferedWriter;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -470,7 +472,12 @@ public static File writeTempFile(String name, String contents) throws IOExceptio
      */
     public static File writeFile(File file, String contents) throws IOException
     {
-        try (Writer writer = PrintWriters.getPrintWriter(file))
+        return writeFile(file, contents, false);
+    }
+
+    public static File writeFile(File file, String contents, boolean append) throws IOException
+    {
+        try (Writer writer = new OutputStreamWriter(new FileOutputStream(file, append), StandardCharsets.UTF_8))
         {
             writer.write(contents);
             return file;
@@ -578,10 +585,10 @@ private static List<File> unTar(final File inputFile, final File outputDir) thro
     {
         final List<File> untaredFiles = new ArrayList<>();
         try (InputStream is = new FileInputStream(inputFile);
-             TarArchiveInputStream inputStream = (TarArchiveInputStream) new ArchiveStreamFactory().createArchiveInputStream("tar", is))
+             TarArchiveInputStream inputStream = new ArchiveStreamFactory().createArchiveInputStream("tar", is))
         {
             TarArchiveEntry entry;
-            while ((entry = (TarArchiveEntry) inputStream.getNextEntry()) != null)
+            while ((entry = inputStream.getNextEntry()) != null)
             {
                 final File outputFile = new File(outputDir, entry.getName());
                 if (entry.isDirectory())
@@ -598,7 +605,7 @@ private static List<File> unTar(final File inputFile, final File outputDir) thro
                 {
                     try (OutputStream outputFileStream = new FileOutputStream(outputFile))
                     {
-                        org.apache.commons.compress.utils.IOUtils.copy(inputStream, outputFileStream);
+                        IOUtils.copy(inputStream, outputFileStream);
                     }
                 }
                 untaredFiles.add(outputFile);

src/org/labkey/test/WebDriverWrapper.java

@@ -3434,7 +3434,7 @@ public void setFormElement(Locator l, String text)
      */
     public void setFormElement(WebElement el, String text)
     {
-        String inputType = el.getAttribute("type");
+        String inputType = el.getDomAttribute("type");
 
         if ("file".equals(inputType))
         {

src/org/labkey/test/components/ManageSampleStatusesPanel.java

@@ -158,7 +158,7 @@ public boolean isLocked()
     public List<String> getStatusNames()
     {
         return elementCache().statusItems
-                .findElements(this)
+                .waitForElements(this, 2_000)
                 .stream()
                 .map(WebElement::getText)
                 .collect(Collectors.toList());

src/org/labkey/test/components/react/Tabs.java

@@ -53,24 +53,34 @@ public WebDriver getDriver()
         return _driver;
     }
 
+    public WebElement findTab(String tabText)
+    {
+        return elementCache().findTab(tabText);
+    }
+
     public WebElement findPanelForTab(String tabText)
     {
-        return elementCache().findTabPanel(tabText);
+        return elementCache().findTabPanel(elementCache().findTab(tabText));
     }
 
     public WebElement selectTab(String tabText)
     {
         WebElement tab = elementCache().findTab(tabText);
         getWrapper().scrollIntoView(tab);
         tab.click();
-        WebElement panel = findPanelForTab(tabText);
+        WebElement panel = elementCache().findTabPanel(tab);
         getWrapper().shortWait().until(ExpectedConditions.visibilityOf(panel));
         return panel;
     }
 
+    public WebElement findPanelForActiveTab()
+    {
+        return elementCache().findTabPanel(elementCache().findSelectedTab());
+    }
+
     public boolean isTabSelected(String tabText)
     {
-        return Boolean.valueOf(elementCache().findTab(tabText).getAttribute("aria-selected"));
+        return Boolean.valueOf(elementCache().findTab(tabText).getDomAttribute("aria-selected"));
     }
 
     public List<String> getTabText()
@@ -80,6 +90,16 @@ public List<String> getTabText()
                 .stream().map(WebElement::getText).toList();
     }
 
+    public String getSelectedTabText()
+    {
+        return elementCache().findSelectedTab().getText();
+    }
+
+    public String getSelectedTabKey()
+    {
+        return elementCache().findSelectedTab().getDomAttribute("data-event-key");
+    }
+
     @Override
     protected ElementCache newElementCache()
     {
@@ -102,6 +122,11 @@ public ElementCache()
             }
         }
 
+        protected WebElement findSelectedTab()
+        {
+            return tabLoc.withAttribute("aria-selected", "true").findElement(this);
+        }
+
         List<WebElement> findAllTabs()
         {
             if (tabs.isEmpty())
@@ -125,25 +150,25 @@ WebElement findTab(String tabText)
                 catch (NoSuchElementException ex)
                 {
                     throw new NoSuchElementException(String.format("'%s' not among available tabs: %s",
-                            tabText, getWrapper().getTexts(findAllTabs())), ex);
+                        tabText, getWrapper().getTexts(findAllTabs())), ex);
                 }
                 tabMap.put(tabText, tabEl);
             }
             return tabMap.get(tabText);
         }
 
         // Tab panels can be updated and changed when flipping between tabs. Don't persist the panel element find it each time.
-        WebElement findTabPanel(String tabText)
+        WebElement findTabPanel(WebElement tabElement)
         {
-            String panelId = findTab(tabText).getAttribute("aria-controls");
+            String panelId = tabElement.getDomAttribute("aria-controls");
             WebElement panelEl;
             try
             {
                 panelEl = Locator.id(panelId).findElement(tabContent);
             }
             catch (NoSuchElementException ex)
             {
-                throw new NoSuchElementException("Panel not found for tab : " + tabText, ex);
+                throw new NoSuchElementException("Panel not found for tab : " + tabElement.getText(), ex);
             }
 
             return panelEl;