JAL-2588 Check/fix show boxes settings + unit test updates.

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

diff --git a/test/jalview/renderer/OverviewResColourFinderTest.java b/test/jalview/renderer/OverviewResColourFinderTest.java
index 900994e..649a0bf 100644 (file)
--- a/test/jalview/renderer/OverviewResColourFinderTest.java
+++ b/test/jalview/renderer/OverviewResColourFinderTest.java
@@ -55,10 +55,18 @@ public class OverviewResColourFinderTest
     ResidueColourFinder rcf = new OverviewResColourFinder();
 
     // gaps are grey, residues white
-    assertEquals(Color.white, rcf.getResidueColour(av.getResidueShading(),
+    assertEquals(Color.white, rcf.getResidueColour(true,
+            av.getResidueShading(),
             null, seq, 0, null));
     assertEquals(Color.lightGray, rcf
-            .getResidueColour(av.getResidueShading(), null, seq, 2, null));
+            .getResidueColour(true, av.getResidueShading(), null, seq, 2,
+                    null));
+
+    // unaffected by showBoxes setting
+    assertEquals(Color.white, rcf.getResidueColour(false,
+            av.getResidueShading(), null, seq, 0, null));
+    assertEquals(Color.lightGray, rcf.getResidueColour(false,
+            av.getResidueShading(), null, seq, 2, null));
   }
 
   @Test(groups = { "Functional" })
@@ -72,22 +80,38 @@ public class OverviewResColourFinderTest
     av.setGlobalColourScheme(new ZappoColourScheme());
 
     // @see ResidueProperties.zappo
-    assertEquals(Color.pink, rcf.getResidueColour(av.getResidueShading(),
+    assertEquals(Color.pink,
+            rcf.getResidueColour(true, av.getResidueShading(),
             null, seq, 0, null)); // M
-    assertEquals(Color.green, rcf.getResidueColour(av.getResidueShading(),
+    assertEquals(Color.green,
+            rcf.getResidueColour(true, av.getResidueShading(),
             null, seq, 2, null)); // T
-    assertEquals(Color.magenta, rcf.getResidueColour(av.getResidueShading(),
+    assertEquals(Color.magenta,
+            rcf.getResidueColour(true, av.getResidueShading(),
             null, seq, 5, null)); // G
-    assertEquals(Color.orange, rcf.getResidueColour(av.getResidueShading(),
+    assertEquals(Color.orange,
+            rcf.getResidueColour(true, av.getResidueShading(),
             null, seq, 12, null)); // F
 
     // gap colour not specified so gaps are lightGray
     assertEquals(Color.lightGray, rcf
-            .getResidueColour(av.getResidueShading(), null, seq, 3, null));
+            .getResidueColour(true, av.getResidueShading(), null, seq, 3,
+                    null));
+
+    // unaffected by showBoxes setting
+    assertEquals(Color.pink, rcf.getResidueColour(false,
+            av.getResidueShading(), null, seq, 0, null)); // M
+    assertEquals(Color.green, rcf.getResidueColour(false,
+            av.getResidueShading(), null, seq, 2, null)); // T
+    assertEquals(Color.magenta, rcf.getResidueColour(false,
+            av.getResidueShading(), null, seq, 5, null)); // G
+    assertEquals(Color.orange, rcf.getResidueColour(false,
+            av.getResidueShading(), null, seq, 12, null)); // F
 
     // gap colour not specified so gaps are lightGray
     assertEquals(Color.lightGray, rcf
-            .getResidueColour(av.getResidueShading(), null, seq, 3, null));
+            .getResidueColour(false, av.getResidueShading(), null, seq, 3,
+                    null));
 
   }
 
@@ -110,13 +134,28 @@ public class OverviewResColourFinderTest
 
     // gap colour not specified so gaps are lightGray
     assertEquals(Color.lightGray, rcf
-            .getResidueColour(av.getResidueShading(), null, seq, 3, null));
+            .getResidueColour(true, av.getResidueShading(), null, seq, 3,
+                    null));
 
     newColours[23] = Color.pink;
     av.setGlobalColourScheme(new UserColourScheme(newColours));
 
     // gap colour specified as pink
-    assertEquals(Color.pink, rcf.getResidueColour(av.getResidueShading(),
+    assertEquals(Color.pink, rcf.getResidueColour(true,
+            av.getResidueShading(),
             null, seq, 3, null));
+
+    // unaffected by showBoxes setting
+    // gap colour not specified so gaps are lightGray
+    newColours[23] = null;
+    assertEquals(Color.lightGray, rcf.getResidueColour(false,
+            av.getResidueShading(), null, seq, 3, null));
+
+    newColours[23] = Color.pink;
+    av.setGlobalColourScheme(new UserColourScheme(newColours));
+
+    // gap colour specified as pink
+    assertEquals(Color.pink, rcf.getResidueColour(false,
+            av.getResidueShading(), null, seq, 3, null));
   }
 }