JAL-2438 unit test, fixes, Javadoc updates

[jalview.git] / test / jalview / renderer / seqfeatures / FeatureColourFinderTest.java

diff --git a/test/jalview/renderer/seqfeatures/FeatureColourFinderTest.java b/test/jalview/renderer/seqfeatures/FeatureColourFinderTest.java
index 6074e85..127b6c2 100644 (file)
--- a/test/jalview/renderer/seqfeatures/FeatureColourFinderTest.java
+++ b/test/jalview/renderer/seqfeatures/FeatureColourFinderTest.java
@@ -327,10 +327,12 @@ public class FeatureColourFinderTest
     /*
      * the FeatureSettings transparency slider has range 0-70 which
      * corresponds to a transparency value of 1 - 0.3
+     * A value of 0.4 gives a combination of
+     * 0.4 * red(255, 0, 0) + 0.6 * cyan(0, 255, 255) = (102, 153, 153)
      */
-    fr.setTransparency(0.5f);
-    Color c = finder.findFeatureColour(Color.blue, seq, 10);
-    assertEquals(c, new Color(85, 170, 0));
+    fr.setTransparency(0.4f);
+    Color c = finder.findFeatureColour(Color.cyan, seq, 10);
+    assertEquals(c, new Color(102, 153, 153));
   }
 
   @Test(groups = "Functional")
@@ -349,30 +351,37 @@ public class FeatureColourFinderTest
     av.setShowSequenceFeatures(true);
   
     /*
-     * Domain (green(0, 255, 0)) rendered above Metal (red(255, 0, 0))
+     * Domain (green) rendered above Metal (red) above background (cyan)
+     * 1) 0.6 * red(255, 0, 0) + 0.4 * cyan(0, 255, 255) = (153, 102, 102)
+     * 2) 0.6* green(0, 255, 0) + 0.4 * (153, 102, 102) = (61, 194, 41) rounded
      */
-    fr.setTransparency(0.5f);
-    Color c = finder.findFeatureColour(Color.blue, seq, 10);
-    assertEquals(c, new Color(85, 170, 0));
+    fr.setTransparency(0.6f);
+    Color c = finder.findFeatureColour(Color.cyan, seq, 10);
+    assertEquals(c, new Color(61, 194, 41));
   
     /*
      * now promote Metal above Domain
      * - currently no way other than mimicking reordering of
      * table in Feature Settings
+     * Metal (red) rendered above Domain (green) above background (cyan)
+     * 1) 0.6 * green(0, 255, 0) + 0.4 * cyan(0, 255, 255) = (0, 255, 102)
+     * 2) 0.6* red(255, 0, 0) + 0.4 * (0, 255, 102) = (153, 102, 41) rounded
      */
     Object[][] data = new Object[2][];
     data[0] = new Object[] { "Metal", red, true };
     data[1] = new Object[] { "Domain", green, true };
     fr.setFeaturePriority(data);
-    c = finder.findFeatureColour(Color.blue, seq, 10);
-    assertEquals(c, new Color(153, 102, 0));
+    c = finder.findFeatureColour(Color.cyan, seq, 10);
+    assertEquals(c, new Color(153, 102, 41));
   
     /*
      * ..and turn off display of Metal
+     * Domain (green) above background (pink)
+     * 0.6 * green(0, 255, 0) + 0.4 * pink(255, 175, 175) = (102, 223, 70)
      */
     data[0][2] = false;
     fr.setFeaturePriority(data);
-    c = finder.findFeatureColour(Color.blue, seq, 10);
-    assertEquals(c, Color.green);
+    c = finder.findFeatureColour(Color.pink, seq, 10);
+    assertEquals(c, new Color(102, 223, 70));
   }
 }