From 1b06c8e498f0dcbda6c776fd1773e4322f7b6064 Mon Sep 17 00:00:00 2001 From: bbimber Date: Mon, 4 Nov 2024 10:32:12 -0800 Subject: [PATCH] Attempt to fix JBrowseTest --- .../test/tests/external/labModules/JBrowseTestHelper.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jbrowse/test/src/org/labkey/test/tests/external/labModules/JBrowseTestHelper.java b/jbrowse/test/src/org/labkey/test/tests/external/labModules/JBrowseTestHelper.java index 596d64e9d..995a2e9b5 100644 --- a/jbrowse/test/src/org/labkey/test/tests/external/labModules/JBrowseTestHelper.java +++ b/jbrowse/test/src/org/labkey/test/tests/external/labModules/JBrowseTestHelper.java @@ -166,12 +166,14 @@ public static void waitForJBrowseToLoad(BaseWebDriverTest test) public static long getTotalVariantFeatures(BaseWebDriverTest test) { + final int winWidth = test.executeScript("window.outerWidth", Integer.class); + final int winHeight = test.executeScript("window.outerHeight", Integer.class); Locator l = Locator.tagWithAttribute("svg", "data-testid", "svgfeatures").append(Locator.tag("polygon")); try { // NOTE: JBrowse renders features using multiple blocks per track, and these tracks can redundantly render identical features on top of one another. // Counting unique locations is indirect, but should result in unique features - return Locator.findElements(test.getDriver(), l).stream().filter(WebElement::isDisplayed).map(WebElement::getLocation).distinct().count(); + return Locator.findElements(test.getDriver(), l).stream().filter(WebElement::isDisplayed).map(WebElement::getRect).distinct().filter(rec -> rec.x > 0 & (rec.x + rec.width) <= winWidth & rec.y > 0 & (rec.y + rec.height) <= winHeight).count(); } catch (StaleElementReferenceException e) {