X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FNewickFileTests.java;h=4de36f2b33e36a293ff932449fcdab37a7675525;hb=44d74820a0af7a277c10c1eab98b59eb7fceddf6;hp=f89f58bc8df125c007394f28a84f9dee4c18333b;hpb=cbc07eab0291f023f89b2554c488ae9e4587ae2a;p=jalview.git diff --git a/test/jalview/io/NewickFileTests.java b/test/jalview/io/NewickFileTests.java index f89f58b..4de36f2 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