JAL-1759 merge from develop

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

diff --git a/test/jalview/datamodel/AlignmentAnnotationTests.java b/test/jalview/datamodel/AlignmentAnnotationTests.java
index 7c1aa81..d32105d 100644 (file)
--- a/test/jalview/datamodel/AlignmentAnnotationTests.java
+++ b/test/jalview/datamodel/AlignmentAnnotationTests.java
@@ -1,16 +1,16 @@
 package jalview.datamodel;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-import org.junit.Test;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
 
 import jalview.analysis.AlignSeq;
 import jalview.io.AppletFormatAdapter;
 
+import org.testng.annotations.Test;
+
 public class AlignmentAnnotationTests
 {
-  @Test
+  @Test(groups ={ "Functional" })
   public void testCopyConstructor()
   {
     SequenceI sq = new Sequence("Foo", "ARAARARARAWEAWEAWRAWEAWE");
@@ -74,7 +74,7 @@ public class AlignmentAnnotationTests
    * different dataset frames (annotation transferred by mapping between
    * sequences)
    */
-  @Test
+  @Test(groups ={ "Functional" })
   public void testLiftOver()
   {
     SequenceI sqFrom = new Sequence("fromLong", "QQQCDEWGH");
@@ -157,7 +157,7 @@ public class AlignmentAnnotationTests
     }
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void testAdjustForAlignment()
   {
     SequenceI seq = new Sequence("TestSeq", "ABCDEFG");