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-3847 Some attempts to fix a few eclipse import problems
[jalview.git]
/
test
/
jalview
/
io
/
PfamFormatInputTest.java
diff --git
a/test/jalview/io/PfamFormatInputTest.java
b/test/jalview/io/PfamFormatInputTest.java
index
0eaf94b
..
c91f8d7
100644
(file)
--- a/
test/jalview/io/PfamFormatInputTest.java
+++ b/
test/jalview/io/PfamFormatInputTest.java
@@
-21,30
+21,41
@@
package jalview.io;
import jalview.datamodel.AlignmentI;
package jalview.io;
import jalview.datamodel.AlignmentI;
+import jalview.gui.JvOptionPane;
import java.io.IOException;
import org.testng.Assert;
import java.io.IOException;
import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
public class PfamFormatInputTest
{
import org.testng.annotations.Test;
public class PfamFormatInputTest
{
- @Test
+
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
+ @Test(groups = "Functional")
public void testPfamFormatNoLimits() throws IOException
{
public void testPfamFormatNoLimits() throws IOException
{
- AlignmentI al = new jalview.io.AppletFormatAdapter().readFile("ASEQ"
- + '\t' + "...--FFAFAFF--", AppletFormatAdapter.PASTE, "PFAM");
+ AlignmentI al = new AppletFormatAdapter().readFile(
+ "ASEQ" + '\t' + "...--FFAFAFF--", DataSourceType.PASTE,
+ FileFormat.Pfam);
Assert.assertEquals(1, al.getHeight(), "Wrong number of sequences");
Assert.assertTrue(al.hasValidSequence(),
"Didn't extract limits from PFAM ID");
}
Assert.assertEquals(1, al.getHeight(), "Wrong number of sequences");
Assert.assertTrue(al.hasValidSequence(),
"Didn't extract limits from PFAM ID");
}
- @Test
+ @Test(groups = "Functional")
public void testPfamFormatValidLimits() throws IOException
{
public void testPfamFormatValidLimits() throws IOException
{
- AlignmentI al = new jalview.io.AppletFormatAdapter().readFile(
- "ASEQ/15-25" + '\t' + "...--FFAFAFF--",
- AppletFormatAdapter.PASTE, "PFAM");
+ AlignmentI al = new AppletFormatAdapter().readFile(
+ "ASEQ/15-25" + '\t' + "...--FFAFAFF--", DataSourceType.PASTE,
+ FileFormat.Pfam);
Assert.assertEquals(1, al.getHeight(), "Wrong number of sequences");
Assert.assertTrue(al.hasValidSequence(),
"Didn't extract limits from PFAM ID");
Assert.assertEquals(1, al.getHeight(), "Wrong number of sequences");
Assert.assertTrue(al.hasValidSequence(),
"Didn't extract limits from PFAM ID");