properly quit so JUnit marks tests as successful

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

diff --git a/test/jalview/io/Jalview2xmlTests.java b/test/jalview/io/Jalview2xmlTests.java
index 4ef038a..d553629 100644 (file)
--- a/test/jalview/io/Jalview2xmlTests.java
+++ b/test/jalview/io/Jalview2xmlTests.java
@@ -29,7 +29,8 @@ public class Jalview2xmlTests
   @AfterClass
   public static void tearDownAfterClass() throws Exception
   {
-    jalview.gui.Desktop.instance.quit();
+    jalview.gui.Desktop.instance.closeAll_actionPerformed(null);
+    
   }
   public int countDsAnn(jalview.viewmodel.AlignmentViewport avp)
   {
@@ -57,6 +58,8 @@ public class Jalview2xmlTests
     assertTrue("Didn't read input file "+inFile, af!=null);
     int olddsann=countDsAnn(af.getViewport());
     assertTrue("Didn't find any dataset annotations",olddsann>0);
+    af.rnahelicesColour_actionPerformed(null);
+    assertTrue("Couldn't apply RNA helices colourscheme",af.getViewport().getGlobalColourScheme() instanceof jalview.schemes.RNAHelicesColour);
     assertTrue("Failed to store as a project.",af.saveAlignment(tfile, "Jalview"));
     af.closeMenuItem_actionPerformed(true);
     af=null;
@@ -65,6 +68,7 @@ public class Jalview2xmlTests
     int newdsann=countDsAnn(af.getViewport());
     assertTrue("Differing numbers of dataset sequence annotation\nOriginally "+olddsann+" and now "+newdsann,olddsann==newdsann);
     System.out.println("Read in same number of annotations as originally present ("+olddsann+")");
+    assertTrue("RNA helices colourscheme was not applied on import.",af.getViewport().getGlobalColourScheme() instanceof jalview.schemes.RNAHelicesColour);
   }
   @Test
   public void testTCoffeeScores() throws Exception
@@ -93,5 +97,4 @@ public class Jalview2xmlTests
     assertTrue("Didn't set T-coffee colourscheme for imported project.",af.getViewport().getGlobalColourScheme().getClass().equals(jalview.schemes.TCoffeeColourScheme.class));
     System.out.println("T-Coffee score shading successfully recovered from project.");
   }
-
 }