diff --git a/src/org/labkey/test/util/DataRegionExportHelper.java b/src/org/labkey/test/util/DataRegionExportHelper.java index 3c7ff4bbe1..51ced06497 100644 --- a/src/org/labkey/test/util/DataRegionExportHelper.java +++ b/src/org/labkey/test/util/DataRegionExportHelper.java @@ -15,6 +15,7 @@ */ package org.labkey.test.util; +import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.jetbrains.annotations.Nullable; @@ -80,17 +81,19 @@ public String exportAndVerifyScript(ScriptExportType type, Consumer veri getWrapper().click(Locator.lkButton("Create Script")); getWrapper().switchToWindow(1); - StringBuilder scriptText = new StringBuilder(); - WebDriverWrapper.waitFor(() -> { - scriptText.append(getWrapper().getHtmlSource().trim()); - return scriptText.toString().split("\n").length > 1; // All exported scripts should be longer than one line + String scriptText = WebDriverWrapper.waitFor(() -> { + String pageSrc = StringUtils.trimToEmpty(getWrapper().getHtmlSource()); + if (pageSrc.split("\n").length > 1) // All exported scripts should be longer than one line + return pageSrc; + else + return null; }, "Exported script was empty", 10000); - verification.accept(scriptText.toString()); + verification.accept(scriptText); getWrapper().getDriver().close(); getWrapper().switchToMainWindow(); - return scriptText.toString(); + return scriptText; } public Sheet exportXLSAndVerifyRowCountAndHeader(int numRows, Set expectedHeaders)