From 35b449c8fce9a00abd16412ba804936325997b11 Mon Sep 17 00:00:00 2001 From: kiramt Date: Wed, 12 Jul 2017 08:03:52 +0100 Subject: [PATCH] JAl-2588 test updates --- .../renderer/OverviewResColourFinderTest.java | 20 -------------------- test/jalview/renderer/ResidueColourFinderTest.java | 5 +++-- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/test/jalview/renderer/OverviewResColourFinderTest.java b/test/jalview/renderer/OverviewResColourFinderTest.java index 59348d5..900994e 100644 --- a/test/jalview/renderer/OverviewResColourFinderTest.java +++ b/test/jalview/renderer/OverviewResColourFinderTest.java @@ -59,14 +59,6 @@ public class OverviewResColourFinderTest null, seq, 0, null)); assertEquals(Color.lightGray, rcf .getResidueColour(av.getResidueShading(), null, seq, 2, null)); - - // boxes off does not change anything - av.setShowBoxes(false); - assertEquals(Color.white, rcf - .getResidueColour(av.getResidueShading(), null, seq, 0, null)); - assertEquals(Color.lightGray, rcf - .getResidueColour(av.getResidueShading(), - null, seq, 2, null)); } @Test(groups = { "Functional" }) @@ -93,18 +85,6 @@ public class OverviewResColourFinderTest assertEquals(Color.lightGray, rcf .getResidueColour(av.getResidueShading(), null, seq, 3, null)); - // boxes off does not change anything - av.setShowBoxes(false); - - assertEquals(Color.pink, rcf.getResidueColour(av.getResidueShading(), - null, seq, 0, null)); // M - assertEquals(Color.green, rcf.getResidueColour(av.getResidueShading(), - null, seq, 2, null)); // T - assertEquals(Color.magenta, rcf.getResidueColour(av.getResidueShading(), - null, seq, 5, null)); // G - assertEquals(Color.orange, rcf.getResidueColour(av.getResidueShading(), - null, seq, 12, null)); // F - // gap colour not specified so gaps are lightGray assertEquals(Color.lightGray, rcf .getResidueColour(av.getResidueShading(), null, seq, 3, null)); diff --git a/test/jalview/renderer/ResidueColourFinderTest.java b/test/jalview/renderer/ResidueColourFinderTest.java index dd7a457..175c68e 100644 --- a/test/jalview/renderer/ResidueColourFinderTest.java +++ b/test/jalview/renderer/ResidueColourFinderTest.java @@ -101,7 +101,8 @@ public class ResidueColourFinderTest av.setGlobalColourScheme(new UserColourScheme(newColours)); - // gap colour not specified so gaps are null + // 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(), null, seq, 3, null)); @@ -113,7 +114,7 @@ public class ResidueColourFinderTest null, seq, 3, null)); } - // TODO more tests for getResidueBoxColour covering groups, feature rendering, + // TODO more tests for getResidueColour covering groups, feature rendering, // gaps, overview... } -- 1.7.10.2