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

diff --git a/test/jalview/schemes/ColourSchemePropertyTest.java b/test/jalview/schemes/ColourSchemePropertyTest.java
index efea164..c1c6846 100644
--- a/test/jalview/schemes/ColourSchemePropertyTest.java
+++ b/test/jalview/schemes/ColourSchemePropertyTest.java
@@ -1,17 +1,21 @@
 package jalview.schemes;
 
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
 
 import jalview.datamodel.Alignment;
 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");
@@ -65,4 +69,53 @@ public class ColourSchemePropertyTest
 
     assertEquals(ColourSchemeProperty.getColourName(null), "None");
   }
+
+  @Test(groups = "Functional")
+  public void testGetColourScheme()
+  {
+    SequenceI seq = new Sequence("Seq1", "abcd");
+    AlignmentI al = new Alignment(new SequenceI[] { seq });
+    // the strings here correspond to JalviewColourScheme.toString() values
+    assertTrue(ColourSchemeProperty.getColourScheme(al, "Clustal") instanceof ClustalxColourScheme);
+    // not case-sensitive
+    assertTrue(ColourSchemeProperty.getColourScheme(al, "CLUSTAL") instanceof ClustalxColourScheme);
+    assertTrue(ColourSchemeProperty.getColourScheme(al, "clustal") instanceof ClustalxColourScheme);
+    assertTrue(ColourSchemeProperty.getColourScheme(al, "Blosum62") instanceof Blosum62ColourScheme);
+    assertTrue(ColourSchemeProperty.getColourScheme(al, "% Identity") instanceof PIDColourScheme);
+    assertTrue(ColourSchemeProperty.getColourScheme(al, "Zappo") instanceof ZappoColourScheme);
+    assertTrue(ColourSchemeProperty.getColourScheme(al, "Taylor") instanceof TaylorColourScheme);
+    assertTrue(ColourSchemeProperty.getColourScheme(al, "Hydrophobic") instanceof HydrophobicColourScheme);
+    assertTrue(ColourSchemeProperty.getColourScheme(al, "Helix Propensity") instanceof HelixColourScheme);
+    assertTrue(ColourSchemeProperty
+            .getColourScheme(al, "Strand Propensity") instanceof StrandColourScheme);
+    assertTrue(ColourSchemeProperty.getColourScheme(al, "Turn Propensity") instanceof TurnColourScheme);
+    assertTrue(ColourSchemeProperty.getColourScheme(al, "Buried Index") instanceof BuriedColourScheme);
+    assertTrue(ColourSchemeProperty.getColourScheme(al, "Nucleotide") instanceof NucleotideColourScheme);
+    assertTrue(ColourSchemeProperty
+            .getColourScheme(al, "Purine/Pyrimidine") instanceof PurinePyrimidineColourScheme);
+    assertTrue(ColourSchemeProperty.getColourScheme(al, "T-Coffee Scores") instanceof TCoffeeColourScheme);
+    assertTrue(ColourSchemeProperty.getColourScheme(al, "RNA Helices") instanceof RNAHelicesColour);
+    assertTrue(ColourSchemeProperty.getColourScheme(al, "User Defined") instanceof UserColourScheme);
+    // 'None' is a special value
+    assertNull(ColourSchemeProperty.getColourScheme(al, "None"));
+    assertNull(ColourSchemeProperty.getColourScheme(al, "none"));
+    // 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));
+  }
 }