Merge branch 'develop' into features/r2_11_2_alphafold/JAL-629
[jalview.git] / test / jalview / io / NewickFileTests.java
index beedb11..466f218 100644 (file)
@@ -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<SequenceNode> oseqs, nseqs;
+      Vector<BinaryNode> oseqs, nseqs;
       oseqs = new TreeModel(new SequenceI[0], null, nf)
               .findLeaves(nf.getTree());
       AssertJUnit.assertTrue(stage + "No nodes in original tree.",