X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fanalysis%2FGroupingTest.java;h=4698d0dd5999f255b211891c8e0e6919cb1698b2;hb=7a1a7eea9501cd9e3841e996f4926cf1686be76a;hp=5c7a30543a64311fc31b2e3423992f3a43575d98;hpb=96817673359ec2199e0a9f7afab86bea4f2f1f38;p=jalview.git diff --git a/test/jalview/analysis/GroupingTest.java b/test/jalview/analysis/GroupingTest.java index 5c7a305..4698d0d 100644 --- a/test/jalview/analysis/GroupingTest.java +++ b/test/jalview/analysis/GroupingTest.java @@ -10,8 +10,8 @@ import jalview.datamodel.SequenceI; import java.util.ArrayList; import java.util.Arrays; -import org.junit.Assert; -import org.junit.Test; +import org.testng.AssertJUnit; +import org.testng.annotations.Test; public class GroupingTest { @@ -37,7 +37,7 @@ public class GroupingTest int[] positions = new int[] { 1, 7, 9 }; - @Test + @Test(groups ={ "Functional" }) public void testMakeGroupsWithBoth() { ArrayList str = new ArrayList(); @@ -64,17 +64,17 @@ public class GroupingTest alignment.getSequencesArray(), cs, Arrays.asList(new SequenceGroup[] { sg1, sg2 })); - Assert.assertEquals(seqgroupsString.length, seqgroupsColSel.length); + AssertJUnit.assertEquals(seqgroupsString.length, seqgroupsColSel.length); for (int p = 0; p < seqgroupsString.length; p++) { - Assert.assertEquals(seqgroupsString[p].getName(), + AssertJUnit.assertEquals(seqgroupsString[p].getName(), seqgroupsColSel[p].getName()); - Assert.assertArrayEquals( + AssertJUnit.assertArrayEquals( seqgroupsString[p].getSequencesInOrder(alignment), seqgroupsColSel[p].getSequencesInOrder(alignment)); if (seqgroupsString[p].getSequences().contains(s2)) { - Assert.assertTrue(seqgroupsString[p].getSize() == 2); + AssertJUnit.assertTrue(seqgroupsString[p].getSize() == 2); } } }