X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fdatamodel%2FSeqCigarTest.java;h=8ef050c59166bda7834f89c692ac6fc29e363220;hb=57dd16688caa6dacaeaf465bab3ee8b6126e1a51;hp=fc0cb0e10962d6cf4466e30384db419d724ad61a;hpb=960206d9ae05d85b42552025c3dec4b5f7b14c15;p=jalview.git

diff --git a/test/jalview/datamodel/SeqCigarTest.java b/test/jalview/datamodel/SeqCigarTest.java
index fc0cb0e..8ef050c 100644
--- a/test/jalview/datamodel/SeqCigarTest.java
+++ b/test/jalview/datamodel/SeqCigarTest.java
@@ -1,9 +1,29 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
+ * Copyright (C) 2015 The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.datamodel;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertFalse;
 
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 /**
  * Unit tests for SeqCigar
@@ -15,7 +35,7 @@ public class SeqCigarTest
    * 
    * TODO: split into separate tests
    */
-  @Test
+  @Test(groups = { "Functional" })
   public void testSomething() throws Exception
   {
     String o_seq = "asdfktryasdtqwrtsaslldddptyipqqwaslchvhttt";
@@ -51,7 +71,7 @@ public class SeqCigarTest
      */
     assertEquals("Failed getWidth", sub_gapped_s.length(),
             sub_gapped.getWidth());
-  
+
     sub_gapped.getFullWidth();
     assertFalse("hasDeletedRegions is incorrect",
             sub_gapped.hasDeletedRegions());
@@ -86,9 +106,8 @@ public class SeqCigarTest
       }
     }
 
-    SeqCigar[] set = new SeqCigar[]
-    { new SeqCigar(s), new SeqCigar(s_subsequence_gapped, 8, 48),
-        new SeqCigar(s_gapped) };
+    SeqCigar[] set = new SeqCigar[] { new SeqCigar(s),
+        new SeqCigar(s_subsequence_gapped, 8, 48), new SeqCigar(s_gapped) };
     Alignment al = new Alignment(set);
     for (int i = 0; i < al.getHeight(); i++)
     {
@@ -99,9 +118,8 @@ public class SeqCigarTest
     }
 
     System.out.println("Gapped.");
-    set = new SeqCigar[]
-    { new SeqCigar(s), new SeqCigar(s_subsequence_gapped, 8, 48),
-        new SeqCigar(s_gapped) };
+    set = new SeqCigar[] { new SeqCigar(s),
+        new SeqCigar(s_subsequence_gapped, 8, 48), new SeqCigar(s_gapped) };
     set[0].deleteRange(20, 25);
     al = new Alignment(set);
     for (int i = 0; i < al.getHeight(); i++)
@@ -125,16 +143,15 @@ public class SeqCigarTest
    *          String
    * @return String
    */
+
   protected void testCigar_string(Sequence seq, String ex_cs_gapped)
   {
     SeqCigar c_sgapped = new SeqCigar(seq);
     String cs_gapped = c_sgapped.getCigarstring();
-    assertEquals("Failed getCigarstring", ex_cs_gapped,
-            cs_gapped);
+    assertEquals("Failed getCigarstring", ex_cs_gapped, cs_gapped);
   }
 
-  protected void testSeqRecovery(SeqCigar gen_sgapped,
-          SequenceI s_gapped)
+  protected void testSeqRecovery(SeqCigar gen_sgapped, SequenceI s_gapped)
   {
     // this is non-rigorous - start and end recovery is not tested.
     SequenceI gen_sgapped_s = gen_sgapped.getSeq('-');