JAL-2360 added UserColourScheme.toAppletParameter+test, hid

[jalview.git] / test / jalview / schemes / UserColourSchemeTest.java

diff --git a/test/jalview/schemes/UserColourSchemeTest.java b/test/jalview/schemes/UserColourSchemeTest.java
index f89568b..151462b 100644 (file)
--- a/test/jalview/schemes/UserColourSchemeTest.java
+++ b/test/jalview/schemes/UserColourSchemeTest.java
@@ -56,7 +56,7 @@ public class UserColourSchemeTest
     assertEquals(c2, cs.findColour('c'));
 
     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 +66,18 @@ 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("H,K,R=0022ff;c=0a141e;D,E=ff0000", param);
+  }
 }