Skip to content

Update tests that relied on obsolete actions. #3001

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-klum merged 3 commits into from
May 18, 2026
+25 −24
Merged

Update tests that relied on obsolete actions. #3001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d14df98
Update tests that relied on obsolete actions.
labkey-klum May 15, 2026
1fb6fea
Update src/org/labkey/test/tests/TimeChartImportTest.java
labkey-klum May 18, 2026
6c4c2da
Code review feedback.
labkey-klum May 18, 2026
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
24 changes: 10 additions & 14 deletions src/org/labkey/test/BaseWebDriverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
import org.apache.commons.lang3.tuple.Pair;
import org.apache.hc.core5.http.HttpStatus;
import org.awaitility.Awaitility;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.json.JSONObject;
import org.jetbrains.annotations.NotNull;
import org.junit.Assume;
import org.junit.AssumptionViolatedException;
import org.junit.ClassRule;
Expand Down Expand Up @@ -1686,20 +1686,16 @@ public String getBaseURL()
protected void setSelectedFields(String containerPath, String schema, String query, String viewName, String[] fields)
{
pushLocation();
beginAt(WebTestHelper.buildURL("query", containerPath, "internalNewView"));
setFormElement(Locator.name("ff_schemaName"), schema);
setFormElement(Locator.name("ff_queryName"), query);
beginAt(WebTestHelper.buildURL("query", containerPath, "executeQuery", Map.of("schemaName", "query", "queryName", "CustomViews")));
DataRegionTable drt = new DataRegionTable("query", getDriver());
var queryRowPage = drt.clickInsertNewRow();
queryRowPage.setField("Schema", schema);
queryRowPage.setField("QueryName", query);
if (viewName != null)
setFormElement(Locator.name("ff_viewName"), viewName);
clickButton("Create");
StringBuilder strFields = new StringBuilder(fields[0]);
for (int i = 1; i < fields.length; i ++)
{
strFields.append("&");
strFields.append(fields[i]);
}
setFormElement(Locator.name("ff_columnList"), strFields.toString());
clickButton("Save");
queryRowPage.setField("Name", viewName);
queryRowPage.setField("Columns", String.join("&", fields));
queryRowPage.setField("Flags", "0");
queryRowPage.submit();
popLocation();
}

Expand Down
25 changes: 15 additions & 10 deletions src/org/labkey/test/tests/TimeChartImportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
import org.labkey.test.BaseWebDriverTest;
import org.labkey.test.Locator;
import org.labkey.test.TestFileUtils;
import org.labkey.test.WebTestHelper;
import org.labkey.test.categories.Charting;
import org.labkey.test.categories.Daily;
import org.labkey.test.categories.Reports;
import org.labkey.test.components.CustomizeView;
import org.labkey.test.util.DataRegionTable;
import org.labkey.test.util.Ext4Helper;
import org.labkey.test.util.PortalHelper;
Expand All @@ -35,7 +35,6 @@
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

/**
* This test imports a folder archive that has 2 subfolders (a date based study and a visit based study) which have been
Expand Down Expand Up @@ -312,17 +311,23 @@ public void verifyMaskedPtidOnPublishStudy()

log("Verify masked ptids in publish study reportInfo");
clickFolder(publishFolderName);
for (TimeChartInfo chartInfo : VISIT_CHARTS)

// verify the report descriptor XML does not contain the masked ptid
goToSchemaBrowser();
DataRegionTable drt = viewQueryData("core", "Reports");
CustomizeView customizeView = drt.openCustomizeGrid();
customizeView.addColumn("DescriptorXML");
customizeView.applyCustomView();

drt = new DataRegionTable("query", getDriver());
int xmlIdx = drt.getColumnIndex("DescriptorXML");
Comment thread
labkey-klum marked this conversation as resolved.

for (int row=0; row < drt.getDataRowCount(); row++)
{
clickTab("Clinical and Assay Data");
waitAndClickAndWait(Locator.linkWithText(chartInfo.getName()));
beginAt(WebTestHelper.buildURL("reports",
getProjectName() + "/" + VISIT_STUDY_FOLDER_NAME + "/" + publishFolderName,
"reportInfo", Map.of("reportId", getUrlParam("reportId"))));
waitForText("Report Debug Information");
String descriptor = drt.getDataAsText(row, xmlIdx);
for (String origMouseId : origMouseIds)
{
assertTextNotPresent(origMouseId);
Assert.assertFalse("Unexpected masked ptid in report descriptor : " + descriptor, descriptor.contains(origMouseId));
}
}
}
Expand Down