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 bc908e2..8975d83 100644 (file)
--- a/test/jalview/ext/archaeopteryx/AptxPhylogenyTreeTest.java
+++ b/test/jalview/ext/archaeopteryx/AptxPhylogenyTreeTest.java
@@ -3,8 +3,9 @@ package jalview.ext.archaeopteryx;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
-import jalview.gui.JvOptionPane;
+import jalview.gui.Desktop;
 
+import org.forester.archaeopteryx.Archaeopteryx;
 import org.forester.archaeopteryx.MainFrame;
 import org.forester.archaeopteryx.TreePanel;
 import org.forester.phylogeny.Phylogeny;
@@ -53,6 +54,7 @@ public class AptxPhylogenyTreeTest extends TreeViewTest
     ancestor1Node.setDistanceToParent(36);
     ancestor2Node.setDistanceToParent(42);
 
+    inputTree.setName("test");
     inputTree.setRoot(rootNode);
     inputTree.setRooted(true);
 
@@ -62,21 +64,17 @@ 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);
 
-  @BeforeClass(alwaysRun = true)
-  public void setUpJvOptionPane()
-  {
-    JvOptionPane.setInteractiveMode(false);
-    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
   }
 
+
+
   @Test(groups = "Functional")
   public void testMainPanelExists()
   {
@@ -86,10 +84,16 @@ 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)
@@ -100,7 +104,6 @@ public class AptxPhylogenyTreeTest extends TreeViewTest
   }
 
   @Override
-  @Test(groups = "Functional")
   public void testExistingBranchName()
   {
     tree.getNode("leaf 2");
@@ -108,15 +111,12 @@ public class AptxPhylogenyTreeTest extends TreeViewTest
   }
 
   @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);
@@ -124,7 +124,6 @@ public class AptxPhylogenyTreeTest extends TreeViewTest
   }
 
   @Override
-  @Test(groups = "Functional")
   public void testChildToParentBranchLength()
   {
     assertEquals(tree.getNode("leaf 1a").getDistanceToParent(), 2.0);
@@ -132,7 +131,6 @@ public class AptxPhylogenyTreeTest extends TreeViewTest
   }
 
   @Override
-  @Test(groups = "Functional")
   public void testNodeToRootBranchLength()
   {
     assertEquals(tree.getNode("leaf 2").getDistanceToParent(), 42.0);
@@ -140,7 +138,6 @@ public class AptxPhylogenyTreeTest extends TreeViewTest
   }
 
   @Override
-  @Test(groups = "Functional")
   public void testDistantNodeToRootBranchLength()
   {
     assertEquals(tree.getNode("leaf 1c").calculateDistanceToRoot(),
@@ -153,4 +150,5 @@ public class AptxPhylogenyTreeTest extends TreeViewTest
 
 
 
+
 }