X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fio%2FNewickFileTests.java;h=466f218be7cbf9ca165d9c915226706b2e6bfd14;hb=0ccaf35f7e6a5cc62d4f433b39d574d0aa4b2d26;hp=beedb1116bd484004e5b588186b74d4bc11cce34;hpb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;p=jalview.git diff --git a/test/jalview/io/NewickFileTests.java b/test/jalview/io/NewickFileTests.java index beedb11..466f218 100644 --- a/test/jalview/io/NewickFileTests.java +++ b/test/jalview/io/NewickFileTests.java @@ -24,6 +24,7 @@ import static org.testng.ConversionUtils.wrapDataProvider; import jalview.analysis.SequenceIdMatcher; import jalview.analysis.TreeModel; +import jalview.datamodel.BinaryNode; import jalview.datamodel.SequenceI; import jalview.datamodel.SequenceNode; import jalview.gui.JvOptionPane; @@ -105,7 +106,7 @@ public class NewickFileTests AssertJUnit.assertTrue( stage + "Invalid Tree '" + nf.getWarningMessage() + "'", nf.isValid()); - SequenceNode tree = nf.getTree(); + BinaryNode tree = nf.getTree(); AssertJUnit.assertTrue(stage + "Null Tree", tree != null); stage = "Creating newick file from testTree " + treename; String gentree = new NewickFile(tree).print(nf.HasBootstrap(), @@ -119,11 +120,11 @@ public class NewickFileTests stage + "Newick file is invalid ('" + nf_regen.getWarningMessage() + "')", nf_regen.isValid()); - SequenceNode tree_regen = nf.getTree(); + BinaryNode tree_regen = nf.getTree(); AssertJUnit.assertTrue(stage + "Null Tree", tree_regen != null); stage = "Compare original and generated tree" + treename; - Vector oseqs, nseqs; + Vector oseqs, nseqs; oseqs = new TreeModel(new SequenceI[0], null, nf) .findLeaves(nf.getTree()); AssertJUnit.assertTrue(stage + "No nodes in original tree.",