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
/
ResiduePropertiesTest.java
diff --git
a/test/jalview/schemes/ResiduePropertiesTest.java
b/test/jalview/schemes/ResiduePropertiesTest.java
index
b82d338
..
eb2ad45
100644
(file)
--- a/
test/jalview/schemes/ResiduePropertiesTest.java
+++ b/
test/jalview/schemes/ResiduePropertiesTest.java
@@
-1,12
+1,12
@@
package jalview.schemes;
package jalview.schemes;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
import java.util.Collections;
import java.util.List;
import java.util.Collections;
import java.util.List;
-import org.junit.Test;
+import org.testng.annotations.Test;
public class ResiduePropertiesTest
{
public class ResiduePropertiesTest
{
@@
-14,7
+14,7
@@
public class ResiduePropertiesTest
/**
* Test 'standard' codon translations (no ambiguity codes)
*/
/**
* Test 'standard' codon translations (no ambiguity codes)
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testCodonTranslate()
{
// standard translation table order column 1/2/3/4
public void testCodonTranslate()
{
// standard translation table order column 1/2/3/4
@@
-88,7
+88,7
@@
public class ResiduePropertiesTest
* Test a sample of codon translations involving ambiguity codes. Should
* return a protein value where the ambiguity does not affect the translation.
*/
* Test a sample of codon translations involving ambiguity codes. Should
* return a protein value where the ambiguity does not affect the translation.
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testCodonTranslate_ambiguityCodes()
{
// Y is C or T
public void testCodonTranslate_ambiguityCodes()
{
// Y is C or T
@@
-175,7
+175,7
@@
public class ResiduePropertiesTest
assertNull(ResidueProperties.codonTranslate("WSK"));
}
assertNull(ResidueProperties.codonTranslate("WSK"));
}
- @Test
+ @Test(groups ={ "Functional" })
public void testGetResidues_nucleotide()
{
/*
public void testGetResidues_nucleotide()
{
/*
@@
-194,7
+194,7
@@
public class ResiduePropertiesTest
assertEquals("[A, C, G, I, N, R, T, U, X, Y]", residues.toString());
}
assertEquals("[A, C, G, I, N, R, T, U, X, Y]", residues.toString());
}
- @Test
+ @Test(groups ={ "Functional" })
public void testGetResidues_peptide()
{
/*
public void testGetResidues_peptide()
{
/*