Added tree title test

diff --git a/test/jalview/ext/archaeopteryx/AptxJalviewTreeTest.java b/test/jalview/ext/archaeopteryx/AptxJalviewTreeTest.java
index 91d6b20..b9d877f 100644 (file)
--- a/test/jalview/ext/archaeopteryx/AptxJalviewTreeTest.java
+++ b/test/jalview/ext/archaeopteryx/AptxJalviewTreeTest.java
@@ -62,9 +62,17 @@ public class AptxJalviewTreeTest extends TreeViewTest
 
     treePanel = aptx.getMainPanel().getCurrentTreePanel();
     tree = treePanel.getPhylogeny();
+
+    tree.printExtNodes();
   }
 
   @Override
+  public void testTreeTitle()
+  {
+    // TODO Auto-generated method stub
+
+  }
+  @Override
   public void testChildNodesCount()
   {
     // TODO Auto-generated method stub
@@ -78,6 +86,15 @@ public class AptxJalviewTreeTest extends TreeViewTest
 
   }
 
+  @Test(
+    groups = "Functional",
+    expectedExceptions = IllegalArgumentException.class)
+  public void testInvalidBranchName()
+  {
+    tree.getNode("I shouldn't exist");
+
+  }
+
   @Override
   public void testNodeToRootBranchLength()
   {
@@ -100,14 +117,7 @@ public class AptxJalviewTreeTest extends TreeViewTest
   }
 
 
-  @Test(
-    groups = "Functional",
-    expectedExceptions = IllegalArgumentException.class)
-  public void testInvalidBranchName()
-  {
-    // TODO Auto-generated method stub
 
-  }
 
   @Override
   public void testExistingBranchName()
@@ -115,4 +125,5 @@ public class AptxJalviewTreeTest extends TreeViewTest
     // TODO Auto-generated method stub
 
   }
+
 }

diff --git a/test/jalview/ext/archaeopteryx/AptxPhylogenyTreeTest.java b/test/jalview/ext/archaeopteryx/AptxPhylogenyTreeTest.java
index 0e51ea3..10e56c9 100644 (file)
--- a/test/jalview/ext/archaeopteryx/AptxPhylogenyTreeTest.java
+++ b/test/jalview/ext/archaeopteryx/AptxPhylogenyTreeTest.java
@@ -51,6 +51,7 @@ public class AptxPhylogenyTreeTest extends TreeViewTest
     ancestor1Node.setDistanceToParent(36);
     ancestor2Node.setDistanceToParent(42);
 
+    inputTree.setName("test");
     inputTree.setRoot(rootNode);
     inputTree.setRooted(true);
 
@@ -80,6 +81,13 @@ public class AptxPhylogenyTreeTest extends TreeViewTest
     assertTrue(treePanel != null);
   }
 
+  @Override
+  public void testTreeTitle()
+  {
+    assertTrue(tree.getName().equals("test"));
+
+  }
+
   @Test(
     groups = "Functional",
     expectedExceptions = IllegalArgumentException.class)
@@ -136,4 +144,5 @@ public class AptxPhylogenyTreeTest extends TreeViewTest
 
 
 
+
 }

diff --git a/test/jalview/ext/archaeopteryx/TreeViewTest.java b/test/jalview/ext/archaeopteryx/TreeViewTest.java
index fd18886..4bbe140 100644 (file)
--- a/test/jalview/ext/archaeopteryx/TreeViewTest.java
+++ b/test/jalview/ext/archaeopteryx/TreeViewTest.java
@@ -57,6 +57,9 @@ public abstract class TreeViewTest
   public abstract void testTreeLoaded();
 
   @Test(groups = "Functional")
+  public abstract void testTreeTitle();
+
+  @Test(groups = "Functional")
   public abstract void testExistingBranchName();
 
   @Test(groups = "Functional")