X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Futil%2FMappingUtilsTest.java;h=2c0045b2f54a64a04c279d92df1004355f442981;hb=4e4cd7954b978bfe1ba652e44be2510626efa177;hp=8fc45071c45233d9a63a86a07971dc0988bbbabc;hpb=6dd554fdbf34db6b79595d5027159d20225f4894;p=jalview.git

diff --git a/test/jalview/util/MappingUtilsTest.java b/test/jalview/util/MappingUtilsTest.java
index 8fc4507..2c0045b 100644
--- a/test/jalview/util/MappingUtilsTest.java
+++ b/test/jalview/util/MappingUtilsTest.java
@@ -1,8 +1,10 @@
 package jalview.util;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+import static org.testng.AssertJUnit.assertTrue;
+
 import jalview.api.AlignViewportI;
 import jalview.datamodel.AlignedCodonFrame;
 import jalview.datamodel.AlignmentI;
@@ -24,7 +26,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 public class MappingUtilsTest
 {
@@ -34,7 +36,7 @@ public class MappingUtilsTest
   /**
    * Simple test of mapping with no intron involved.
    */
-  @Test
+  @Test(groups ={ "Functional" })
   public void testBuildSearchResults()
   {
     final Sequence seq1 = new Sequence("Seq1", "C-G-TA-GC");
@@ -87,7 +89,7 @@ public class MappingUtilsTest
   /**
    * Simple test of mapping with introns involved.
    */
-  @Test
+  @Test(groups ={ "Functional" })
   public void testBuildSearchResults_withIntron()
   {
     final Sequence seq1 = new Sequence("Seq1", "C-G-TAGA-GCAGCTT");
@@ -164,7 +166,7 @@ public class MappingUtilsTest
    * 
    * @throws IOException
    */
-  @Test
+  @Test(groups ={ "Functional" })
   public void testMapSequenceGroup_sequences() throws IOException
   {
     /*
@@ -257,7 +259,7 @@ public class MappingUtilsTest
    * 
    * @throws IOException
    */
-  @Test
+  @Test(groups ={ "Functional" })
   public void testMapColumnSelection_proteinToDna() throws IOException
   {
     setupMappedAlignments();
@@ -355,7 +357,7 @@ public class MappingUtilsTest
    * 
    * @throws IOException
    */
-  @Test
+  @Test(groups ={ "Functional" })
   public void testMapColumnSelection_dnaToProtein() throws IOException
   {
     setupMappedAlignments();
@@ -382,7 +384,7 @@ public class MappingUtilsTest
     assertEquals("[0, 1, 3]", cs.getSelected().toString());
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void testMapColumnSelection_null() throws IOException
   {
     setupMappedAlignments();
@@ -395,7 +397,7 @@ public class MappingUtilsTest
    * Tests for the method that converts a series of [start, end] ranges to
    * single positions
    */
-  @Test
+  @Test(groups ={ "Functional" })
   public void testFlattenRanges()
   {
     assertEquals("[1, 2, 3, 4]",
@@ -421,7 +423,7 @@ public class MappingUtilsTest
    * 
    * @throws IOException
    */
-  @Test
+  @Test(groups ={ "Functional" })
   public void testMapSequenceGroup_columns() throws IOException
   {
     /*
@@ -504,7 +506,7 @@ public class MappingUtilsTest
    * 
    * @throws IOException
    */
-  @Test
+  @Test(groups ={ "Functional" })
   public void testMapSequenceGroup_region() throws IOException
   {
     /*
@@ -598,7 +600,7 @@ public class MappingUtilsTest
     assertEquals(4, mappedGroup.getEndRes());
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void testFindMappingsForSequence()
   {
     SequenceI seq1 = new Sequence("Seq1", "ABC");