JAL-1805 test envirionment separation

[jalview.git] / test / jalview / datamodel / AlignedCodonIteratorTest.java

diff --git a/test/jalview/datamodel/AlignedCodonIteratorTest.java b/test/jalview/datamodel/AlignedCodonIteratorTest.java
index 671c51d..d9c7e12 100644 (file)
--- a/test/jalview/datamodel/AlignedCodonIteratorTest.java
+++ b/test/jalview/datamodel/AlignedCodonIteratorTest.java
@@ -1,13 +1,14 @@
 package jalview.datamodel;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.fail;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertFalse;
+
 import jalview.util.MapList;
 
 import java.util.Iterator;
 
-import org.junit.Test;
+import org.testng.Assert;
+import org.testng.annotations.Test;
 
 /**
  * Unit tests for Mapping$AlignedCodonIterator
@@ -20,7 +21,7 @@ public class AlignedCodonIteratorTest
   /**
    * Test normal case for iterating over aligned codons.
    */
-  @Test
+  @Test(groups ={ "Functional" })
   public void testNext()
   {
     SequenceI from = new Sequence("Seq1", "-CgC-C-cCtAG-AtG-Gc");
@@ -48,7 +49,7 @@ public class AlignedCodonIteratorTest
   /**
    * Test weird case where the mapping skips over a peptide.
    */
-  @Test
+  @Test(groups ={ "Functional" })
   public void testNext_unmappedPeptide()
   {
     SequenceI from = new Sequence("Seq1", "-CgC-C-cCtAG-AtG-Gc");
@@ -76,7 +77,7 @@ public class AlignedCodonIteratorTest
   /**
    * Test for exception thrown for an incomplete codon.
    */
-  @Test
+  @Test(groups ={ "Functional" })
   public void testNext_incompleteCodon()
   {
     SequenceI from = new Sequence("Seq1", "-CgC-C-cCgTt");
@@ -95,7 +96,7 @@ public class AlignedCodonIteratorTest
     try
     {
       codon = codons.next();
-      fail("expected exception");
+      Assert.fail("expected exception");
     } catch (IncompleteCodonException e)
     {
       // expected
@@ -105,7 +106,7 @@ public class AlignedCodonIteratorTest
   /**
    * Test normal case for iterating over aligned codons.
    */
-  @Test
+  @Test(groups ={ "Functional" })
   public void testAnother()
   {
     SequenceI from = new Sequence("Seq1", "TGCCATTACCAG-");