X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fanalysis%2FGroupingTest.java;h=e046c0caf04b2ae49dd08e749fcc66d216cecff4;hb=3412b273e964fb1a9d22564b04a5f0c827ec2461;hp=5c7a30543a64311fc31b2e3423992f3a43575d98;hpb=4bba61a3c701f83bdcb6707c4d9f17a1f5faaa04;p=jalview.git diff --git a/test/jalview/analysis/GroupingTest.java b/test/jalview/analysis/GroupingTest.java index 5c7a305..e046c0c 100644 --- a/test/jalview/analysis/GroupingTest.java +++ b/test/jalview/analysis/GroupingTest.java @@ -1,5 +1,7 @@ package jalview.analysis; +import org.testng.annotations.Test; +import org.testng.AssertJUnit; import jalview.datamodel.Alignment; import jalview.datamodel.AlignmentI; import jalview.datamodel.ColumnSelection; @@ -10,9 +12,6 @@ import jalview.datamodel.SequenceI; import java.util.ArrayList; import java.util.Arrays; -import org.junit.Assert; -import org.junit.Test; - public class GroupingTest { Sequence s1 = new Sequence("s1", "AAAADDDDEEEE"); @@ -64,17 +63,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); } } }