// @see ResidueProperties.zappo
assertEquals(Color.pink,
- rcf.getResidueColour(av.getResidueShading(), null, seq, 0,
+ rcf.getResidueColour(true, av.getResidueShading(), null, seq, 0,
null)); // M
assertEquals(Color.green,
- rcf.getResidueColour(av.getResidueShading(), null, seq, 2,
+ rcf.getResidueColour(true, av.getResidueShading(), null, seq, 2,
null)); // T
assertEquals(Color.magenta,
- rcf.getResidueColour(av.getResidueShading(), null, seq, 5,
+ rcf.getResidueColour(true, av.getResidueShading(), null, seq, 5,
null)); // G
assertEquals(Color.orange,
- rcf.getResidueColour(av.getResidueShading(), null, seq, 12,
+ rcf.getResidueColour(true, av.getResidueShading(), null, seq,
+ 12,
null)); // F
+
+ // everything is white if showBoxes is false
+ assertEquals(Color.white, rcf.getResidueColour(false,
+ av.getResidueShading(), null, seq, 0, null)); // M
+ assertEquals(Color.white, rcf.getResidueColour(false,
+ av.getResidueShading(), null, seq, 2, null)); // T
+ assertEquals(Color.white, rcf.getResidueColour(false,
+ av.getResidueShading(), null, seq, 5, null)); // G
+ assertEquals(Color.white, rcf.getResidueColour(false,
+ av.getResidueShading(), null, seq, 12, null)); // F
}
@Test(groups = { "Functional" })
final AlignViewport av = new AlignViewport(al);
ResidueColourFinder rcf = new ResidueColourFinder();
- assertEquals(Color.white, rcf.getResidueColour(av.getResidueShading(),
+ assertEquals(Color.white,
+ rcf.getResidueColour(true, av.getResidueShading(),
null, seq, 0, null));
- assertEquals(Color.white, rcf.getResidueColour(av.getResidueShading(),
+ assertEquals(Color.white,
+ rcf.getResidueColour(true, av.getResidueShading(),
null, seq, 2, null));
+
+ // no change if showBoxes is false
+ assertEquals(Color.white, rcf.getResidueColour(false,
+ av.getResidueShading(), null, seq, 0, null));
+ assertEquals(Color.white, rcf.getResidueColour(false,
+ av.getResidueShading(), null, seq, 2, null));
}
@Test(groups = { "Functional" })
// gap colour not specified so gap colour is null
// this is consistent with previous behaviour, but may not be correct?
- assertEquals(null, rcf.getResidueColour(av.getResidueShading(),
+ assertEquals(null, rcf.getResidueColour(true, av.getResidueShading(),
null, seq, 3, null));
newColours[23] = Color.pink;
av.setGlobalColourScheme(new UserColourScheme(newColours));
// gap colour specified as pink
- assertEquals(Color.pink, rcf.getResidueColour(av.getResidueShading(),
+ assertEquals(Color.pink, rcf.getResidueColour(true,
+ 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));
- }
- // TODO more tests for getResidueColour covering groups, feature rendering,
- // gaps, overview...
+ newColours[23] = Color.pink;
+ av.setGlobalColourScheme(new UserColourScheme(newColours));
+
+ // gap colour specified as pink
+ assertEquals(Color.white, rcf.getResidueColour(false,
+ av.getResidueShading(), null, seq, 3, null));
+ }
+ // TODO more tests for getResidueColour covering groups, feature rendering...
}