X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fproject%2FJalview2xmlTests.java;h=37f946b95e9295e245dfda69d562627e51f415bc;hb=279c6495df1a0de231600a2d283098c7411c4730;hp=37ef06927a8e79dc20192b70aa788072ed569628;hpb=80b889f0cca49103e1b20ed806755a0719789906;p=jalview.git diff --git a/test/jalview/project/Jalview2xmlTests.java b/test/jalview/project/Jalview2xmlTests.java index 37ef069..37f946b 100644 --- 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()); - } }