Skip to content

Commit 40ef9c2

Browse files
authored
Update tests that relied on obsolete actions. (#3001)
#### Rationale A recent PR removed some internal actions like `query.internalNewView` and `reports.reportInfo`. I've updated those tests to rely on alternate ways to accomplish the same actions.
1 parent 83d7de7 commit 40ef9c2

2 files changed

Lines changed: 25 additions & 24 deletions

File tree

src/org/labkey/test/BaseWebDriverTest.java

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
import org.apache.commons.lang3.tuple.Pair;
2525
import org.apache.hc.core5.http.HttpStatus;
2626
import org.awaitility.Awaitility;
27+
import org.jetbrains.annotations.NotNull;
2728
import org.jetbrains.annotations.Nullable;
2829
import org.json.JSONObject;
29-
import org.jetbrains.annotations.NotNull;
3030
import org.junit.Assume;
3131
import org.junit.AssumptionViolatedException;
3232
import org.junit.ClassRule;
@@ -1686,20 +1686,16 @@ public String getBaseURL()
16861686
protected void setSelectedFields(String containerPath, String schema, String query, String viewName, String[] fields)
16871687
{
16881688
pushLocation();
1689-
beginAt(WebTestHelper.buildURL("query", containerPath, "internalNewView"));
1690-
setFormElement(Locator.name("ff_schemaName"), schema);
1691-
setFormElement(Locator.name("ff_queryName"), query);
1689+
beginAt(WebTestHelper.buildURL("query", containerPath, "executeQuery", Map.of("schemaName", "query", "queryName", "CustomViews")));
1690+
DataRegionTable drt = new DataRegionTable("query", getDriver());
1691+
var queryRowPage = drt.clickInsertNewRow();
1692+
queryRowPage.setField("Schema", schema);
1693+
queryRowPage.setField("QueryName", query);
16921694
if (viewName != null)
1693-
setFormElement(Locator.name("ff_viewName"), viewName);
1694-
clickButton("Create");
1695-
StringBuilder strFields = new StringBuilder(fields[0]);
1696-
for (int i = 1; i < fields.length; i ++)
1697-
{
1698-
strFields.append("&");
1699-
strFields.append(fields[i]);
1700-
}
1701-
setFormElement(Locator.name("ff_columnList"), strFields.toString());
1702-
clickButton("Save");
1695+
queryRowPage.setField("Name", viewName);
1696+
queryRowPage.setField("Columns", String.join("&", fields));
1697+
queryRowPage.setField("Flags", "0");
1698+
queryRowPage.submit();
17031699
popLocation();
17041700
}
17051701

src/org/labkey/test/tests/TimeChartImportTest.java

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
import org.labkey.test.BaseWebDriverTest;
2424
import org.labkey.test.Locator;
2525
import org.labkey.test.TestFileUtils;
26-
import org.labkey.test.WebTestHelper;
2726
import org.labkey.test.categories.Charting;
2827
import org.labkey.test.categories.Daily;
2928
import org.labkey.test.categories.Reports;
29+
import org.labkey.test.components.CustomizeView;
3030
import org.labkey.test.util.DataRegionTable;
3131
import org.labkey.test.util.Ext4Helper;
3232
import org.labkey.test.util.PortalHelper;
@@ -35,7 +35,6 @@
3535
import java.io.File;
3636
import java.util.ArrayList;
3737
import java.util.List;
38-
import java.util.Map;
3938

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

313312
log("Verify masked ptids in publish study reportInfo");
314313
clickFolder(publishFolderName);
315-
for (TimeChartInfo chartInfo : VISIT_CHARTS)
314+
315+
// verify the report descriptor XML does not contain the masked ptid
316+
goToSchemaBrowser();
317+
DataRegionTable drt = viewQueryData("core", "Reports");
318+
CustomizeView customizeView = drt.openCustomizeGrid();
319+
customizeView.addColumn("DescriptorXML");
320+
customizeView.applyCustomView();
321+
322+
drt = new DataRegionTable("query", getDriver());
323+
int xmlIdx = drt.getColumnIndex("DescriptorXML");
324+
325+
for (int row=0; row < drt.getDataRowCount(); row++)
316326
{
317-
clickTab("Clinical and Assay Data");
318-
waitAndClickAndWait(Locator.linkWithText(chartInfo.getName()));
319-
beginAt(WebTestHelper.buildURL("reports",
320-
getProjectName() + "/" + VISIT_STUDY_FOLDER_NAME + "/" + publishFolderName,
321-
"reportInfo", Map.of("reportId", getUrlParam("reportId"))));
322-
waitForText("Report Debug Information");
327+
String descriptor = drt.getDataAsText(row, xmlIdx);
323328
for (String origMouseId : origMouseIds)
324329
{
325-
assertTextNotPresent(origMouseId);
330+
Assert.assertFalse("Unexpected masked ptid in report descriptor : " + descriptor, descriptor.contains(origMouseId));
326331
}
327332
}
328333
}

0 commit comments

Comments
 (0)