X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fext%2Farchaeopteryx%2FAptxPhylogenyTreeTest.java;h=10e56c92cbf28d5f9e410990147558c1973f380c;hb=a35f5121d40f7d44a7abdcebd00bde44dc59e6ae;hp=5e00496267cb56f52da7c35185f7697e7a81722f;hpb=fcee2b6dcede8ef7fa07a9cf777194da8c88fe79;p=jalview.git

diff --git a/test/jalview/ext/archaeopteryx/AptxPhylogenyTreeTest.java b/test/jalview/ext/archaeopteryx/AptxPhylogenyTreeTest.java
index 5e00496..10e56c9 100644
--- a/test/jalview/ext/archaeopteryx/AptxPhylogenyTreeTest.java
+++ b/test/jalview/ext/archaeopteryx/AptxPhylogenyTreeTest.java
@@ -3,8 +3,6 @@ package jalview.ext.archaeopteryx;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
-import jalview.gui.JvOptionPane;
-
 import org.forester.archaeopteryx.MainFrame;
 import org.forester.archaeopteryx.TreePanel;
 import org.forester.phylogeny.Phylogeny;
@@ -53,15 +51,16 @@ public class AptxPhylogenyTreeTest extends TreeViewTest
     ancestor1Node.setDistanceToParent(36);
     ancestor2Node.setDistanceToParent(42);
 
+    inputTree.setName("test");
     inputTree.setRoot(rootNode);
     inputTree.setRooted(true);
 
   }
 
+  @Override
   @BeforeClass(dependsOnMethods = { "setUpJalview", "setUpTree" })
   public void createTreeView()
   {
-
     treeView = ArchaeopteryxInit.createInstance(inputTree);
     aptx = (MainFrame) treeView; // pretty ugly
     treePanel = aptx.getMainPanel().getCurrentTreePanel();
@@ -69,12 +68,6 @@ public class AptxPhylogenyTreeTest extends TreeViewTest
   }
 
 
-  @BeforeClass(alwaysRun = true)
-  public void setUpJvOptionPane()
-  {
-    JvOptionPane.setInteractiveMode(false);
-    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
-  }
 
   @Test(groups = "Functional")
   public void testMainPanelExists()
@@ -85,19 +78,39 @@ public class AptxPhylogenyTreeTest extends TreeViewTest
   @Test(groups = "Functional")
   public void testTreePanelExists()
   {
-    assertTrue(aptx.getMainPanel().getCurrentTreePanel() != null);
+    assertTrue(treePanel != null);
+  }
+
+  @Override
+  public void testTreeTitle()
+  {
+    assertTrue(tree.getName().equals("test"));
+
+  }
+
+  @Test(
+    groups = "Functional",
+    expectedExceptions = IllegalArgumentException.class)
+  public void testInvalidBranchName()
+  {
+    tree.getNode("I shouldn't exist");
+
+  }
+
+  @Override
+  public void testExistingBranchName()
+  {
+    tree.getNode("leaf 2");
+
   }
 
   @Override
-  @Test(groups = "Functional")
   public void testTreeLoaded()
   {
-    assertTrue(aptx.getMainPanel().getCurrentTreePanel()
-            .getPhylogeny() != null);
+    assertTrue(tree != null);
   }
 
   @Override
-  @Test(groups = "Functional")
   public void testChildNodesCount()
   {
     assertEquals(tree.getNode("ancestor 1").getNumberOfExternalNodes(), 3);
@@ -105,7 +118,6 @@ public class AptxPhylogenyTreeTest extends TreeViewTest
   }
 
   @Override
-  @Test(groups = "Functional")
   public void testChildToParentBranchLength()
   {
     assertEquals(tree.getNode("leaf 1a").getDistanceToParent(), 2.0);
@@ -113,7 +125,6 @@ public class AptxPhylogenyTreeTest extends TreeViewTest
   }
 
   @Override
-  @Test(groups = "Functional")
   public void testNodeToRootBranchLength()
   {
     assertEquals(tree.getNode("leaf 2").getDistanceToParent(), 42.0);
@@ -121,7 +132,6 @@ public class AptxPhylogenyTreeTest extends TreeViewTest
   }
 
   @Override
-  @Test(groups = "Functional")
   public void testDistantNodeToRootBranchLength()
   {
     assertEquals(tree.getNode("leaf 1c").calculateDistanceToRoot(),
@@ -133,4 +143,6 @@ public class AptxPhylogenyTreeTest extends TreeViewTest
 
 
 
+
+
 }