X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fschemes%2FUserColourSchemeTest.java;h=497014ea1a2d9c25f38f8517814f13f99c73f864;hb=a264330266dd81fd668303c7289229b3a8867090;hp=f89568b825f19bea3caa2f245e862a18af683dee;hpb=b0cee3aaf7d8873910939f97b6acb217d518968d;p=jalview.git diff --git a/test/jalview/schemes/UserColourSchemeTest.java b/test/jalview/schemes/UserColourSchemeTest.java index f89568b..497014e 100644 --- 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("D,E=ff0000;H,K,R=0022ff;c=0a141e", param); + } }