JAL-3383 removing colour caching (to a separate branch)

[jalview.git] / test / jalview / renderer / OverviewResColourFinderTest.java

diff --git a/test/jalview/renderer/OverviewResColourFinderTest.java b/test/jalview/renderer/OverviewResColourFinderTest.java
index bf1237d..76beab8 100644 (file)
--- a/test/jalview/renderer/OverviewResColourFinderTest.java
+++ b/test/jalview/renderer/OverviewResColourFinderTest.java
@@ -137,7 +137,6 @@ public class OverviewResColourFinderTest
     }
 
     av.setGlobalColourScheme(new UserColourScheme(newColours));
-    seq.resetColors();
 
     // gap colour not specified so gaps are lightGray
     assertEquals(Color.lightGray, rcf
@@ -146,7 +145,6 @@ public class OverviewResColourFinderTest
 
     newColours[23] = Color.pink;
     av.setGlobalColourScheme(new UserColourScheme(newColours));
-    seq.resetColors();
 
     // gap colour specified as pink
     assertEquals(Color.pink, rcf.getResidueColour(true,
@@ -156,14 +154,12 @@ public class OverviewResColourFinderTest
     // unaffected by showBoxes setting
     // gap colour not specified so gaps are lightGray
     newColours[23] = null;
-    seq.resetColors();
 
     assertEquals(Color.lightGray, rcf.getResidueColour(false,
             av.getResidueShading(), null, seq, 3, null));
 
     newColours[23] = Color.pink;
     av.setGlobalColourScheme(new UserColourScheme(newColours));
-    seq.resetColors();
 
     // gap colour specified as pink
     assertEquals(Color.pink, rcf.getResidueColour(false,
@@ -202,8 +198,6 @@ public class OverviewResColourFinderTest
 
     // use legacy colouring
     rcf = new OverviewResColourFinder(true, Color.blue, Color.red);
-
-    seq.resetColors();
   
     // G in group specified as magenta in Zappo
     assertEquals(Color.magenta, rcf.getResidueColour(false,
@@ -220,8 +214,6 @@ public class OverviewResColourFinderTest
     // use new colouring
     rcf = new OverviewResColourFinder(false, Color.blue, Color.red);
 
-    seq.resetColors();
-
     // G in group specified as magenta in Zappo
     assertEquals(Color.magenta, rcf.getResidueColour(false,
             av.getResidueShading(), groups, seq, 7, null));
@@ -247,8 +239,6 @@ public class OverviewResColourFinderTest
     ResidueColourFinder rcf = new OverviewResColourFinder();
     ResidueShaderI shader = new ResidueShader();
 
-    seq.resetColors();
-
     // residues white
     Color c = rcf.getBoxColour(shader, seq, 0);
     assertEquals(Color.white, c);
@@ -263,8 +253,6 @@ public class OverviewResColourFinderTest
     rcf = new OverviewResColourFinder(true, Color.blue, Color.red);
     shader = new ResidueShader();
 
-    seq.resetColors();
-
     // residues light gray
     c = rcf.getBoxColour(shader, seq, 0);
     assertEquals(Color.lightGray, c);
@@ -277,8 +265,6 @@ public class OverviewResColourFinderTest
     rcf = new OverviewResColourFinder();
     shader = new ResidueShader();
 
-    seq.resetColors();
-
     // residues white
     c = rcf.getBoxColour(shader, seq, 0);
     assertEquals(Color.white, c);
@@ -293,8 +279,6 @@ public class OverviewResColourFinderTest
     rcf = new OverviewResColourFinder(false, Color.blue, Color.red);
     shader = new ResidueShader(new ZappoColourScheme());
 
-    seq.resetColors();
-
     // M residue pink
     c = rcf.getBoxColour(shader, seq, 0);
     assertEquals(Color.pink, c);
@@ -306,8 +290,6 @@ public class OverviewResColourFinderTest
     // legacy colouring with colour scheme
     rcf = new OverviewResColourFinder(true, Color.blue, Color.red);
 
-    seq.resetColors();
-
     // M residue pink
     c = rcf.getBoxColour(shader, seq, 0);
     assertEquals(Color.pink, c);