JAL-2799 rearranged AptxInit code

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

diff --git a/test/jalview/ext/archaeopteryx/AptxPhylogenyTreeTest.java b/test/jalview/ext/archaeopteryx/AptxPhylogenyTreeTest.java
index 0e51ea3..8975d83 100644 (file)
--- a/test/jalview/ext/archaeopteryx/AptxPhylogenyTreeTest.java
+++ b/test/jalview/ext/archaeopteryx/AptxPhylogenyTreeTest.java
@@ -3,6 +3,9 @@ package jalview.ext.archaeopteryx;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
+import jalview.gui.Desktop;
+
+import org.forester.archaeopteryx.Archaeopteryx;
 import org.forester.archaeopteryx.MainFrame;
 import org.forester.archaeopteryx.TreePanel;
 import org.forester.phylogeny.Phylogeny;
@@ -51,6 +54,7 @@ public class AptxPhylogenyTreeTest extends TreeViewTest
     ancestor1Node.setDistanceToParent(36);
     ancestor2Node.setDistanceToParent(42);
 
+    inputTree.setName("test");
     inputTree.setRoot(rootNode);
     inputTree.setRooted(true);
 
@@ -60,10 +64,13 @@ public class AptxPhylogenyTreeTest extends TreeViewTest
   @BeforeClass(dependsOnMethods = { "setUpJalview", "setUpTree" })
   public void createTreeView()
   {
-    treeView = ArchaeopteryxInit.createInstance(inputTree);
+    treeView = Archaeopteryx.createApplication(inputTree);
     aptx = (MainFrame) treeView; // pretty ugly
     treePanel = aptx.getMainPanel().getCurrentTreePanel();
     tree = treePanel.getPhylogeny();
+
+    Desktop.addInternalFrame(aptx, "Archaeopteryx", 500, 500);
+
   }
 
 
@@ -80,6 +87,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 +150,5 @@ public class AptxPhylogenyTreeTest extends TreeViewTest
 
 
 
+
 }