X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fschemes%2FColourSchemePropertyTest.java;h=c1c684661d51644b9d95ed44a7cf2d38b2459062;hb=56308882b011c6c6ff96786490bbb1c937d3ade3;hp=6fd830ae322e63be134d485a752ad252f87bdbcc;hpb=320c96aed11f5c396a9efd9ea83b0e35f05e21e4;p=jalview.git

diff --git a/test/jalview/schemes/ColourSchemePropertyTest.java b/test/jalview/schemes/ColourSchemePropertyTest.java
index 6fd830a..c1c6846 100644
--- a/test/jalview/schemes/ColourSchemePropertyTest.java
+++ b/test/jalview/schemes/ColourSchemePropertyTest.java
@@ -9,11 +9,13 @@ import jalview.datamodel.AlignmentI;
 import jalview.datamodel.Sequence;
 import jalview.datamodel.SequenceI;
 
+import java.awt.Color;
+
 import org.testng.annotations.Test;
 
 public class ColourSchemePropertyTest
 {
-  @Test
+  @Test(groups = "Functional")
   public void testGetColourName()
   {
     SequenceI seq = new Sequence("Seq1", "abcd");
@@ -68,7 +70,7 @@ public class ColourSchemePropertyTest
     assertEquals(ColourSchemeProperty.getColourName(null), "None");
   }
 
-  @Test
+  @Test(groups = "Functional")
   public void testGetColourScheme()
   {
     SequenceI seq = new Sequence("Seq1", "abcd");
@@ -97,7 +99,23 @@ public class ColourSchemePropertyTest
     // 'None' is a special value
     assertNull(ColourSchemeProperty.getColourScheme(al, "None"));
     assertNull(ColourSchemeProperty.getColourScheme(al, "none"));
-    // default is to convert the name into a fixed coloour
+    // default is to convert the name into a fixed colour
     assertTrue(ColourSchemeProperty.getColourScheme(al, "elephants") instanceof UserColourScheme);
+
+    /*
+     * explicit aa colours
+     */
+    UserColourScheme cs = (UserColourScheme) ColourSchemeProperty
+            .getColourScheme(al,
+            "R,G=red;C=blue;c=green;Q=10,20,30;S,T=11ffdd");
+    assertEquals(cs.findColour('H'), Color.white);
+    assertEquals(cs.findColour('R'), Color.red);
+    assertEquals(cs.findColour('r'), Color.red);
+    assertEquals(cs.findColour('G'), Color.red);
+    assertEquals(cs.findColour('C'), Color.blue);
+    assertEquals(cs.findColour('c'), Color.green);
+    assertEquals(cs.findColour('Q'), new Color(10, 20, 30));
+    assertEquals(cs.findColour('S'), new Color(0x11ffdd));
+    assertEquals(cs.findColour('T'), new Color(0x11ffdd));
   }
 }