X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Frenderer%2FResidueColourFinderTest.java;h=9d8ecbef21d9d28d3cd7de31e0b59aaa200338e2;hb=747167089ecf8d6afc70d417f5a20352e029bd95;hp=da50e8f6ea2fbe547972719491aee2757d3fcbb9;hpb=3609d4b908fa64cab35f2348401baab3347188fc;p=jalview.git diff --git a/test/jalview/renderer/ResidueColourFinderTest.java b/test/jalview/renderer/ResidueColourFinderTest.java index da50e8f..9d8ecbe 100644 --- a/test/jalview/renderer/ResidueColourFinderTest.java +++ b/test/jalview/renderer/ResidueColourFinderTest.java @@ -56,19 +56,14 @@ public class ResidueColourFinderTest av.setGlobalColourScheme(new ZappoColourScheme()); // @see ResidueProperties.zappo - assertEquals(Color.pink, - rcf.getResidueColour(true, av.getResidueShading(), null, seq, 0, - null)); // M - assertEquals(Color.green, - rcf.getResidueColour(true, av.getResidueShading(), null, seq, 2, - null)); // T - assertEquals(Color.magenta, - rcf.getResidueColour(true, av.getResidueShading(), null, seq, 5, - null)); // G - assertEquals(Color.orange, - rcf.getResidueColour(true, av.getResidueShading(), null, seq, - 12, - null)); // F + assertEquals(Color.pink, rcf.getResidueColour(true, + av.getResidueShading(), null, seq, 0, null)); // M + assertEquals(Color.green, rcf.getResidueColour(true, + av.getResidueShading(), null, seq, 2, null)); // T + assertEquals(Color.magenta, rcf.getResidueColour(true, + av.getResidueShading(), null, seq, 5, null)); // G + assertEquals(Color.orange, rcf.getResidueColour(true, + av.getResidueShading(), null, seq, 12, null)); // F // everything is white if showBoxes is false assertEquals(Color.white, rcf.getResidueColour(false, @@ -89,12 +84,10 @@ public class ResidueColourFinderTest final AlignViewportI av = new AlignViewport(al); ResidueColourFinder rcf = new ResidueColourFinder(); - assertEquals(Color.white, - rcf.getResidueColour(true, av.getResidueShading(), - null, seq, 0, null)); - assertEquals(Color.white, - rcf.getResidueColour(true, av.getResidueShading(), - null, seq, 2, null)); + assertEquals(Color.white, rcf.getResidueColour(true, + av.getResidueShading(), null, seq, 0, null)); + assertEquals(Color.white, rcf.getResidueColour(true, + av.getResidueShading(), null, seq, 2, null)); // no change if showBoxes is false assertEquals(Color.white, rcf.getResidueColour(false, @@ -130,14 +123,12 @@ public class ResidueColourFinderTest // gap colour specified as pink assertEquals(Color.pink, rcf.getResidueColour(true, - av.getResidueShading(), - null, seq, 3, null)); + av.getResidueShading(), null, seq, 3, null)); // everything is white if showBoxes is false newColours[23] = null; assertEquals(Color.white, rcf.getResidueColour(false, - av.getResidueShading(), - null, seq, 3, null)); + av.getResidueShading(), null, seq, 3, null)); newColours[23] = Color.pink; av.setGlobalColourScheme(new UserColourScheme(newColours));