X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Frenderer%2Fseqfeatures%2FFeatureRendererTest.java;h=944f147b1312c8c824c05aae82681a19191ca412;hb=38b29c5c15993cfb29d53b16a524fe5fc1445a7d;hp=2e04ecb663b96a353cfe0bcd700fa4829f28ad95;hpb=335026a8f716032fcd79f576ba8c61ee57671baa;p=jalview.git

diff --git a/test/jalview/renderer/seqfeatures/FeatureRendererTest.java b/test/jalview/renderer/seqfeatures/FeatureRendererTest.java
index 2e04ecb..944f147 100644
--- a/test/jalview/renderer/seqfeatures/FeatureRendererTest.java
+++ b/test/jalview/renderer/seqfeatures/FeatureRendererTest.java
@@ -27,6 +27,16 @@ import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertSame;
 import static org.testng.Assert.assertTrue;
 
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
 import jalview.analysis.GeneticCodes;
 import jalview.api.AlignViewportI;
 import jalview.api.FeatureColourI;
@@ -46,17 +56,14 @@ import jalview.schemes.FeatureColour;
 import jalview.util.matcher.Condition;
 import jalview.viewmodel.seqfeatures.FeatureRendererModel.FeatureSettingsBean;
 
-import java.awt.Color;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.testng.annotations.Test;
-
 public class FeatureRendererTest
 {
+  @BeforeMethod(alwaysRun = true)
+  public void closeAll()
+  {
+    if (Desktop.instance != null)
+      Desktop.instance.closeAll_actionPerformed(null);
+  }
 
   @Test(groups = "Functional")
   public void testFindAllFeatures()
@@ -463,7 +470,8 @@ public class FeatureRendererTest
     gc = new FeatureColour(Color.red, Color.yellow, Color.red, Color.green,
             5f, 11f);
     fr.getFeatureColours().put("Cath", gc);
-    gc.setAutoScaled(false); // this does little other than save a checkbox setting!
+    gc.setAutoScaled(false); // this does little other than save a checkbox
+                             // setting!
     assertEquals(fr.getColour(sf2), new Color(255, 213, 0));
 
     /*
@@ -649,7 +657,7 @@ public class FeatureRendererTest
     SequenceFeature sf2 = new SequenceFeature("sequence_variant", "C, CA",
             3, 3, "ensembl");
     seq1.addSequenceFeature(sf2);
-    
+
     /*
      * 'find' mapped features from the peptide position
      * - first with CDS features _not_ shown on peptide alignment