Merge branch 'feature/JAL-244_Automatically_adjust_left_margin_to_avoid_cropping_anno...

[jalview.git] / test / jalview / gui / SeqPanelTest.java

diff --git a/test/jalview/gui/SeqPanelTest.java b/test/jalview/gui/SeqPanelTest.java
index 8cec90c..701431b 100644 (file)
--- a/test/jalview/gui/SeqPanelTest.java
+++ b/test/jalview/gui/SeqPanelTest.java
@@ -250,7 +250,8 @@ public class SeqPanelTest
   @AfterMethod(alwaysRun = true)
   public void tearDown()
   {
-    Desktop.instance.closeAll_actionPerformed(null);
+    if (Desktop.instance != null)
+      Desktop.instance.closeAll_actionPerformed(null);
   }
 
   @Test(groups = "Functional")
@@ -919,8 +920,8 @@ public class SeqPanelTest
       dna += dna;
     }
     assertEquals(dna.length(), 51200);
-    AlignFrame alignFrame = new FileLoader().LoadFileWaitTillLoaded(dna,
-            DataSourceType.PASTE);
+    AlignFrame alignFrame = new FileLoader()
+            .LoadFileWaitTillLoaded("dna " + dna, DataSourceType.PASTE);
     SeqPanel testee = alignFrame.alignPanel.getSeqPanel();
     AlignViewport av = alignFrame.getViewport();
     av.setScaleAboveWrapped(true);