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-2034 don't refresh Overview for selection in id panel
[jalview.git]
/
test
/
jalview
/
ext
/
ensembl
/
EnsemblSeqProxyTest.java
diff --git
a/test/jalview/ext/ensembl/EnsemblSeqProxyTest.java
b/test/jalview/ext/ensembl/EnsemblSeqProxyTest.java
index
d3a6e32
..
e977233
100644
(file)
--- a/
test/jalview/ext/ensembl/EnsemblSeqProxyTest.java
+++ b/
test/jalview/ext/ensembl/EnsemblSeqProxyTest.java
@@
-28,7
+28,8
@@
import static org.testng.internal.junit.ArrayAsserts.assertArrayEquals;
import jalview.datamodel.Alignment;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
import jalview.datamodel.Alignment;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
-import jalview.io.AppletFormatAdapter;
+import jalview.gui.JvOptionPane;
+import jalview.io.DataSourceType;
import jalview.io.FastaFile;
import jalview.io.FileParse;
import jalview.io.gff.SequenceOntologyFactory;
import jalview.io.FastaFile;
import jalview.io.FileParse;
import jalview.io.gff.SequenceOntologyFactory;
@@
-45,6
+46,14
@@
import org.testng.annotations.Test;
public class EnsemblSeqProxyTest
{
public class EnsemblSeqProxyTest
{
+
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
private static final Object[][] allSeqs = new Object[][] {
{
new EnsemblProtein(),
private static final Object[][] allSeqs = new Object[][] {
{
new EnsemblProtein(),
@@
-150,7
+159,7
@@
public class EnsemblSeqProxyTest
FileParse fp = proxy.getSequenceReader(Arrays
.asList(new String[] { sq }));
SequenceI[] sqs = new FastaFile(fp).getSeqsAsArray();
FileParse fp = proxy.getSequenceReader(Arrays
.asList(new String[] { sq }));
SequenceI[] sqs = new FastaFile(fp).getSeqsAsArray();
- FastaFile trueRes = new FastaFile(fastasq, AppletFormatAdapter.PASTE);
+ FastaFile trueRes = new FastaFile(fastasq, DataSourceType.PASTE);
SequenceI[] trueSqs = trueRes.getSeqsAsArray();
Assert.assertEquals(sqs.length, trueSqs.length,
"Different number of sequences retrieved for query " + sq);
SequenceI[] trueSqs = trueRes.getSeqsAsArray();
Assert.assertEquals(sqs.length, trueSqs.length,
"Different number of sequences retrieved for query " + sq);