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-3248 added conversion of building.md to building.html to gradle task. Will happen...
[jalview.git]
/
test
/
jalview
/
io
/
Jalview2xmlBase.java
diff --git
a/test/jalview/io/Jalview2xmlBase.java
b/test/jalview/io/Jalview2xmlBase.java
index
7f38dec
..
fbdd782
100644
(file)
--- a/
test/jalview/io/Jalview2xmlBase.java
+++ b/
test/jalview/io/Jalview2xmlBase.java
@@
-25,6
+25,7
@@
import jalview.bin.Jalview;
import jalview.datamodel.AlignmentAnnotation;
import jalview.datamodel.SequenceI;
import jalview.gui.Desktop;
import jalview.datamodel.AlignmentAnnotation;
import jalview.datamodel.SequenceI;
import jalview.gui.Desktop;
+import jalview.gui.JvOptionPane;
import java.util.Date;
import java.util.Date;
@@
-35,6
+36,13
@@
import org.testng.annotations.BeforeTest;
public class Jalview2xmlBase
{
public class Jalview2xmlBase
{
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
/**
* @throws java.lang.Exception
*/
/**
* @throws java.lang.Exception
*/
@@
-68,7
+76,8
@@
public class Jalview2xmlBase
@BeforeTest(alwaysRun = true)
public static void clearDesktop()
{
@BeforeTest(alwaysRun = true)
public static void clearDesktop()
{
- if (Desktop.instance != null && Desktop.getAlignFrames() != null)
+ if (Desktop.instance != null && Desktop.getFrames() != null
+ && Desktop.getFrames().length > 0)
{
Desktop.instance.closeAll_actionPerformed(null);
}
{
Desktop.instance.closeAll_actionPerformed(null);
}