X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fschemes%2FDnaCodonTests.java;h=d84f5677411bd161c69bdbd69271d8399ebd7e6b;hb=3412b273e964fb1a9d22564b04a5f0c827ec2461;hp=dc80fac84c164f80853631e7e8b232a7a21eb5b7;hpb=ab43013b7e357b84b4abade0dba949668dfb2a0e;p=jalview.git

diff --git a/test/jalview/schemes/DnaCodonTests.java b/test/jalview/schemes/DnaCodonTests.java
index dc80fac..d84f567 100644
--- a/test/jalview/schemes/DnaCodonTests.java
+++ b/test/jalview/schemes/DnaCodonTests.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -20,20 +20,9 @@
  */
 package jalview.schemes;
 
-import static org.junit.Assert.*;
-
-import jalview.datamodel.AlignmentI;
-import jalview.datamodel.ColumnSelection;
-import jalview.datamodel.Sequence;
-import jalview.datamodel.SequenceI;
-
-import java.io.IOException;
+import static org.testng.AssertJUnit.assertTrue;
+import org.testng.annotations.Test;
 import java.util.Map;
-import java.util.Vector;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
 
 public class DnaCodonTests
 {
@@ -71,13 +60,10 @@ public class DnaCodonTests
     // 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())
+    for (String amacid : ResidueProperties.codonHash.keySet())
     {
-      String amacid = (String) aa;
-      for (Object codons : ((Vector) ResidueProperties.codonHash
-              .get(amacid)))
+      for (String codon : ResidueProperties.codonHash.get(amacid))
       {
-        String codon = (String) codons;
         String trans = ResidueProperties.codonTranslate(codon);
         String oldtrans = ResidueProperties._codonTranslate(codon);
         if (trans == null)