X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fanalysis%2FGroupingTest.java;h=4698d0dd5999f255b211891c8e0e6919cb1698b2;hb=ab22918ab8fc67d30dad1fb1ae0f37e51f49df95;hp=61bd480b1de7a7d85e07fdcc5038b04de4e47527;hpb=f21eb611044169a07a7d4c6e2f69dd772fa7c872;p=jalview.git

diff --git a/test/jalview/analysis/GroupingTest.java b/test/jalview/analysis/GroupingTest.java
index 61bd480..4698d0d 100644
--- a/test/jalview/analysis/GroupingTest.java
+++ b/test/jalview/analysis/GroupingTest.java
@@ -1,6 +1,5 @@
 package jalview.analysis;
 
-import static org.junit.Assert.fail;
 import jalview.datamodel.Alignment;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.ColumnSelection;
@@ -11,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
 {
@@ -38,7 +37,7 @@ public class GroupingTest
   int[] positions = new int[]
   { 1, 7, 9 };
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void testMakeGroupsWithBoth()
   {
     ArrayList<String> str = new ArrayList<String>();
@@ -65,25 +64,19 @@ 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);
       }
     }
   }
 
-  @Test
-  public void testMakeGroupsFromCols()
-  {
-    fail("Not yet implemented"); // TODO
-  }
-
 }