Merge discvr-21.3 to discvr-21.7

Author: bbimber

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

@@ -17,6 +17,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.Nullable;
+import org.junit.Assert;
 import org.labkey.test.BaseWebDriverTest;
 import org.labkey.test.Locator;
 import org.labkey.test.util.DataRegionTable;
@@ -250,6 +251,8 @@ public void goToAssayResultImport(String assayName, boolean supportsTemplates)
 
     public String getExampleData()
     {
+        String ret = null;
+
         String currentWindow = _test.getDriver().getWindowHandle();
         for (String handle : _test.getDriver().getWindowHandles())
         {
@@ -259,10 +262,13 @@ public String getExampleData()
                 String text = getPageText();
                 _test.getDriver().close();
                 _test.getDriver().switchTo().window(currentWindow);
-                return text;
+                ret = StringUtils.trimToNull(text);
             }
         }
-        return null;
+
+        Assert.assertNotNull("Unable to retrieve example data", StringUtils.trimToNull(ret));
+
+        return ret;
     }
 
     public Locator toolIcon(String name)