Skip to content

Prevent NPE in exportAndVerifyScript #3175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-tchad merged 1 commit into from
Aug 25, 2026
+9 −6
Merged

Prevent NPE in exportAndVerifyScript #3175

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/org/labkey/test/util/DataRegionExportHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -80,17 +81,19 @@ public String exportAndVerifyScript(ScriptExportType type, Consumer<String> 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<String> expectedHeaders)
Expand Down