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-1988 JAL-3130 New jlinked JRE in jalview_java2 with modules. Still needs jaxws...
[jalview.git]
/
test
/
jalview
/
analysis
/
FinderTest.java
diff --git
a/test/jalview/analysis/FinderTest.java
b/test/jalview/analysis/FinderTest.java
index
91ceb82
..
d7a509f
100644
(file)
--- a/
test/jalview/analysis/FinderTest.java
+++ b/
test/jalview/analysis/FinderTest.java
@@
-30,8
+30,9
@@
import jalview.datamodel.SearchResultMatchI;
import jalview.datamodel.SearchResultsI;
import jalview.datamodel.Sequence;
import jalview.gui.AlignFrame;
import jalview.datamodel.SearchResultsI;
import jalview.datamodel.Sequence;
import jalview.gui.AlignFrame;
+import jalview.gui.JvOptionPane;
+import jalview.io.DataSourceType;
import jalview.io.FileLoader;
import jalview.io.FileLoader;
-import jalview.io.FormatAdapter;
import java.util.List;
import java.util.List;
@@
-40,6
+41,13
@@
import org.testng.annotations.Test;
public class FinderTest
{
public class FinderTest
{
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
private AlignFrame af;
private AlignmentI al;
private AlignFrame af;
private AlignmentI al;
@@
-50,7
+58,7
@@
public class FinderTest
String seqData = "seq1 ABCD--EF-GHI\n" + "seq2 A--BCDefHI\n"
+ "seq3 --bcdEFH\n" + "seq4 aa---aMMMMMaaa\n";
af = new FileLoader().LoadFileWaitTillLoaded(seqData,
String seqData = "seq1 ABCD--EF-GHI\n" + "seq2 A--BCDefHI\n"
+ "seq3 --bcdEFH\n" + "seq4 aa---aMMMMMaaa\n";
af = new FileLoader().LoadFileWaitTillLoaded(seqData,
- FormatAdapter.PASTE);
+ DataSourceType.PASTE);
al = af.getViewport().getAlignment();
}
al = af.getViewport().getAlignment();
}