Refactor getTotalVariantFeatures() method

Author: bbimber

jbrowse/test/src/org/labkey/test/tests/external/labModules/JBrowseTest.java

@@ -299,18 +299,7 @@ private void testFilterWidget()
 
     private long getTotalVariantFeatures()
     {
-        Locator l = Locator.tagWithAttribute("svg", "data-testid", "svgfeatures").append(Locator.tag("polygon"));
-        try
-        {
-            return Locator.findElements(getDriver(), l).stream().filter(WebElement::isDisplayed).count();
-        }
-        catch (StaleElementReferenceException e)
-        {
-            log("Stale elements, retrying");
-            sleep(5000);
-
-            return Locator.findElements(getDriver(), l).stream().filter(WebElement::isDisplayed).count();
-        }
+        return JBrowseTestHelper.getTotalVariantFeatures(this);
     }
 
     private void testLoadingConfigFilters(){

jbrowse/test/src/org/labkey/test/tests/external/labModules/JBrowseTestHelper.java

@@ -13,6 +13,8 @@
 import org.labkey.test.util.ext4cmp.Ext4FieldRef;
 import org.labkey.test.util.ext4cmp.Ext4GridRef;
 import org.openqa.selenium.By;
+import org.openqa.selenium.StaleElementReferenceException;
+import org.openqa.selenium.WebElement;
 
 import java.io.File;
 import java.util.stream.Collector;
@@ -145,4 +147,20 @@ public static void waitForJBrowseToLoad(BaseWebDriverTest test)
         test.waitForElementToDisappear(Locator.tagWithText("div", "Loading")); //track data
         test.waitForElementToDisappear(Locator.tagWithText("p", "Loading").withClass("MuiTypography-root")); // the track data
     }
+
+    public static long getTotalVariantFeatures(BaseWebDriverTest test)
+    {
+        Locator l = Locator.tagWithAttribute("svg", "data-testid", "svgfeatures").append(Locator.tag("polygon"));
+        try
+        {
+            return Locator.findElements(test.getDriver(), l).stream().filter(WebElement::isDisplayed).count();
+        }
+        catch (StaleElementReferenceException e)
+        {
+            test.log("Stale elements, retrying");
+            WebDriverWrapper.sleep(5000);
+
+            return Locator.findElements(test.getDriver(), l).stream().filter(WebElement::isDisplayed).count();
+        }
+    }
 }