git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-1355 user error message text externalised
[jalview.git]
/
test
/
jalview
/
schemes
/
DnaCodonTests.java
diff --git
a/test/jalview/schemes/DnaCodonTests.java
b/test/jalview/schemes/DnaCodonTests.java
index
6791d7c
..
3d20190
100644
(file)
--- a/
test/jalview/schemes/DnaCodonTests.java
+++ b/
test/jalview/schemes/DnaCodonTests.java
@@
-20,31
+20,22
@@
*/
package jalview.schemes;
*/
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.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
{
public class DnaCodonTests
{
- @Test
+ @Test(groups ={ "Functional" })
public void testAmbiguityCodeGeneration()
{
assertTrue(ResidueProperties.ambiguityCodes.size() > 0);
}
public void testAmbiguityCodeGeneration()
{
assertTrue(ResidueProperties.ambiguityCodes.size() > 0);
}
- @Test
+ @Test(groups ={ "Functional" })
public void testAmbiguityCodon()
{
for (String ac : ResidueProperties.ambiguityCodes.keySet())
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
public void regenerateCodonTable()
{
for (Map.Entry<String, String> codon : ResidueProperties.codonHash2
@@
-65,19
+56,16
@@
public class DnaCodonTests
}
}
}
}
- @Test
+ @Test(groups ={ "Functional" })
public void checkOldCodonagainstNewCodonTable()
{
// note - this test will be removed once the old codon table (including
// Vectors) is removed
String additional = "", failtrans = "", differentTr = "";
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())
+ 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)
String trans = ResidueProperties.codonTranslate(codon);
String oldtrans = ResidueProperties._codonTranslate(codon);
if (trans == null)