From ca9e1db92e39e1894bfa1c13f0025383820fb43d Mon Sep 17 00:00:00 2001 From: labkey-sweta Date: Tue, 12 Nov 2024 15:49:18 -0800 Subject: [PATCH 1/2] Test updates --- .../labkey/test/tests/cds/CDSLearnAboutExportTest.java | 8 ++++++-- .../labkey/test/tests/cds/CDSVisualizationPlotTest.java | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/test/src/org/labkey/test/tests/cds/CDSLearnAboutExportTest.java b/test/src/org/labkey/test/tests/cds/CDSLearnAboutExportTest.java index 93c3e535e..d7b3a2547 100644 --- a/test/src/org/labkey/test/tests/cds/CDSLearnAboutExportTest.java +++ b/test/src/org/labkey/test/tests/cds/CDSLearnAboutExportTest.java @@ -18,6 +18,8 @@ import org.labkey.test.pages.cds.LearnGrid; import org.labkey.test.pages.cds.LearnGrid.LearnTab; import org.labkey.test.util.cds.CDSHelper; +import org.openqa.selenium.support.ui.ExpectedCondition; +import org.openqa.selenium.support.ui.ExpectedConditions; import java.io.File; import java.io.FileInputStream; @@ -109,7 +111,8 @@ public void testExportExcelDownload() throws IOException LearnGrid learnGrid = new LearnGrid(LearnTab.ANTIGENS, this); learnGrid.setSearch("HIV-1 D"); assertEquals("Incorrect number of rows after antigen filter", 1, learnGrid.getRowCount()); - File filteredData = clickExportExcel(LearnTab.ANTIGENS, null); + click(Locator.tagWithId("span", "learn-grid-export-button-id-btnIconEl")); + File filteredData = clickAndWaitForDownload(Locator.linkWithText("Excel (*.XLS)")); assertEquals("Antigen : Incorrect number of rows imported", 1, getRowCount(filteredData)); assertEquals("Incorrect Antigen imported after filter", "HIV-1 D.99986.B12 [gx120.D7.avi]", getRowFromExcel(filteredData, 1).get(2)); //getting short name column data @@ -117,7 +120,8 @@ public void testExportExcelDownload() throws IOException learnGrid = cds.viewLearnAboutPage(LearnTab.STUDIES); learnGrid.setSearch("RED 1"); assertEquals("Incorrect number of rows after study filter", 1, learnGrid.getRowCount()); - filteredData = clickExportExcel(LearnTab.STUDIES, null); + click(Locator.tagWithId("span", "learn-grid-export-button-id-btnIconEl")); + filteredData = clickAndWaitForDownload(Locator.linkWithText("Excel (*.XLS)")); assertEquals("Incorrect number of rows imported", 1, getRowCount(filteredData)); assertEquals("Incorrect study name", "RED 1", getRowFromExcel(filteredData, 1).get(2)); } diff --git a/test/src/org/labkey/test/tests/cds/CDSVisualizationPlotTest.java b/test/src/org/labkey/test/tests/cds/CDSVisualizationPlotTest.java index dcb093242..07606b246 100644 --- a/test/src/org/labkey/test/tests/cds/CDSVisualizationPlotTest.java +++ b/test/src/org/labkey/test/tests/cds/CDSVisualizationPlotTest.java @@ -574,7 +574,7 @@ public void verifyBinnedPlot() waitForText("Heatmap on"); log("Validate that there are bin squares in the plot."); - int squareCount = getElementCount(Locator.css("svg g.layer a.vis-bin-square")); + int squareCount = Locator.tagWithClass("a","vis-bin vis-bin-square").findElements(getDriver()).size(); assertTrue("Expected over 2000 bin squares found: " + squareCount, squareCount > 2000); cds.ensureNoFilter(); From bbb838333e3e24d5892c5b4e458cfd1746604352 Mon Sep 17 00:00:00 2001 From: labkey-sweta Date: Tue, 12 Nov 2024 15:52:24 -0800 Subject: [PATCH 2/2] Removing unused imports --- test/src/org/labkey/test/tests/cds/CDSLearnAboutExportTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/src/org/labkey/test/tests/cds/CDSLearnAboutExportTest.java b/test/src/org/labkey/test/tests/cds/CDSLearnAboutExportTest.java index d7b3a2547..f40e8d251 100644 --- a/test/src/org/labkey/test/tests/cds/CDSLearnAboutExportTest.java +++ b/test/src/org/labkey/test/tests/cds/CDSLearnAboutExportTest.java @@ -18,8 +18,6 @@ import org.labkey.test.pages.cds.LearnGrid; import org.labkey.test.pages.cds.LearnGrid.LearnTab; import org.labkey.test.util.cds.CDSHelper; -import org.openqa.selenium.support.ui.ExpectedCondition; -import org.openqa.selenium.support.ui.ExpectedConditions; import java.io.File; import java.io.FileInputStream;