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 'develop' into features/JAL-2435splitScreenFont
[jalview.git]
/
test
/
jalview
/
io
/
NewickFileTests.java
diff --git
a/test/jalview/io/NewickFileTests.java
b/test/jalview/io/NewickFileTests.java
index
227af46
..
d198f0f
100644
(file)
--- a/
test/jalview/io/NewickFileTests.java
+++ b/
test/jalview/io/NewickFileTests.java
@@
-26,6
+26,7
@@
import jalview.analysis.NJTree;
import jalview.analysis.SequenceIdMatcher;
import jalview.datamodel.SequenceI;
import jalview.datamodel.SequenceNode;
import jalview.analysis.SequenceIdMatcher;
import jalview.datamodel.SequenceI;
import jalview.datamodel.SequenceNode;
+import jalview.gui.JvOptionPane;
import java.util.Arrays;
import java.util.Collection;
import java.util.Arrays;
import java.util.Collection;
@@
-46,6
+47,13
@@
import org.testng.annotations.Test;
public class NewickFileTests
{
public class NewickFileTests
{
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
@Factory
public static Object[] factoryData()
{
@Factory
public static Object[] factoryData()
{