X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FJalview2xmlBase.java;h=fbdd7826330bdb37539b3a67652f6a57b1af30b2;hb=7c6dc8ce96f205c9330592ac18d5e9e6ef9407e0;hp=7f38dec207736d8c18004f0786e3c5789d821cb6;hpb=604cbee405a837565ba1a74aa9bddd62aed685ab;p=jalview.git

diff --git a/test/jalview/io/Jalview2xmlBase.java b/test/jalview/io/Jalview2xmlBase.java
index 7f38dec..fbdd782 100644
--- 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.gui.JvOptionPane;
 
 import java.util.Date;
 
@@ -35,6 +36,13 @@ import org.testng.annotations.BeforeTest;
 public class Jalview2xmlBase
 {
 
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
   /**
    * @throws java.lang.Exception
    */
@@ -68,7 +76,8 @@ public class Jalview2xmlBase
   @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);
     }