X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fanalysis%2FTestAlignSeq.java;h=07aff4b3b53f3ebfa2a6bf3c11462c45d68e75bf;hb=838e4f91d4a53dd315640dbc9ff6ef7a815ee576;hp=4956bd8e7944c6fc144f146f01de9bd380b5d995;hpb=d69ae82ef958ae5bd67481d0b018a1db3662d4ae;p=jalview.git

diff --git a/test/jalview/analysis/TestAlignSeq.java b/test/jalview/analysis/TestAlignSeq.java
index 4956bd8..07aff4b 100644
--- a/test/jalview/analysis/TestAlignSeq.java
+++ b/test/jalview/analysis/TestAlignSeq.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
- * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
+ * Copyright (C) 2015 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -20,18 +20,18 @@
  */
 package jalview.analysis;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-import java.io.PrintStream;
-
-import org.junit.Before;
-import org.junit.Test;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
 
 import jalview.datamodel.Mapping;
 import jalview.datamodel.Sequence;
 import jalview.datamodel.SequenceI;
 
+import java.io.PrintStream;
+
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
 /**
  * Test the alignment -> Mapping routines
  * 
@@ -46,7 +46,7 @@ public class TestAlignSeq
   /**
    * @throws java.lang.Exception
    */
-  @Before
+  @BeforeMethod(alwaysRun = true)
   public void setUp() throws Exception
   {
     s1 = new Sequence("Seq1", "ASDFAQQQRRRSSS");
@@ -59,14 +59,13 @@ public class TestAlignSeq
 
   }
 
-  @Test
+  @Test(groups = { "Functional" })
   /**
    * simple test that mapping from alignment corresponds identical positions.
    */
   public void testGetMappingForS1()
   {
-    AlignSeq as = AlignSeq
-            .doGlobalNWAlignment(s1, s2, AlignSeq.PEP);
+    AlignSeq as = AlignSeq.doGlobalNWAlignment(s1, s2, AlignSeq.PEP);
     System.out.println("s1: " + as.getAStr1());
     System.out.println("s2: " + as.getAStr2());
 
@@ -86,7 +85,7 @@ public class TestAlignSeq
     }
   }
 
-  @Test
+  @Test(groups = { "Functional" })
   public void testExtractGaps()
   {
     assertNull(AlignSeq.extractGaps(null, null));
@@ -96,7 +95,7 @@ public class TestAlignSeq
     assertEquals("ABCD", AlignSeq.extractGaps(" .-", ". -A-B.C D."));
   }
 
-  @Test
+  @Test(groups = { "Functional" })
   public void testPrintAlignment()
   {
     AlignSeq as = AlignSeq.doGlobalNWAlignment(s1, s3, AlignSeq.PEP);