Merge branch 'develop' into patch/JAL-4281_idwidthandannotHeight_in_project

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

diff --git a/test/jalview/renderer/ResidueColourFinderTest.java b/test/jalview/renderer/ResidueColourFinderTest.java
index dd7a457..d8efc02 100644 (file)
--- a/test/jalview/renderer/ResidueColourFinderTest.java
+++ b/test/jalview/renderer/ResidueColourFinderTest.java
@@ -56,18 +56,24 @@ public class ResidueColourFinderTest
     av.setGlobalColourScheme(new ZappoColourScheme());
 
     // @see ResidueProperties.zappo
-    assertEquals(Color.pink,
-            rcf.getResidueColour(av.getResidueShading(), null, seq, 0,
-                    null)); // M
-    assertEquals(Color.green,
-            rcf.getResidueColour(av.getResidueShading(), null, seq, 2,
-                    null)); // T
-    assertEquals(Color.magenta,
-            rcf.getResidueColour(av.getResidueShading(), null, seq, 5,
-                    null)); // G
-    assertEquals(Color.orange,
-            rcf.getResidueColour(av.getResidueShading(), null, seq, 12,
-                    null)); // F
+    assertEquals(Color.pink, rcf.getResidueColour(true,
+            av.getResidueShading(), null, seq, 0, null)); // M
+    assertEquals(Color.green, rcf.getResidueColour(true,
+            av.getResidueShading(), null, seq, 2, null)); // T
+    assertEquals(Color.magenta, rcf.getResidueColour(true,
+            av.getResidueShading(), null, seq, 5, null)); // G
+    assertEquals(Color.orange, rcf.getResidueColour(true,
+            av.getResidueShading(), null, seq, 12, null)); // F
+
+    // everything is white if showBoxes is false
+    assertEquals(Color.white, rcf.getResidueColour(false,
+            av.getResidueShading(), null, seq, 0, null)); // M
+    assertEquals(Color.white, rcf.getResidueColour(false,
+            av.getResidueShading(), null, seq, 2, null)); // T
+    assertEquals(Color.white, rcf.getResidueColour(false,
+            av.getResidueShading(), null, seq, 5, null)); // G
+    assertEquals(Color.white, rcf.getResidueColour(false,
+            av.getResidueShading(), null, seq, 12, null)); // F
   }
 
   @Test(groups = { "Functional" })
@@ -78,10 +84,16 @@ public class ResidueColourFinderTest
     final AlignViewport av = new AlignViewport(al);
     ResidueColourFinder rcf = new ResidueColourFinder();
 
-    assertEquals(Color.white, rcf.getResidueColour(av.getResidueShading(),
-            null, seq, 0, null));
-    assertEquals(Color.white, rcf.getResidueColour(av.getResidueShading(),
-            null, seq, 2, null));
+    assertEquals(Color.white, rcf.getResidueColour(true,
+            av.getResidueShading(), null, seq, 0, null));
+    assertEquals(Color.white, rcf.getResidueColour(true,
+            av.getResidueShading(), null, seq, 2, null));
+
+    // no change if showBoxes is false
+    assertEquals(Color.white, rcf.getResidueColour(false,
+            av.getResidueShading(), null, seq, 0, null));
+    assertEquals(Color.white, rcf.getResidueColour(false,
+            av.getResidueShading(), null, seq, 2, null));
   }
 
   @Test(groups = { "Functional" })
@@ -101,19 +113,30 @@ public class ResidueColourFinderTest
 
     av.setGlobalColourScheme(new UserColourScheme(newColours));
 
-    // gap colour not specified so gaps are null
-    assertEquals(null, rcf.getResidueColour(av.getResidueShading(),
+    // gap colour not specified so gap colour is null
+    // this is consistent with previous behaviour, but may not be correct?
+    assertEquals(null, rcf.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(),
-            null, seq, 3, null));
-  }
+    assertEquals(Color.pink, rcf.getResidueColour(true,
+            av.getResidueShading(), null, seq, 3, null));
 
-  // TODO more tests for getResidueBoxColour covering groups, feature rendering,
-  // gaps, overview...
+    // everything is white if showBoxes is false
+    newColours[23] = null;
+    assertEquals(Color.white, 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.white, rcf.getResidueColour(false,
+            av.getResidueShading(), null, seq, 3, null));
+  }
 
+  // TODO more tests for getResidueColour covering groups, feature rendering...
 }