Merge branch 'develop' into bug/JAL-4125_flatlaf_quithandler_warning_doesnt_display_p...

[jalview.git] / test / jalview / renderer / OverviewResColourFinderTest.java

diff --git a/test/jalview/renderer/OverviewResColourFinderTest.java b/test/jalview/renderer/OverviewResColourFinderTest.java
index 3931dbf..028777e 100644 (file)
--- a/test/jalview/renderer/OverviewResColourFinderTest.java
+++ b/test/jalview/renderer/OverviewResColourFinderTest.java
@@ -22,6 +22,12 @@ package jalview.renderer;
 
 import static org.testng.AssertJUnit.assertEquals;
 
+import java.awt.Color;
+import java.util.ArrayList;
+
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
 import jalview.bin.Cache;
 import jalview.datamodel.Alignment;
 import jalview.datamodel.AlignmentI;
@@ -30,16 +36,11 @@ import jalview.datamodel.SequenceGroup;
 import jalview.datamodel.SequenceI;
 import jalview.gui.AlignViewport;
 import jalview.gui.JvOptionPane;
+import jalview.gui.OverviewCanvas;
 import jalview.schemes.ColourSchemeI;
 import jalview.schemes.UserColourScheme;
 import jalview.schemes.ZappoColourScheme;
 
-import java.awt.Color;
-import java.util.ArrayList;
-
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
 public class OverviewResColourFinderTest
 {
 
@@ -185,7 +186,7 @@ public class OverviewResColourFinderTest
             av.getResidueShading(), groups, seq, 2, null));
 
     // use legacy colouring
-    rcf = new OverviewResColourFinder(true, Color.blue, Color.red);
+    rcf = new OverviewResColourFinder(Color.white, Color.lightGray, Color.red);
 
     // G in group specified as magenta in Zappo
     assertEquals(Color.magenta, rcf.getResidueColour(false,
@@ -200,7 +201,7 @@ public class OverviewResColourFinderTest
             av.getResidueShading(), groups, seq, 2, null));
 
     // use new colouring
-    rcf = new OverviewResColourFinder(false, Color.blue, Color.red);
+    rcf = new OverviewResColourFinder(Color.blue, Color.white, Color.red);
 
     // G in group specified as magenta in Zappo
     assertEquals(Color.magenta, rcf.getResidueColour(false,
@@ -233,12 +234,10 @@ public class OverviewResColourFinderTest
 
     // gaps gap colour
     c = rcf.getBoxColour(shader, seq, 3);
-    assertEquals(
-            jalview.renderer.OverviewResColourFinder.OVERVIEW_DEFAULT_GAP,
-            c);
+    assertEquals(OverviewCanvas.OVERVIEW_DEFAULT_GAP, c);
 
     // legacy colouring set explicitly via constructor
-    rcf = new OverviewResColourFinder(true, Color.blue, Color.red);
+    rcf = new OverviewResColourFinder(Color.white, Color.lightGray, Color.red);
     shader = new ResidueShader();
 
     // residues light gray
@@ -259,12 +258,10 @@ public class OverviewResColourFinderTest
 
     // gaps gap colour
     c = rcf.getBoxColour(shader, seq, 3);
-    assertEquals(
-            jalview.renderer.OverviewResColourFinder.OVERVIEW_DEFAULT_GAP,
-            c);
+    assertEquals(OverviewCanvas.OVERVIEW_DEFAULT_GAP, c);
 
     // non legacy colouring with colour scheme
-    rcf = new OverviewResColourFinder(false, Color.blue, Color.red);
+    rcf = new OverviewResColourFinder(Color.blue, Color.white, Color.red);
     shader = new ResidueShader(new ZappoColourScheme());
 
     // M residue pink
@@ -276,7 +273,7 @@ public class OverviewResColourFinderTest
     assertEquals(Color.blue, c);
 
     // legacy colouring with colour scheme
-    rcf = new OverviewResColourFinder(true, Color.blue, Color.red);
+    rcf = new OverviewResColourFinder(Color.white, Color.lightGray, Color.red);
 
     // M residue pink
     c = rcf.getBoxColour(shader, seq, 0);