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-2465 missed commit for refactore renaming of getPdbFile() method to getStructureF...
[jalview.git]
/
test
/
jalview
/
analysis
/
RnaTest.java
diff --git
a/test/jalview/analysis/RnaTest.java
b/test/jalview/analysis/RnaTest.java
index
f96d2c9
..
814d2d4
100644
(file)
--- a/
test/jalview/analysis/RnaTest.java
+++ b/
test/jalview/analysis/RnaTest.java
@@
-27,13
+27,23
@@
import static org.testng.AssertJUnit.assertTrue;
import static org.testng.AssertJUnit.fail;
import jalview.analysis.SecStrConsensus.SimpleBP;
import static org.testng.AssertJUnit.fail;
import jalview.analysis.SecStrConsensus.SimpleBP;
+import jalview.gui.JvOptionPane;
import java.util.Vector;
import java.util.Vector;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
public class RnaTest
{
import org.testng.annotations.Test;
public class RnaTest
{
+
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
@Test(groups = { "Functional" })
public void testGetSimpleBPs() throws WUSSParseException
{
@Test(groups = { "Functional" })
public void testGetSimpleBPs() throws WUSSParseException
{
@@
-105,7
+115,7
@@
public class RnaTest
{
String s = String.valueOf((char) i);
String ss = Rna.getRNASecStrucState(s);
{
String s = String.valueOf((char) i);
String ss = Rna.getRNASecStrucState(s);
-
+
/*
* valid SS chars are a-z, A-Z, and various brackets;
* anything else is returned as a space
/*
* valid SS chars are a-z, A-Z, and various brackets;
* anything else is returned as a space
@@
-120,7
+130,7
@@
public class RnaTest
assertEquals(" ", ss);
}
}
assertEquals(" ", ss);
}
}
-
+
/*
* a string is processed character by character
*/
/*
* a string is processed character by character
*/
@@
-278,7
+288,7
@@
public class RnaTest
public void testIsRnaSecondaryStructureSymbol()
{
assertFalse(Rna.isRnaSecondaryStructureSymbol(null));
public void testIsRnaSecondaryStructureSymbol()
{
assertFalse(Rna.isRnaSecondaryStructureSymbol(null));
-
+
/*
* only A-Z, a-z, ()[]{}<> are valid symbols
*/
/*
* only A-Z, a-z, ()[]{}<> are valid symbols
*/