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
Merge branch 'features/JAL-2393customMatrices' into develop
[jalview.git]
/
test
/
jalview
/
schemes
/
ResiduePropertiesTest.java
diff --git
a/test/jalview/schemes/ResiduePropertiesTest.java
b/test/jalview/schemes/ResiduePropertiesTest.java
index
41d7448
..
7fbad50
100644
(file)
--- a/
test/jalview/schemes/ResiduePropertiesTest.java
+++ b/
test/jalview/schemes/ResiduePropertiesTest.java
@@
-23,15
+23,25
@@
package jalview.schemes;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertNull;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertNull;
+import jalview.gui.JvOptionPane;
+
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
public class ResiduePropertiesTest
{
import org.testng.annotations.Test;
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)
*/
@@
-1570,7
+1580,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");
}
/**
}
/**