Merge pull request #101 from LabKey/fb_merge_21.11_to_develop

Merge discvr-21.11 to develop

Author: bbimber

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

@@ -23,6 +23,7 @@
 import org.labkey.test.WebDriverWrapper;
 import org.labkey.test.util.DataRegionTable;
 import org.labkey.test.util.Ext4Helper;
+import org.labkey.test.util.LogMethod;
 import org.labkey.test.util.UIAssayHelper;
 import org.labkey.test.util.ext4cmp.Ext4CmpRef;
 import org.labkey.test.util.ext4cmp.Ext4ComboRef;
@@ -225,9 +226,13 @@ public Locator getAssayWell(String text, String color)
         return Locator.xpath("//div[contains(@style, '" + color + "') and normalize-space() = '" + text + "']");
     }
 
-    public String getPageText()
+    private String removeSpaces(String text)
     {
-        String text = _test.getHtmlSource();
+        if (text == null)
+        {
+            return null;
+        }
+
         //the browser converts line breaks to spaces.  this is a hack to get them back
         text = text.replaceAll("<[^>]+>|&[^;]+;", "");
         text = text.replaceAll(" {2,}", " ");
@@ -252,6 +257,7 @@ public void goToAssayResultImport(String assayName, boolean supportsTemplates)
         _test.waitForText("Data Import");
     }
 
+    @LogMethod(quiet = true)
     public String clickAndGetExampleData()
     {
         Locator btn = Locator.linkContainingText("Download Example Data");
@@ -274,6 +280,7 @@ public String clickAndGetExampleData()
         return getExampleData(currentWindow);
     }
 
+    @LogMethod(quiet = true)
     private String getExampleData(String currentWindow)
     {
         String ret = null;
@@ -282,11 +289,12 @@ private String getExampleData(String currentWindow)
         Assert.assertTrue("Expected more than one open window, was: " + handles.size(), handles.size() > 1);
         for (String handle : _test.getDriver().getWindowHandles())
         {
+            _test.log("window: " + handle);
             if (!currentWindow.equals(handle))
             {
                 _test.getDriver().switchTo().window(handle);
                 ret = _test.shortWait().withMessage("Unable to retrieve example data")
-                        .until(wd -> StringUtils.trimToNull(getPageText()));
+                        .until(wd -> removeSpaces(StringUtils.trimToNull(_test.getHtmlSource())));
 
                 _test.getDriver().close();
                 _test.getDriver().switchTo().window(currentWindow);