X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FNewickFileTests.java;h=a783b1e3a4836d789a074e493c1b40ddd92a88d9;hb=fdefa22d3758831c3d35ed4f85df594d186019f6;hp=ee731e89273ce4bf9ff34d90a57cee5974aa9041;hpb=3412b273e964fb1a9d22564b04a5f0c827ec2461;p=jalview.git diff --git a/test/jalview/io/NewickFileTests.java b/test/jalview/io/NewickFileTests.java index ee731e8..a783b1e 100644 --- a/test/jalview/io/NewickFileTests.java +++ b/test/jalview/io/NewickFileTests.java @@ -20,25 +20,24 @@ */ package jalview.io; -import org.testng.annotations.Factory; import static org.testng.ConversionUtils.wrapDataProvider; -import org.testng.annotations.AfterClass; -import org.testng.annotations.Test; -import org.testng.annotations.BeforeClass; -import org.testng.Assert; -import org.testng.AssertJUnit; -import java.util.Arrays; -import java.util.Collection; -import java.util.Iterator; -import java.util.Vector; import jalview.analysis.NJTree; import jalview.analysis.SequenceIdMatcher; import jalview.datamodel.SequenceI; import jalview.datamodel.SequenceNode; -import org.jmol.util.ArrayUtil; +import java.util.Arrays; +import java.util.Collection; +import java.util.Vector; + import org.junit.runners.Parameterized.Parameters; +import org.testng.Assert; +import org.testng.AssertJUnit; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Factory; +import org.testng.annotations.Test; /** * @author jimp @@ -90,7 +89,7 @@ public class NewickFileTests { } - @Test + @Test(groups ={ "Functional" }) public void testTreeIO() throws Exception { String stage = "Init", treename = " '" + name + "' :"; @@ -129,7 +128,7 @@ public class NewickFileTests { olsqs[i] = (SequenceI) ((SequenceNode) oseqs.get(i)).element(); } - nseqs = (Vector) new NJTree(new SequenceI[0], nf_regen).findLeaves( + nseqs = new NJTree(new SequenceI[0], nf_regen).findLeaves( nf_regen.getTree(), new Vector()); AssertJUnit.assertTrue(stage + "No nodes in regerated tree.", nseqs.size() > 0); SequenceI[] nsqs = new SequenceI[nseqs.size()];