From 86d6cdc86b4bf6c94fd3b86f41a8f9a32e4829f0 Mon Sep 17 00:00:00 2001 From: labkey-danield Date: Mon, 22 Sep 2025 08:30:18 -0700 Subject: [PATCH 1/5] Wait for the grid filter to be applied before clicking. --- .../test/tests/targetedms/TargetedMSLightHeavyRatioTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/src/org/labkey/test/tests/targetedms/TargetedMSLightHeavyRatioTest.java b/test/src/org/labkey/test/tests/targetedms/TargetedMSLightHeavyRatioTest.java index eaf605ebf..2229b33ae 100644 --- a/test/src/org/labkey/test/tests/targetedms/TargetedMSLightHeavyRatioTest.java +++ b/test/src/org/labkey/test/tests/targetedms/TargetedMSLightHeavyRatioTest.java @@ -47,7 +47,7 @@ public void testIntensity() clickTab("Proteins"); DataRegionTable table = new DataRegionTable("PeptideGroup", getDriver()); table.setFilter("Label", "Equals", "gi|324021745|ref|NP_001191236.1|"); - clickAndWait(reproducibilityReportLink()); + waitAndClickAndWait(reproducibilityReportLink()); log("Verifying the default checks for Intensity"); PrecursorsWebPart precursorsWebPart = new PrecursorsWebPart(getDriver()); @@ -87,7 +87,7 @@ public void testLightHeavyRatio() clickTab("Proteins"); DataRegionTable table = new DataRegionTable("PeptideGroup", getDriver()); table.setFilter("Label", "Equals", "gi|324021745|ref|NP_001191236.1|"); - clickAndWait(reproducibilityReportLink()); + waitAndClickAndWait(reproducibilityReportLink()); log("Verifying values for light/heavy ratio"); PrecursorsWebPart precursorsWebPart = new PrecursorsWebPart(getDriver()); From a005433c7488d0e0fa7986609763e9a81915c8c6 Mon Sep 17 00:00:00 2001 From: labkey-danield Date: Mon, 22 Sep 2025 09:44:00 -0700 Subject: [PATCH 2/5] Wait for elements. Longer wait for page to load. --- .../targetedms/TargetedMSProteinGroupingTest.java | 2 +- .../TargetedMSProteinSequenceViewTest.java | 2 +- .../tests/targetedms/passport/PassportTest.java | 14 +++++++++----- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/test/src/org/labkey/test/tests/targetedms/TargetedMSProteinGroupingTest.java b/test/src/org/labkey/test/tests/targetedms/TargetedMSProteinGroupingTest.java index b8ad5dff4..badde044d 100644 --- a/test/src/org/labkey/test/tests/targetedms/TargetedMSProteinGroupingTest.java +++ b/test/src/org/labkey/test/tests/targetedms/TargetedMSProteinGroupingTest.java @@ -43,7 +43,7 @@ public void testProteinGrouping() goToProjectHome(); clickAndWait(Locator.linkWithText(SKY_FILE)); - clickAndWait(Locator.linkWithText(group)); + clickAndWait(Locator.linkWithText(group), longWaitForPage); log("Verifying protein matches for peptide"); DataRegionTable proteinTable = new DataRegionTable.DataRegionFinder(getDriver()).withName("Proteins").waitFor(); diff --git a/test/src/org/labkey/test/tests/targetedms/TargetedMSProteinSequenceViewTest.java b/test/src/org/labkey/test/tests/targetedms/TargetedMSProteinSequenceViewTest.java index 3f83fda4b..788499b9c 100644 --- a/test/src/org/labkey/test/tests/targetedms/TargetedMSProteinSequenceViewTest.java +++ b/test/src/org/labkey/test/tests/targetedms/TargetedMSProteinSequenceViewTest.java @@ -51,7 +51,7 @@ public void testIntensityAndConfidenceScale() log("Navigate to sequence coverage map"); navigateToFolder(getProjectName(), CONFIDENCE_SCORE_FOLDER); waitAndClickAndWait(Locator.linkWithText(CS_SKY_FILE)); - clickAndWait(Locator.linkWithText("sp|O13527|YA11B_YEAST"), WAIT_FOR_PAGE); + clickAndWait(Locator.linkWithText("sp|O13527|YA11B_YEAST"), longWaitForPage); log("Verifying Intensity values"); SequenceCoverageWebPart sequenceCoverage = new SequenceCoverageWebPart(getDriver()); diff --git a/test/src/org/labkey/test/tests/targetedms/passport/PassportTest.java b/test/src/org/labkey/test/tests/targetedms/passport/PassportTest.java index 389fb09f3..2a22da110 100644 --- a/test/src/org/labkey/test/tests/targetedms/passport/PassportTest.java +++ b/test/src/org/labkey/test/tests/targetedms/passport/PassportTest.java @@ -54,7 +54,7 @@ private void testNormalStuff() assertTextNotPresent("Pages"); // enter Haptoglobin - clickAndWait(Locator.xpath("//tr[contains(@class,'labkey-alternate-row')]//a[@class='labkey-text-link'][contains(text(),'PASSPORT VIEW')]")); + clickAndWait(Locator.xpath("//tr[contains(@class,'labkey-alternate-row')]//a[@class='labkey-text-link'][contains(text(),'PASSPORT VIEW')]"), longWaitForPage); assertTextPresent("Haptoglobin", "data1.sky.zip"); assertElementPresent(Locator.xpath("//div[@id='rangesliderdeg']")); assertElementPresent(Locator.xpath("//div[@id='rangesliderlength']")); @@ -77,6 +77,7 @@ private void testNormalStuff() assertElementContains(Locator.xpath("//ul[@id='livepeptidelist']//li["+index+"]"), peptidesOrderLocation[i]); } click(Locator.xpath("//button[@id='formreset']")); // reset form check reset works + waitForElement(Locator.tagWithId("ul", "livepeptidelist")); for(int i = 0; i < peptidesOrderIntensity.length; i++) { int index = i+1; assertElementContains(Locator.xpath("//ul[@id='livepeptidelist']//li["+index+"]"), peptidesOrderIntensity[i]); @@ -86,13 +87,16 @@ private void testNormalStuff() dragAndDrop(Locator.xpath("//div[@id='rangesliderdeg']//span[1]"), 50, 0); assertElementContains(Locator.xpath("//span[@id='filteredPeptideCount']//green"), "15"); click(Locator.xpath("//button[@id='formreset']")); // reset form check reset works + + waitForElement(Locator.tagWithId("span", "filteredPeptideCount").childTag("green")); assertElementContains(Locator.xpath("//span[@id='filteredPeptideCount']//green"), "19"); //features - assertElementPresent(Locator.xpath("//td[contains(@class, 'feature-sequencevariant')]"), 5); - assertElementPresent(Locator.xpath("//td[contains(@class, 'feature-glycosylationsite')]"), 4); - assertElementPresent(Locator.xpath("//td[contains(@class, 'feature-helix')]"), 7); - assertElementPresent(Locator.xpath("//td[contains(@class, 'feature-turn')]"), 6); + waitForElements(Locator.tagWithClass("td", "feature-sequencevariant"), 5, 30_000); + waitForElements(Locator.tagWithClass("td", "feature-sequencevariant"), 5, 30_000); + waitForElements(Locator.tagWithClass("td", "feature-glycosylationsite"), 4, 30_000); + waitForElements(Locator.tagWithClass("td", "feature-helix"), 7, 30_000); + waitForElements(Locator.tagWithClass("td", "feature-turn"), 6, 30_000); } @LogMethod From e3614c6383fd952ae570638dd61cf8fd2102e385 Mon Sep 17 00:00:00 2001 From: labkey-danield Date: Mon, 22 Sep 2025 09:51:54 -0700 Subject: [PATCH 3/5] Remove duplicate line. --- .../org/labkey/test/tests/targetedms/passport/PassportTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/test/src/org/labkey/test/tests/targetedms/passport/PassportTest.java b/test/src/org/labkey/test/tests/targetedms/passport/PassportTest.java index 2a22da110..aea2bd376 100644 --- a/test/src/org/labkey/test/tests/targetedms/passport/PassportTest.java +++ b/test/src/org/labkey/test/tests/targetedms/passport/PassportTest.java @@ -93,7 +93,6 @@ private void testNormalStuff() //features waitForElements(Locator.tagWithClass("td", "feature-sequencevariant"), 5, 30_000); - waitForElements(Locator.tagWithClass("td", "feature-sequencevariant"), 5, 30_000); waitForElements(Locator.tagWithClass("td", "feature-glycosylationsite"), 4, 30_000); waitForElements(Locator.tagWithClass("td", "feature-helix"), 7, 30_000); waitForElements(Locator.tagWithClass("td", "feature-turn"), 6, 30_000); From e8fa0a849a982eef3663ee851de4e3f244feff5a Mon Sep 17 00:00:00 2001 From: labkey-danield Date: Mon, 22 Sep 2025 12:31:27 -0700 Subject: [PATCH 4/5] Up the timelimit and see what happens. --- .../test/tests/targetedms/TargetedMSProteinGroupingTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/src/org/labkey/test/tests/targetedms/TargetedMSProteinGroupingTest.java b/test/src/org/labkey/test/tests/targetedms/TargetedMSProteinGroupingTest.java index badde044d..bd6fb248c 100644 --- a/test/src/org/labkey/test/tests/targetedms/TargetedMSProteinGroupingTest.java +++ b/test/src/org/labkey/test/tests/targetedms/TargetedMSProteinGroupingTest.java @@ -9,7 +9,7 @@ import org.labkey.test.util.DataRegionTable; @Category({}) -@BaseWebDriverTest.ClassTimeout(minutes = 2) +@BaseWebDriverTest.ClassTimeout(minutes = 12) public class TargetedMSProteinGroupingTest extends TargetedMSTest { private static final String SKY_FILE = "ProteinGroup.sky"; @@ -43,7 +43,7 @@ public void testProteinGrouping() goToProjectHome(); clickAndWait(Locator.linkWithText(SKY_FILE)); - clickAndWait(Locator.linkWithText(group), longWaitForPage); + clickAndWait(Locator.linkWithText(group), longWaitForPage * 2); log("Verifying protein matches for peptide"); DataRegionTable proteinTable = new DataRegionTable.DataRegionFinder(getDriver()).withName("Proteins").waitFor(); From d43c5a2981bf29f68691232fd39c67c95b277fa1 Mon Sep 17 00:00:00 2001 From: labkey-danield Date: Tue, 23 Sep 2025 13:23:22 -0700 Subject: [PATCH 5/5] Reverting the various wait times. --- .../targetedms/TargetedMSProteinGroupingTest.java | 4 ++-- .../targetedms/TargetedMSProteinSequenceViewTest.java | 2 +- .../test/tests/targetedms/passport/PassportTest.java | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/src/org/labkey/test/tests/targetedms/TargetedMSProteinGroupingTest.java b/test/src/org/labkey/test/tests/targetedms/TargetedMSProteinGroupingTest.java index bd6fb248c..b8ad5dff4 100644 --- a/test/src/org/labkey/test/tests/targetedms/TargetedMSProteinGroupingTest.java +++ b/test/src/org/labkey/test/tests/targetedms/TargetedMSProteinGroupingTest.java @@ -9,7 +9,7 @@ import org.labkey.test.util.DataRegionTable; @Category({}) -@BaseWebDriverTest.ClassTimeout(minutes = 12) +@BaseWebDriverTest.ClassTimeout(minutes = 2) public class TargetedMSProteinGroupingTest extends TargetedMSTest { private static final String SKY_FILE = "ProteinGroup.sky"; @@ -43,7 +43,7 @@ public void testProteinGrouping() goToProjectHome(); clickAndWait(Locator.linkWithText(SKY_FILE)); - clickAndWait(Locator.linkWithText(group), longWaitForPage * 2); + clickAndWait(Locator.linkWithText(group)); log("Verifying protein matches for peptide"); DataRegionTable proteinTable = new DataRegionTable.DataRegionFinder(getDriver()).withName("Proteins").waitFor(); diff --git a/test/src/org/labkey/test/tests/targetedms/TargetedMSProteinSequenceViewTest.java b/test/src/org/labkey/test/tests/targetedms/TargetedMSProteinSequenceViewTest.java index 788499b9c..3f83fda4b 100644 --- a/test/src/org/labkey/test/tests/targetedms/TargetedMSProteinSequenceViewTest.java +++ b/test/src/org/labkey/test/tests/targetedms/TargetedMSProteinSequenceViewTest.java @@ -51,7 +51,7 @@ public void testIntensityAndConfidenceScale() log("Navigate to sequence coverage map"); navigateToFolder(getProjectName(), CONFIDENCE_SCORE_FOLDER); waitAndClickAndWait(Locator.linkWithText(CS_SKY_FILE)); - clickAndWait(Locator.linkWithText("sp|O13527|YA11B_YEAST"), longWaitForPage); + clickAndWait(Locator.linkWithText("sp|O13527|YA11B_YEAST"), WAIT_FOR_PAGE); log("Verifying Intensity values"); SequenceCoverageWebPart sequenceCoverage = new SequenceCoverageWebPart(getDriver()); diff --git a/test/src/org/labkey/test/tests/targetedms/passport/PassportTest.java b/test/src/org/labkey/test/tests/targetedms/passport/PassportTest.java index aea2bd376..76554c4d2 100644 --- a/test/src/org/labkey/test/tests/targetedms/passport/PassportTest.java +++ b/test/src/org/labkey/test/tests/targetedms/passport/PassportTest.java @@ -54,7 +54,7 @@ private void testNormalStuff() assertTextNotPresent("Pages"); // enter Haptoglobin - clickAndWait(Locator.xpath("//tr[contains(@class,'labkey-alternate-row')]//a[@class='labkey-text-link'][contains(text(),'PASSPORT VIEW')]"), longWaitForPage); + clickAndWait(Locator.xpath("//tr[contains(@class,'labkey-alternate-row')]//a[@class='labkey-text-link'][contains(text(),'PASSPORT VIEW')]")); assertTextPresent("Haptoglobin", "data1.sky.zip"); assertElementPresent(Locator.xpath("//div[@id='rangesliderdeg']")); assertElementPresent(Locator.xpath("//div[@id='rangesliderlength']")); @@ -92,10 +92,10 @@ private void testNormalStuff() assertElementContains(Locator.xpath("//span[@id='filteredPeptideCount']//green"), "19"); //features - waitForElements(Locator.tagWithClass("td", "feature-sequencevariant"), 5, 30_000); - waitForElements(Locator.tagWithClass("td", "feature-glycosylationsite"), 4, 30_000); - waitForElements(Locator.tagWithClass("td", "feature-helix"), 7, 30_000); - waitForElements(Locator.tagWithClass("td", "feature-turn"), 6, 30_000); + waitForElements(Locator.tagWithClass("td", "feature-sequencevariant"), 5); + waitForElements(Locator.tagWithClass("td", "feature-glycosylationsite"), 4); + waitForElements(Locator.tagWithClass("td", "feature-helix"), 7); + waitForElements(Locator.tagWithClass("td", "feature-turn"), 6); } @LogMethod