JAL-4109 examine -Djalview.loglevel on startup to decide what the default log level...

[jalview.git] / test / jalview / io / Jalview2xmlBase.java

diff --git a/test/jalview/io/Jalview2xmlBase.java b/test/jalview/io/Jalview2xmlBase.java
index 15e18e3..10a4dc3 100644 (file)
--- a/test/jalview/io/Jalview2xmlBase.java
+++ b/test/jalview/io/Jalview2xmlBase.java
@@ -58,7 +58,8 @@ public class Jalview2xmlBase
      * set news feed last read to a future time to ensure no
      * 'unread' news item is displayed
      */
-    Date oneHourFromNow = new Date(System.currentTimeMillis() + 3600 * 1000);
+    Date oneHourFromNow = new Date(
+            System.currentTimeMillis() + 3600 * 1000);
     Cache.setDateProperty("JALVIEW_NEWS_RSS_LASTMODIFIED", oneHourFromNow);
 
     Jalview.main(new String[] {});
@@ -70,15 +71,16 @@ public class Jalview2xmlBase
   @AfterClass(alwaysRun = true)
   public static void tearDownAfterClass() throws Exception
   {
-    jalview.gui.Desktop.instance.closeAll_actionPerformed(null);
+    jalview.gui.Desktop.getInstance().closeAll_actionPerformed(null);
   }
 
   @BeforeTest(alwaysRun = true)
   public static void clearDesktop()
   {
-    if (Desktop.instance != null && Desktop.getAlignFrames() != null)
+    if (Desktop.getInstance() != null && Desktop.getFrames() != null
+            && Desktop.getFrames().length > 0)
     {
-      Desktop.instance.closeAll_actionPerformed(null);
+      Desktop.getInstance().closeAll_actionPerformed(null);
     }
   }