JAL-1645 licencing for new files in test and utils

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

diff --git a/test/jalview/datamodel/AlignedCodonIteratorTest.java b/test/jalview/datamodel/AlignedCodonIteratorTest.java
index 671c51d..abb06ad 100644 (file)
--- a/test/jalview/datamodel/AlignedCodonIteratorTest.java
+++ b/test/jalview/datamodel/AlignedCodonIteratorTest.java
@@ -1,13 +1,34 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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.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,16 +41,16 @@ 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");
     from.createDatasetSequence();
     SequenceI to = new Sequence("Seq1", "-PQ-R-");
     to.createDatasetSequence();
-    MapList map = new MapList(new int[]
-    { 1, 1, 3, 4, 6, 6, 8, 10, 12, 13 }, new int[]
-    { 1, 3 }, 3, 1);
+    MapList map = new MapList(
+            new int[] { 1, 1, 3, 4, 6, 6, 8, 10, 12, 13 },
+            new int[] { 1, 3 }, 3, 1);
     Mapping m = new Mapping(to.getDatasetSequence(), map);
 
     Iterator<AlignedCodon> codons = m.getCodonIterator(from, '-');
@@ -48,16 +69,16 @@ 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");
     from.createDatasetSequence();
     SequenceI to = new Sequence("Seq1", "-PQ-TR-");
     to.createDatasetSequence();
-    MapList map = new MapList(new int[]
-    { 1, 1, 3, 4, 6, 6, 8, 10, 12, 13 }, new int[]
-    { 1, 2, 4, 4 }, 3, 1);
+    MapList map = new MapList(
+            new int[] { 1, 1, 3, 4, 6, 6, 8, 10, 12, 13 }, new int[] { 1,
+                2, 4, 4 }, 3, 1);
     Mapping m = new Mapping(to.getDatasetSequence(), map);
 
     Iterator<AlignedCodon> codons = m.getCodonIterator(from, '-');
@@ -72,20 +93,19 @@ public class AlignedCodonIteratorTest
     assertEquals("R", codon.product);
     assertFalse(codons.hasNext());
   }
-  
+
   /**
    * Test for exception thrown for an incomplete codon.
    */
-  @Test
+  @Test(groups = { "Functional" })
   public void testNext_incompleteCodon()
   {
     SequenceI from = new Sequence("Seq1", "-CgC-C-cCgTt");
     from.createDatasetSequence();
     SequenceI to = new Sequence("Seq1", "-PQ-R-");
     to.createDatasetSequence();
-    MapList map = new MapList(new int[]
-    { 1, 1, 3, 4, 6, 6, 8, 8 }, new int[]
-    { 1, 3 }, 3, 1);
+    MapList map = new MapList(new int[] { 1, 1, 3, 4, 6, 6, 8, 8 },
+            new int[] { 1, 3 }, 3, 1);
     Mapping m = new Mapping(to.getDatasetSequence(), map);
 
     Iterator<AlignedCodon> codons = m.getCodonIterator(from, '-');
@@ -95,7 +115,7 @@ public class AlignedCodonIteratorTest
     try
     {
       codon = codons.next();
-      fail("expected exception");
+      Assert.fail("expected exception");
     } catch (IncompleteCodonException e)
     {
       // expected
@@ -105,18 +125,16 @@ public class AlignedCodonIteratorTest
   /**
    * Test normal case for iterating over aligned codons.
    */
-  @Test
+  @Test(groups = { "Functional" })
   public void testAnother()
   {
     SequenceI from = new Sequence("Seq1", "TGCCATTACCAG-");
     from.createDatasetSequence();
     SequenceI to = new Sequence("Seq1", "CHYQ");
     to.createDatasetSequence();
-    MapList map = new MapList(new int[]
-    { 1, 12 }, new int[]
-    { 1, 4 }, 3, 1);
+    MapList map = new MapList(new int[] { 1, 12 }, new int[] { 1, 4 }, 3, 1);
     Mapping m = new Mapping(to.getDatasetSequence(), map);
-  
+
     Iterator<AlignedCodon> codons = m.getCodonIterator(from, '-');
     AlignedCodon codon = codons.next();
     assertEquals("[0, 1, 2]", codon.toString());