X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fio%2FNewickFileTests.java;h=227af46981168973a74b8524a98d9c7e827015c6;hb=7d67fb613ec026dc9a265e351e7fab542e3f1d61;hp=7acc37d07fa2566ba39a1706464315329e6fb749;hpb=02e38bb826828ab2991584cf4b737c0138cb6c44;p=jalview.git diff --git a/test/jalview/io/NewickFileTests.java b/test/jalview/io/NewickFileTests.java index 7acc37d..227af46 100644 --- a/test/jalview/io/NewickFileTests.java +++ b/test/jalview/io/NewickFileTests.java @@ -116,24 +116,23 @@ public class NewickFileTests AssertJUnit.assertTrue(stage + "Null Tree", tree_regen != null); stage = "Compare original and generated tree" + treename; - Vector oseqs, nseqs; - oseqs = new NJTree(new SequenceI[0], nf).findLeaves(nf.getTree(), - new Vector()); + Vector oseqs, nseqs; + oseqs = new NJTree(new SequenceI[0], nf).findLeaves(nf.getTree()); AssertJUnit.assertTrue(stage + "No nodes in original tree.", oseqs.size() > 0); SequenceI[] olsqs = new SequenceI[oseqs.size()]; for (int i = 0, iSize = oseqs.size(); i < iSize; i++) { - olsqs[i] = (SequenceI) ((SequenceNode) oseqs.get(i)).element(); + olsqs[i] = (SequenceI) oseqs.get(i).element(); } - nseqs = new NJTree(new SequenceI[0], nf_regen).findLeaves( - nf_regen.getTree(), new Vector()); + nseqs = new NJTree(new SequenceI[0], nf_regen).findLeaves(nf_regen + .getTree()); AssertJUnit.assertTrue(stage + "No nodes in regerated tree.", nseqs.size() > 0); SequenceI[] nsqs = new SequenceI[nseqs.size()]; for (int i = 0, iSize = nseqs.size(); i < iSize; i++) { - nsqs[i] = (SequenceI) ((SequenceNode) nseqs.get(i)).element(); + nsqs[i] = (SequenceI) nseqs.get(i).element(); } AssertJUnit.assertTrue(stage + " Different number of leaves (original " + olsqs.length