X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FJalview2xmlBase.java;h=a197340abcb312773db6df0d2db5903e3f431238;hb=HEAD;hp=fbdd7826330bdb37539b3a67652f6a57b1af30b2;hpb=92c318069f0358002bf5684a4a6f6b58bd6234e5;p=jalview.git

diff --git a/test/jalview/io/Jalview2xmlBase.java b/test/jalview/io/Jalview2xmlBase.java
index fbdd782..a197340 100644
--- a/test/jalview/io/Jalview2xmlBase.java
+++ b/test/jalview/io/Jalview2xmlBase.java
@@ -20,6 +20,12 @@
  */
 package jalview.io;
 
+import java.util.Date;
+
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeTest;
+
 import jalview.bin.Cache;
 import jalview.bin.Jalview;
 import jalview.datamodel.AlignmentAnnotation;
@@ -27,12 +33,6 @@ import jalview.datamodel.SequenceI;
 import jalview.gui.Desktop;
 import jalview.gui.JvOptionPane;
 
-import java.util.Date;
-
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeTest;
-
 public class Jalview2xmlBase
 {
 
@@ -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,7 +71,8 @@ public class Jalview2xmlBase
   @AfterClass(alwaysRun = true)
   public static void tearDownAfterClass() throws Exception
   {
-    jalview.gui.Desktop.instance.closeAll_actionPerformed(null);
+    if (Desktop.instance != null)
+      Desktop.instance.closeAll_actionPerformed(null);
   }
 
   @BeforeTest(alwaysRun = true)