git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added tree title test
[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
..
10e56c9
100644
(file)
--- 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 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;
import org.forester.archaeopteryx.MainFrame;
import org.forester.archaeopteryx.TreePanel;
import org.forester.phylogeny.Phylogeny;
@@
-53,6
+51,7
@@
public class AptxPhylogenyTreeTest extends TreeViewTest
ancestor1Node.setDistanceToParent(36);
ancestor2Node.setDistanceToParent(42);
ancestor1Node.setDistanceToParent(36);
ancestor2Node.setDistanceToParent(42);
+ inputTree.setName("test");
inputTree.setRoot(rootNode);
inputTree.setRooted(true);
inputTree.setRoot(rootNode);
inputTree.setRooted(true);
@@
-62,7
+61,6
@@
public class AptxPhylogenyTreeTest extends TreeViewTest
@BeforeClass(dependsOnMethods = { "setUpJalview", "setUpTree" })
public void createTreeView()
{
@BeforeClass(dependsOnMethods = { "setUpJalview", "setUpTree" })
public void createTreeView()
{
-
treeView = ArchaeopteryxInit.createInstance(inputTree);
aptx = (MainFrame) treeView; // pretty ugly
treePanel = aptx.getMainPanel().getCurrentTreePanel();
treeView = ArchaeopteryxInit.createInstance(inputTree);
aptx = (MainFrame) treeView; // pretty ugly
treePanel = aptx.getMainPanel().getCurrentTreePanel();
@@
-70,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()
@Test(groups = "Functional")
public void testMainPanelExists()
@@
-86,10
+78,16
@@
public class AptxPhylogenyTreeTest extends TreeViewTest
@Test(groups = "Functional")
public void testTreePanelExists()
{
@Test(groups = "Functional")
public void testTreePanelExists()
{
- assertTrue(aptx.getMainPanel().getCurrentTreePanel() != null);
+ assertTrue(treePanel != null);
}
@Override
}
@Override
+ public void testTreeTitle()
+ {
+ assertTrue(tree.getName().equals("test"));
+
+ }
+
@Test(
groups = "Functional",
expectedExceptions = IllegalArgumentException.class)
@Test(
groups = "Functional",
expectedExceptions = IllegalArgumentException.class)
@@
-100,7
+98,6
@@
public class AptxPhylogenyTreeTest extends TreeViewTest
}
@Override
}
@Override
- @Test(groups = "Functional")
public void testExistingBranchName()
{
tree.getNode("leaf 2");
public void testExistingBranchName()
{
tree.getNode("leaf 2");
@@
-108,15
+105,12
@@
public class AptxPhylogenyTreeTest extends TreeViewTest
}
@Override
}
@Override
- @Test(groups = "Functional")
public void testTreeLoaded()
{
public void testTreeLoaded()
{
- assertTrue(aptx.getMainPanel().getCurrentTreePanel()
- .getPhylogeny() != null);
+ assertTrue(tree != null);
}
@Override
}
@Override
- @Test(groups = "Functional")
public void testChildNodesCount()
{
assertEquals(tree.getNode("ancestor 1").getNumberOfExternalNodes(), 3);
public void testChildNodesCount()
{
assertEquals(tree.getNode("ancestor 1").getNumberOfExternalNodes(), 3);
@@
-124,7
+118,6
@@
public class AptxPhylogenyTreeTest extends TreeViewTest
}
@Override
}
@Override
- @Test(groups = "Functional")
public void testChildToParentBranchLength()
{
assertEquals(tree.getNode("leaf 1a").getDistanceToParent(), 2.0);
public void testChildToParentBranchLength()
{
assertEquals(tree.getNode("leaf 1a").getDistanceToParent(), 2.0);
@@
-132,7
+125,6
@@
public class AptxPhylogenyTreeTest extends TreeViewTest
}
@Override
}
@Override
- @Test(groups = "Functional")
public void testNodeToRootBranchLength()
{
assertEquals(tree.getNode("leaf 2").getDistanceToParent(), 42.0);
public void testNodeToRootBranchLength()
{
assertEquals(tree.getNode("leaf 2").getDistanceToParent(), 42.0);
@@
-140,7
+132,6
@@
public class AptxPhylogenyTreeTest extends TreeViewTest
}
@Override
}
@Override
- @Test(groups = "Functional")
public void testDistantNodeToRootBranchLength()
{
assertEquals(tree.getNode("leaf 1c").calculateDistanceToRoot(),
public void testDistantNodeToRootBranchLength()
{
assertEquals(tree.getNode("leaf 1c").calculateDistanceToRoot(),
@@
-153,4
+144,5
@@
public class AptxPhylogenyTreeTest extends TreeViewTest
+
}
}