Merge branch 'develop' into features/JAL-4134_use_annotation_row_for_colours_and_groups

[jalview.git] / test / jalview / project / Jalview2xmlTests.java

diff --git a/test/jalview/project/Jalview2xmlTests.java b/test/jalview/project/Jalview2xmlTests.java
index 37ef069..37f946b 100644 (file)
--- a/test/jalview/project/Jalview2xmlTests.java
+++ b/test/jalview/project/Jalview2xmlTests.java
@@ -114,6 +114,8 @@ public class Jalview2xmlTests extends Jalview2xmlBase
   @BeforeClass(alwaysRun = true)
   public void setUpJvOptionPane()
   {
+    if (Desktop.instance != null)
+      Desktop.instance.closeAll_actionPerformed(null);
     JvOptionPane.setInteractiveMode(false);
     JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
   }
@@ -1602,7 +1604,6 @@ public class Jalview2xmlTests extends Jalview2xmlBase
       BitSet newGp = BitSet.valueOf(newlongvals);
       assertTrue(gp.equals(newGp));
     }
-
     File tfile = File.createTempFile("testStoreAndRecoverPAEmatrix",
             ".jvp");
     new Jalview2XML(false).saveState(tfile);
@@ -1629,7 +1630,6 @@ public class Jalview2xmlTests extends Jalview2xmlBase
     Assert.assertEquals(oldMap.getToRanges(), newMap.getToRanges());
     Assert.assertEquals(oldMap.getFromRatio(), newMap.getFromRatio());
     Assert.assertEquals(oldMap.getToRatio(), newMap.getToRatio());
-
     for (i = sq.getLength() - 1; i >= 0; i--)
     {
       ContactListI oldCM = dummyMat.getContactList(i),
@@ -1645,7 +1645,6 @@ public class Jalview2xmlTests extends Jalview2xmlBase
     Assert.assertEquals(restoredMat.getGroups(), dummyMat.getGroups());
     Assert.assertEquals(restoredMat.hasTree(), dummyMat.hasTree());
     Assert.assertEquals(restoredMat.getNewick(), dummyMat.getNewick());
-
   }
 
 }