Removed redundant annotations

[jalview.git] / test / jalview / ext / archaeopteryx / TreeViewTest.java

diff --git a/test/jalview/ext/archaeopteryx/TreeViewTest.java b/test/jalview/ext/archaeopteryx/TreeViewTest.java
index 013663e..fd18886 100644 (file)
--- a/test/jalview/ext/archaeopteryx/TreeViewTest.java
+++ b/test/jalview/ext/archaeopteryx/TreeViewTest.java
@@ -4,6 +4,7 @@ import static org.testng.Assert.assertTrue;
 
 import jalview.bin.Jalview;
 import jalview.gui.Desktop;
+import jalview.gui.JvOptionPane;
 
 import javax.swing.JInternalFrame;
 
@@ -12,12 +13,17 @@ import org.testng.annotations.Test;
 
 public abstract class TreeViewTest
 {
-
   Jalview jalview;
 
   JInternalFrame treeView;
 
   @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
   public abstract void setUpTree();
 
   @BeforeClass(alwaysRun = true)
@@ -27,7 +33,6 @@ public abstract class TreeViewTest
     Jalview.main(args);
   }
 
-  @BeforeClass(dependsOnMethods = { "setUpJalview", "setUpTree" })
   public abstract void createTreeView();
 
   @Test(groups = "Functional")
@@ -48,11 +53,6 @@ public abstract class TreeViewTest
     assertTrue(treeView.isShowing());
   }
 
-  @Test(
-    groups = "Functional",
-    expectedExceptions = IllegalArgumentException.class)
-  public abstract void testInvalidBranchName();
-
   @Test(groups = "Functional")
   public abstract void testTreeLoaded();