X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Frenderer%2FResidueShaderTest.java;fp=test%2Fjalview%2Frenderer%2FResidueShaderTest.java;h=df94d8c55e3ea5263eaeaff40a741008fda4ba39;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=eba5f59d76fcfae034215437b0add9b95a04f5e5;hpb=e7338a61f3ce96dadf44ac80b2b32cc5ba4b94c8;p=jalview.git diff --git a/test/jalview/renderer/ResidueShaderTest.java b/test/jalview/renderer/ResidueShaderTest.java index eba5f59..df94d8c 100644 --- a/test/jalview/renderer/ResidueShaderTest.java +++ b/test/jalview/renderer/ResidueShaderTest.java @@ -161,9 +161,12 @@ public class ResidueShaderTest assertEquals(Color.WHITE, ccs.applyConservation(colour, 4)); assertEquals(Color.WHITE, ccs.applyConservation(colour, 5)); assertEquals(Color.WHITE, ccs.applyConservation(colour, 6)); - assertEquals(new Color(235, 225, 215), ccs.applyConservation(colour, 7)); - assertEquals(new Color(215, 195, 175), ccs.applyConservation(colour, 8)); - assertEquals(new Color(195, 165, 135), ccs.applyConservation(colour, 9)); + assertEquals(new Color(235, 225, 215), + ccs.applyConservation(colour, 7)); + assertEquals(new Color(215, 195, 175), + ccs.applyConservation(colour, 8)); + assertEquals(new Color(195, 165, 135), + ccs.applyConservation(colour, 9)); assertEquals(colour, ccs.applyConservation(colour, 10)); assertEquals(colour, ccs.applyConservation(colour, 11)); assertEquals(Color.WHITE, ccs.applyConservation(colour, 12)); @@ -186,10 +189,10 @@ public class ResidueShaderTest colours[23] = Color.red; // gap colour ColourSchemeI cs = new UserColourScheme(colours); rs = new ResidueShader(cs); - + assertEquals(Color.red, rs.findColour(' ', 7, null)); assertEquals(Color.blue, rs.findColour('Q', 7, null)); - + /* * stub Conservation to return a given consensus string */ @@ -204,14 +207,14 @@ public class ResidueShaderTest } }; rs.setConservation(cons); - + /* * with 0% threshold, there should be no fading */ rs.setConservationInc(0); assertEquals(Color.red, rs.findColour(' ', 7, null)); assertEquals(Color.blue, rs.findColour('Q', 7, null)); - + /* * with 40% threshold, 'fade factor' is * (11-score)/10 * 40/20 = (11-score)/5 @@ -261,12 +264,14 @@ public class ResidueShaderTest protected ProfilesI getStubConsensus(final String modalResidue, final float pid) { - ProfilesI consensus = new ProfilesI() { + ProfilesI consensus = new ProfilesI() + { @Override public ProfileI get(int i) { - return new ProfileI() { + return new ProfileI() + { @Override public void setCounts(ResidueCount residueCounts) { @@ -312,7 +317,8 @@ public class ResidueShaderTest public int getNonGapped() { return 0; - }}; + } + }; } @Override @@ -326,7 +332,7 @@ public class ResidueShaderTest { return 0; } - + }; return consensus; }