X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fschemes%2FDnaCodonTests.java;h=45b56c277b0e6ba27cc8e4f9344b84d0e45586dd;hb=37de9310bec3501cbc6381e0c3dcb282fcaad812;hp=6791d7cbfc722fabf4f6c5af84d9408f79789942;hpb=ad15cff29620f960119f80176f1fd443da9f6763;p=jalview.git

diff --git a/test/jalview/schemes/DnaCodonTests.java b/test/jalview/schemes/DnaCodonTests.java
index 6791d7c..45b56c2 100644
--- a/test/jalview/schemes/DnaCodonTests.java
+++ b/test/jalview/schemes/DnaCodonTests.java
@@ -20,31 +20,22 @@
  */
 package jalview.schemes;
 
-import static org.junit.Assert.*;
+import static org.testng.AssertJUnit.assertTrue;
 
-import jalview.datamodel.AlignmentI;
-import jalview.datamodel.ColumnSelection;
-import jalview.datamodel.Sequence;
-import jalview.datamodel.SequenceI;
-
-import java.io.IOException;
 import java.util.Map;
-import java.util.Vector;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 public class DnaCodonTests
 {
 
-  @Test
+  @Test(groups = { "Functional" })
   public void testAmbiguityCodeGeneration()
   {
     assertTrue(ResidueProperties.ambiguityCodes.size() > 0);
   }
 
-  @Test
+  @Test(groups = { "Functional" })
   public void testAmbiguityCodon()
   {
     for (String ac : ResidueProperties.ambiguityCodes.keySet())
@@ -54,7 +45,7 @@ public class DnaCodonTests
     }
   }
 
-  @Test
+  @Test(groups = { "Functional" })
   public void regenerateCodonTable()
   {
     for (Map.Entry<String, String> codon : ResidueProperties.codonHash2
@@ -64,46 +55,4 @@ public class DnaCodonTests
               + codon.getKey() + "\", \"" + codon.getValue() + "\");");
     }
   }
-
-  @Test
-  public void checkOldCodonagainstNewCodonTable()
-  {
-    // note - this test will be removed once the old codon table (including
-    // Vectors) is removed
-    String additional = "", failtrans = "", differentTr = "";
-    for (Object aa : ResidueProperties.codonHash.keySet())
-    {
-      String amacid = (String) aa;
-      for (Object codons : ((Vector) ResidueProperties.codonHash
-              .get(amacid)))
-      {
-        String codon = (String) codons;
-        String trans = ResidueProperties.codonTranslate(codon);
-        String oldtrans = ResidueProperties._codonTranslate(codon);
-        if (trans == null)
-        {
-          additional += "\nOld translation table includes additional codons for "
-                  + amacid + " : " + codon;
-        }
-        if (oldtrans == null)
-        {
-          failtrans += ("\nold translation routine failed for old translation entry (aa was "
-                  + amacid + " codon was " + codon + ")");
-        }
-        if (!oldtrans.equals(trans))
-        {
-          differentTr += ("\nDifferent translation for old and new routines: "
-                  + amacid
-                  + " "
-                  + codon
-                  + " => expected "
-                  + oldtrans
-                  + " and got " + trans);
-        }
-      }
-    }
-    assertTrue("" + additional + "\n" + failtrans + "\n" + differentTr,
-            additional.length() == 0 && failtrans.length() == 0
-                    && differentTr.length() == 0);
-  }
 }