X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fschemes%2FUserColourSchemeTest.java;h=5cfaa293b362d0ba26eb60b6bc8e16690c0b274d;hb=fc7dac25fd7a4eac42083e9aa94d1e752cabbe8b;hp=f89568b825f19bea3caa2f245e862a18af683dee;hpb=b0cee3aaf7d8873910939f97b6acb217d518968d;p=jalview.git

diff --git a/test/jalview/schemes/UserColourSchemeTest.java b/test/jalview/schemes/UserColourSchemeTest.java
index f89568b..5cfaa29 100644
--- a/test/jalview/schemes/UserColourSchemeTest.java
+++ b/test/jalview/schemes/UserColourSchemeTest.java
@@ -54,9 +54,14 @@ public class UserColourSchemeTest
     assertEquals(c1, cs.findColour('h'));
     Color c2 = new Color(10, 20, 30);
     assertEquals(c2, cs.findColour('c'));
+    assertEquals(Color.WHITE, cs.findColour('G'));
+    assertEquals(Color.WHITE, cs.findColour('-'));
+    assertEquals(Color.WHITE, cs.findColour('.'));
+    assertEquals(Color.WHITE, cs.findColour(' '));
 
     cs = new UserColourScheme("white");
-    cs.parseAppletParameter("D,E=red; K,R,H=0022FF; c=10 , 20,30;lowercase=blue;s=pink");
+    cs.parseAppletParameter(
+            "D,E=red; K,R,H=0022FF; c=10 , 20,30;t=orange;lowercase=blue;s=pink");
     assertEquals(Color.RED, cs.findColour('D'));
     assertEquals(Color.blue, cs.findColour('d'));
     assertEquals(Color.RED, cs.findColour('E'));
@@ -66,8 +71,43 @@ public class UserColourSchemeTest
     assertEquals(Color.blue, cs.findColour('h'));
     assertEquals(c2, cs.findColour('c'));
     // 'lowercase' sets all lower-case not already set to the given colour
+    assertEquals(Color.orange, cs.findColour('t'));
     assertEquals(Color.blue, cs.findColour('k'));
     assertEquals(Color.blue, cs.findColour('a'));
     assertEquals(Color.pink, cs.findColour('s'));
   }
+
+  @Test(groups = "Functional")
+  public void testToAppletParameter()
+  {
+    UserColourScheme cs = new UserColourScheme(
+            "E,D=red; K,R,H=0022FF; c=10 , 20,30");
+    String param = cs.toAppletParameter();
+    assertEquals("D,E=ff0000;H,K,R=0022ff;c=0a141e", param);
+  }
+
+  /**
+   * Test for user colour scheme constructed with a colour per residue,
+   * including gap. Note this can currently be done from the User Defined
+   * Colours dialog, but not by parsing a colours parameter, as
+   * parseAppletParameter only recognises amino acid codes.
+   */
+  @Test(groups = "Functional")
+  public void testConstructor_coloursArray()
+  {
+    Color g = Color.green;
+    Color y = Color.yellow;
+    Color b = Color.blue;
+    Color r = Color.red;
+    // colours for ARNDCQEGHILKMFPSTWYVBZ and gap
+    Color[] colours = new Color[] { g, y, b, r, g, y, r, b, g, y, r, b, g,
+        y, r, b, g, y, r, b, g, y, r, g };
+    UserColourScheme cs = new UserColourScheme(colours);
+
+    assertEquals(g, cs.findColour('A'));
+    assertEquals(b, cs.findColour('n'));
+    assertEquals(g, cs.findColour('-'));
+    assertEquals(g, cs.findColour('.'));
+    assertEquals(g, cs.findColour(' '));
+  }
 }