Remove unnecessary test code

Author: bbimber

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

@@ -341,34 +341,23 @@ private Locator.XPathLocator getTrackLocator(String trackId, boolean waitFor)
 
     private By getVariantWithinTrack(String trackId, String variantText, boolean waitFor)
     {
-        try
-        {
-            Locator.XPathLocator l = getTrackLocator(trackId, waitFor);
-
-            l = l.append(Locator.xpath("//*[name()='text' and contains(text(), '" + variantText + "')]/..")).notHidden();
-
-            if (waitFor)
-            {
-                waitForElement(l);
-            }
+        Locator.XPathLocator l = getTrackLocator(trackId, waitFor);
 
-            waitForElementToDisappear(Locator.tagWithText("p", "Loading"));
-            sleep(250);
+        l = l.append(Locator.xpath("//*[name()='text' and contains(text(), '" + variantText + "')]/..")).notHidden();
 
-            return By.xpath(l.toXpath());
-        }
-        catch(Exception e)
+        if (waitFor)
         {
-            return null;
+            waitForElement(l);
         }
-    }
 
-    private boolean isVariantVisible(String trackId, String variantText, boolean waitFor){
-        By var = getVariantWithinTrack(trackId, variantText, waitFor);
-        if(var != null){
-            return true;
+        waitForElementToDisappear(Locator.tagWithText("p", "Loading"));
+        sleep(250);
+        if (waitFor)
+        {
+            waitForElement(l);
         }
-        return false;
+
+        return By.xpath(l.toXpath());
     }
 
     private void testMessageDisplay()
@@ -384,8 +373,9 @@ private void testMessageDisplay()
 
     private void waitForJBrowseToLoad()
     {
-        waitForElementToDisappear(Locator.tagWithText("p", "Loading..."));
+        waitForElementToDisappear(Locator.tagWithText("p", "Loading...")); //the initial message before getSession
         waitForElement(Locator.tagWithClass("span", "MuiIconButton-label").notHidden()); //this is the top-left icon
+        waitForElement(Locator.tagWithAttribute("button", "title", "close this track").notHidden());
         waitForElement(Locator.tagWithClassContaining("span", "MuiTypography-root").notHidden(), WAIT_FOR_PAGE); //this is the icon from the track label
 
         waitForElementToDisappear(Locator.tagWithText("div", "Loading...")); //track data