JAL-32423 tidying

[jalview.git] / test / jalview / renderer / seqfeatures / FeatureColourFinderTest.java

diff --git a/test/jalview/renderer/seqfeatures/FeatureColourFinderTest.java b/test/jalview/renderer/seqfeatures/FeatureColourFinderTest.java
index d8b905e..eab8805 100644 (file)
--- a/test/jalview/renderer/seqfeatures/FeatureColourFinderTest.java
+++ b/test/jalview/renderer/seqfeatures/FeatureColourFinderTest.java
@@ -7,6 +7,7 @@ import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
 import jalview.api.FeatureColourI;
+import jalview.bin.Cache;
 import jalview.datamodel.SequenceFeature;
 import jalview.datamodel.SequenceI;
 import jalview.gui.AlignFrame;
@@ -56,6 +57,7 @@ public class FeatureColourFinderTest
   @BeforeTest(alwaysRun = true)
   public void setUp()
   {
+    Cache.initLogger();
     // aligned column 8 is sequence position 6
     String s = ">s1\nABCDE---FGHIJKLMNOPQRSTUVWXYZ\n";
     af = new FileLoader().LoadFileWaitTillLoaded(s,
@@ -73,6 +75,13 @@ public class FeatureColourFinderTest
   @BeforeMethod(alwaysRun = true)
   public void setUpBeforeTest()
   {
+    /*
+     * fudge for failure in test suite on Windows;
+     * without this call added, av.getAlignment() is null;
+     * root cause not known - AlignViewport.dispose() called??
+     */
+    setUp();
+
     List<SequenceFeature> sfs = seq.getSequenceFeatures();
     for (SequenceFeature sf : sfs)
     {
@@ -323,7 +332,7 @@ public class FeatureColourFinderTest
      */
     Color min = new Color(100, 50, 150);
     Color max = new Color(200, 0, 100);
-    FeatureColourI fc = new FeatureColour(min, max, 0, 10);
+    FeatureColourI fc = new FeatureColour(null, min, max, null, 0, 10);
     fr.setColour("kd", fc);
     fr.featuresAdded();
     av.setShowSequenceFeatures(true);
@@ -493,7 +502,7 @@ public class FeatureColourFinderTest
      */
     Color min = new Color(100, 50, 150);
     Color max = new Color(200, 0, 100);
-    FeatureColourI fc = new FeatureColour(min, max, 0, 10);
+    FeatureColourI fc = new FeatureColour(null, min, max, null, 0, 10);
     fc.setAboveThreshold(true);
     fc.setThreshold(5f);
     fr.setColour(kdFeature, fc);