Merge discvr-21.11 to develop

Author: bbimber

LDK/test/src/org/labkey/test/util/external/labModules/LabModuleHelper.java

@@ -239,7 +239,7 @@ private String removeSpaces(String text)
         text = text.replaceAll("<[^>]+>|&[^;]+;", "");
         text = text.replaceAll(" {2,}", " ");
         text = text.replaceAll(", ", ",\n").replaceAll("] ", "]\n");
-        return text;
+        return StringUtils.trimToNull(text);
     }
 
     public void goToAssayResultImport(String assayName)
@@ -259,7 +259,6 @@ public void goToAssayResultImport(String assayName, boolean supportsTemplates)
         _test.waitForText("Data Import");
     }
 
-    @LogMethod(quiet = true)
     public String clickAndGetExampleData()
     {
         Locator btn = Ext4Helper.Locators.ext4ButtonEnabled("Download Example Data");
@@ -282,22 +281,29 @@ public String clickAndGetExampleData()
         return getExampleData(currentWindow);
     }
 
-    @LogMethod(quiet = true)
     private String getExampleData(String currentWindow)
     {
         String ret = null;
 
         Set<String> handles = _test.getDriver().getWindowHandles();
-        Assert.assertTrue("Expected more than one open window, was: " + handles.size(), handles.size() > 1);
-        for (String handle : _test.getDriver().getWindowHandles())
+        Assert.assertEquals("Expected more than one open window, found: " + StringUtils.join(handles, ","), 2, handles.size());
+        _test.log("Current window: " + currentWindow + ", all: [" + StringUtils.join(handles, ",") + "]");
+        for (String handle : handles)
         {
-            _test.log("window: " + handle);
             if (!currentWindow.equals(handle))
             {
+                _test.log("switching to: " + handle);
                 _test.getDriver().switchTo().window(handle);
-                ret = _test.shortWait().withMessage("Unable to retrieve example data")
+                ret = _test.shortWait().withMessage("Unable to retrieve example data after shortWait")
                         .until(wd -> removeSpaces(StringUtils.trimToNull(_test.getHtmlSource())));
 
+                if (StringUtils.trimToNull(ret) == null)
+                {
+                    _test.checker().takeScreenShot("DownloadExampleData" + handle);
+                }
+
+                Assert.assertNotNull("Unable to retrieve example data for window: " + handle, ret);
+
                 _test.getDriver().close();
                 _test.getDriver().switchTo().window(currentWindow);
             }