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-629 Tests for FileUtils. Tidying counter substitutions. Fixing PAE opening.
[jalview.git]
/
test
/
jalview
/
schemes
/
ResiduePropertiesTest.java
diff --git
a/test/jalview/schemes/ResiduePropertiesTest.java
b/test/jalview/schemes/ResiduePropertiesTest.java
index
41d7448
..
28f39d8
100644
(file)
--- a/
test/jalview/schemes/ResiduePropertiesTest.java
+++ b/
test/jalview/schemes/ResiduePropertiesTest.java
@@
-27,11
+27,21
@@
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.List;
import java.util.Map;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import org.testng.annotations.Test;
+import jalview.gui.JvOptionPane;
+
public class ResiduePropertiesTest
{
public class ResiduePropertiesTest
{
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
/**
* Test 'standard' codon translations (no ambiguity codes)
*/
/**
* Test 'standard' codon translations (no ambiguity codes)
*/
@@
-212,7
+222,8
@@
public class ResiduePropertiesTest
*/
residues = ResidueProperties.getResidues(true, true);
Collections.sort(residues);
*/
residues = ResidueProperties.getResidues(true, true);
Collections.sort(residues);
- assertEquals("[A, C, G, I, N, R, T, U, X, Y]", residues.toString());
+ assertEquals("[A, B, C, D, G, H, I, K, M, N, R, S, T, U, V, W, X, Y]",
+ residues.toString());
}
@Test(groups = { "Functional" })
}
@Test(groups = { "Functional" })
@@
-1559,6
+1570,16
@@
public class ResiduePropertiesTest
}
@Test(groups = { "Functional" })
}
@Test(groups = { "Functional" })
+ public void testGetDssp3State()
+ {
+ assertNull(ResidueProperties.getDssp3state(null));
+ assertEquals("", ResidueProperties.getDssp3state(""));
+ String foo = "0123 []<>abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+ String bar = " E E HHH ";
+ assertEquals(bar, ResidueProperties.getDssp3state(foo));
+ }
+
+ @Test(groups = { "Functional" })
public void testPhysicoChemicalProperties()
{
checkProperty("aromatic", "FYWH-*");
public void testPhysicoChemicalProperties()
{
checkProperty("aromatic", "FYWH-*");
@@
-1570,7
+1591,7
@@
public class ResiduePropertiesTest
checkProperty("polar", "YWHRKTSNDEQ-*X");
checkProperty("positive", "HKR-*");
checkProperty("proline", "P-*");
checkProperty("polar", "YWHRKTSNDEQ-*X");
checkProperty("positive", "HKR-*");
checkProperty("proline", "P-*");
- checkProperty("hydrophobic", "MILVFYWHKCGAC-*X");
+ checkProperty("hydrophobic", "MILVFYWHKTGAC-*X");
}
/**
}
/**