Merge branch 'develop' into features/JAL-518_justify_seqs_in_region

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

diff --git a/test/jalview/io/JalviewExportPropertiesTests.java b/test/jalview/io/JalviewExportPropertiesTests.java
index 1d138c0..29af915 100644 (file)
--- a/test/jalview/io/JalviewExportPropertiesTests.java
+++ b/test/jalview/io/JalviewExportPropertiesTests.java
@@ -22,14 +22,15 @@ package jalview.io;
 
 import static org.testng.AssertJUnit.assertTrue;
 
-import jalview.datamodel.SequenceGroup;
-import jalview.gui.AlignFrame;
-import jalview.gui.JvOptionPane;
-
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+import jalview.datamodel.SequenceGroup;
+import jalview.gui.AlignFrame;
+import jalview.gui.Desktop;
+import jalview.gui.JvOptionPane;
+
 /**
  * tests which verify that properties and preferences are correctly interpreted
  * when exporting/importing data
@@ -55,7 +56,7 @@ public class JalviewExportPropertiesTests
   {
     jalview.bin.Jalview
             .main(new String[]
-            { "-props", "test/jalview/io/testProps.jvprops" });
+            { "--props", "test/jalview/io/testProps.jvprops" });
   }
 
   /**
@@ -64,7 +65,8 @@ public class JalviewExportPropertiesTests
   @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);
 
   }