X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fschemes%2FPIDColourSchemeTest.java;h=8a584f65cf7f0dd6c5b199c4a4fb0244e871bcff;hb=76d3768510fea49f5b2498877d23a311be9c5220;hp=1518fb354611deb50418fc04a844dd32a30ec4cd;hpb=8e1be43e250107a4d86898bd554cf03098fa5957;p=jalview.git

diff --git a/test/jalview/schemes/PIDColourSchemeTest.java b/test/jalview/schemes/PIDColourSchemeTest.java
index 1518fb3..8a584f6 100644
--- a/test/jalview/schemes/PIDColourSchemeTest.java
+++ b/test/jalview/schemes/PIDColourSchemeTest.java
@@ -6,8 +6,22 @@ import java.awt.Color;
 
 import org.testng.annotations.Test;
 
+import jalview.datamodel.SequenceI;
+import jalview.gui.AlignFrame;
+import jalview.gui.AlignViewport;
+import jalview.io.DataSourceType;
+import jalview.io.FileLoader;
+
 public class PIDColourSchemeTest
 {
+  static final Color white = Color.white;
+
+  static final Color over40 = new Color(204, 204, 255);
+
+  static final Color over60 = new Color(153, 153, 255);
+
+  static final Color over80 = new Color(100, 100, 255);
+
   /**
    * Test findColour for cases:
    * <ul>
@@ -21,31 +35,82 @@ public class PIDColourSchemeTest
    * <li>case insensitive matching</li>
    * <ul>
    */
-  @Test
+  @Test(groups = "Functional")
   public void testFindColour()
   {
     ColourSchemeI scheme = new PIDColourScheme();
 
-    Color over40 = new Color(204, 204, 255);
-    Color over60 = new Color(153, 153, 255);
-    Color over80 = new Color(100, 100, 255);
-
     /*
      * doesn't use column or sequence
+     * we assume consensus residue is computed as upper case
      */
-    assertEquals(scheme.findColour('A', 0, null, "A", 0f), Color.white);
-    assertEquals(scheme.findColour('A', 0, null, "A", 40f), Color.white);
+    assertEquals(scheme.findColour('A', 0, null, "A", 0f), white);
+    assertEquals(scheme.findColour('A', 0, null, "A", 40f), white);
     assertEquals(scheme.findColour('A', 0, null, "A", 40.1f), over40);
     assertEquals(scheme.findColour('A', 0, null, "A", 60f), over40);
     assertEquals(scheme.findColour('A', 0, null, "A", 60.1f), over60);
     assertEquals(scheme.findColour('A', 0, null, "A", 80f), over60);
     assertEquals(scheme.findColour('A', 0, null, "A", 80.1f), over80);
     assertEquals(scheme.findColour('A', 0, null, "A", 100f), over80);
+    assertEquals(scheme.findColour('A', 0, null, "KFV", 100f), white);
 
     assertEquals(scheme.findColour('a', 0, null, "A", 80f), over60);
-    assertEquals(scheme.findColour('A', 0, null, "a", 80f), over60);
-    assertEquals(scheme.findColour('a', 0, null, "a", 80f), over60);
     assertEquals(scheme.findColour('A', 0, null, "AC", 80f), over60);
     assertEquals(scheme.findColour('A', 0, null, "KCA", 80f), over60);
   }
+
+  /**
+   * Test that changing the 'ignore gaps in consensus' in the viewport (an
+   * option on the annotation label popup menu) results in a change to the
+   * colouring
+   */
+  @Test(groups = "Functional")
+  public void testFindColour_ignoreGaps()
+  {
+    /*
+     * AAAAA
+     * AAAAA
+     * -CCCC
+     * FFFFF
+     * 
+     * first column consensus is A
+     * first column PID is 50%, or 67% ignoring gaps
+     */
+    String seqs = ">seq1\nAAAAA\n>seq2\nAAAAA\n>seq3\n-CCCC\n>seq4\nFFFFF\n";
+
+    /*
+     * load data and wait for consensus to be computed
+     */
+    AlignFrame af = new FileLoader().LoadFileWaitTillLoaded(seqs,
+            DataSourceType.PASTE);
+    AlignViewport viewport = af.getViewport();
+    viewport.setIgnoreGapsConsensus(false, af.alignPanel);
+    do
+    {
+      try
+      {
+        Thread.sleep(50);
+      } catch (InterruptedException x)
+      {
+      }
+    } while (af.getViewport().getCalcManager().isWorking());
+    af.changeColour_actionPerformed(JalviewColourScheme.PID.toString());
+
+    SequenceI seq = viewport.getAlignment().getSequenceAt(0);
+
+    /*
+     * including gaps, A should be coloured for 50% consensus
+     */
+    Color c = viewport
+            .getResidueShading().findColour('A', 0, seq);
+    assertEquals(c, over40);
+
+    /*
+     * now choose to ignore gaps; colour should be for 67%
+     */
+    viewport.setIgnoreGapsConsensus(true, af.alignPanel);
+    c = viewport
+            .getResidueShading().findColour('A', 0, seq);
+    assertEquals(c, over60);
+  }
 }