Merge discvr-21.7 to discvr-21.11

Author: bbimber

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

@@ -255,6 +255,7 @@ public void goToAssayResultImport(String assayName, boolean supportsTemplates)
     public String clickAndGetExampleData()
     {
         Locator btn = Locator.linkContainingText("Download Example Data");
+        String currentWindow = _test.getDriver().getWindowHandle();
         _test.waitForElement(btn);
         _test.waitAndClick(btn);
 
@@ -270,25 +271,36 @@ public String clickAndGetExampleData()
             }
         }
 
-        return getExampleData();
+        return getExampleData(currentWindow);
     }
 
     public String getExampleData()
+    {
+        return getExampleData(_test.getDriver().getWindowHandle());
+    }
+
+    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);
-        String currentWindow = _test.getDriver().getWindowHandle();
         for (String handle : _test.getDriver().getWindowHandles())
         {
             if (!currentWindow.equals(handle))
             {
                 _test.getDriver().switchTo().window(handle);
-                String text = getPageText();
+                ret = StringUtils.trimToNull(getPageText());
+                if (ret == null)
+                {
+                    // NOTE: this fails intermittently. Perhaps due to loading timing?
+                    BaseWebDriverTest.sleep(1000);
+                    ret = StringUtils.trimToNull(getPageText());
+                }
+                Assert.assertNotNull("Unable to retrieve example data", StringUtils.trimToNull(ret));
+
                 _test.getDriver().close();
                 _test.getDriver().switchTo().window(currentWindow);
-                ret = StringUtils.trimToNull(text);
             }
         }