X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Frenderer%2FResidueColourFinderTest.java;h=da50e8f6ea2fbe547972719491aee2757d3fcbb9;hb=2db272981f2778cc64df63bab6893c8347e120f8;hp=dd7a45769b97cd4746dc07c59affee8ed284a6b4;hpb=fb548a8458941602b0b8b45da5aaf60206e10ec2;p=jalview.git

diff --git a/test/jalview/renderer/ResidueColourFinderTest.java b/test/jalview/renderer/ResidueColourFinderTest.java
index dd7a457..da50e8f 100644
--- a/test/jalview/renderer/ResidueColourFinderTest.java
+++ b/test/jalview/renderer/ResidueColourFinderTest.java
@@ -22,6 +22,7 @@ package jalview.renderer;
 
 import static org.testng.AssertJUnit.assertEquals;
 
+import jalview.api.AlignViewportI;
 import jalview.datamodel.Alignment;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.Sequence;
@@ -30,7 +31,6 @@ import jalview.gui.AlignViewport;
 import jalview.gui.JvOptionPane;
 import jalview.schemes.UserColourScheme;
 import jalview.schemes.ZappoColourScheme;
-
 import java.awt.Color;
 
 import org.testng.annotations.BeforeClass;
@@ -51,23 +51,34 @@ public class ResidueColourFinderTest
   {
     SequenceI seq = new Sequence("name", "MATVLGSPRAPAFF"); // FER1_MAIZE...
     AlignmentI al = new Alignment(new SequenceI[] { seq });
-    final AlignViewport av = new AlignViewport(al);
+    final AlignViewportI av = new AlignViewport(al);
     ResidueColourFinder rcf = new ResidueColourFinder();
     av.setGlobalColourScheme(new ZappoColourScheme());
 
     // @see ResidueProperties.zappo
     assertEquals(Color.pink,
-            rcf.getResidueColour(av.getResidueShading(), null, seq, 0,
+            rcf.getResidueColour(true, av.getResidueShading(), null, seq, 0,
                     null)); // M
     assertEquals(Color.green,
-            rcf.getResidueColour(av.getResidueShading(), null, seq, 2,
+            rcf.getResidueColour(true, av.getResidueShading(), null, seq, 2,
                     null)); // T
     assertEquals(Color.magenta,
-            rcf.getResidueColour(av.getResidueShading(), null, seq, 5,
+            rcf.getResidueColour(true, av.getResidueShading(), null, seq, 5,
                     null)); // G
     assertEquals(Color.orange,
-            rcf.getResidueColour(av.getResidueShading(), null, seq, 12,
+            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" })
@@ -75,13 +86,21 @@ public class ResidueColourFinderTest
   {
     SequenceI seq = new Sequence("name", "MA--TVLGSPRAPAFF");
     AlignmentI al = new Alignment(new SequenceI[] { seq });
-    final AlignViewport av = new AlignViewport(al);
+    final AlignViewportI av = new AlignViewport(al);
     ResidueColourFinder rcf = new ResidueColourFinder();
 
-    assertEquals(Color.white, rcf.getResidueColour(av.getResidueShading(),
+    assertEquals(Color.white,
+            rcf.getResidueColour(true, av.getResidueShading(),
             null, seq, 0, null));
-    assertEquals(Color.white, rcf.getResidueColour(av.getResidueShading(),
+    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" })
@@ -90,7 +109,7 @@ public class ResidueColourFinderTest
     SequenceI seq = new Sequence("name", "MAT--GSPRAPAFF"); // FER1_MAIZE... + a
                                                             // gap
     AlignmentI al = new Alignment(new SequenceI[] { seq });
-    final AlignViewport av = new AlignViewport(al);
+    final AlignViewportI av = new AlignViewport(al);
     ResidueColourFinder rcf = new ResidueColourFinder();
 
     Color[] newColours = new Color[24];
@@ -101,19 +120,32 @@ 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(),
+    assertEquals(Color.pink, rcf.getResidueColour(true,
+            av.getResidueShading(),
+            null, seq, 3, null));
+
+    // everything is white if showBoxes is false
+    newColours[23] = null;
+    assertEquals(Color.white, rcf.getResidueColour(false,
+            av.getResidueShading(),
             null, seq, 3, null));
-  }
 
-  // TODO more tests for getResidueBoxColour covering groups, feature rendering,
-  // gaps, overview...
+    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...
 }