From 80deacabf176462487e1703ad24397ae30ebc5e2 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Thu, 11 Aug 2016 21:36:09 +0100 Subject: [PATCH] JAL-2154 clear the desktop before every 2xml test --- test/jalview/io/Jalview2xmlBase.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/jalview/io/Jalview2xmlBase.java b/test/jalview/io/Jalview2xmlBase.java index bfd5ca4..d774f87 100644 --- a/test/jalview/io/Jalview2xmlBase.java +++ b/test/jalview/io/Jalview2xmlBase.java @@ -3,12 +3,14 @@ package jalview.io; import jalview.bin.Cache; import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.SequenceI; +import jalview.gui.Desktop; import java.time.Instant; import java.util.Date; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; +import org.testng.annotations.BeforeTest; public class Jalview2xmlBase { @@ -36,6 +38,12 @@ public class Jalview2xmlBase jalview.gui.Desktop.instance.closeAll_actionPerformed(null); } + @BeforeTest(alwaysRun = true) + public static void clearDesktop() + { + Desktop.instance.closeAll_actionPerformed(null); + } + public int countDsAnn(jalview.viewmodel.AlignmentViewport avp) { int numdsann = 0; -- 1.7.10.2