X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Frenderer%2FOverviewResColourFinderTest.java;h=518fdef4c8ab2ce054d0ab9fe940c08b13353e2f;hb=44f7d3f329e2607a05b7b8b177edb4432e526502;hp=16875163b97e2fad660725bd749af1ddb65c1c04;hpb=d476574d0dc6e4d98824f430e41c8965b8e93499;p=jalview.git diff --git a/test/jalview/renderer/OverviewResColourFinderTest.java b/test/jalview/renderer/OverviewResColourFinderTest.java index 1687516..518fdef 100644 --- a/test/jalview/renderer/OverviewResColourFinderTest.java +++ b/test/jalview/renderer/OverviewResColourFinderTest.java @@ -22,6 +22,7 @@ package jalview.renderer; import static org.testng.AssertJUnit.assertEquals; +import jalview.api.AlignViewportI; import jalview.bin.Cache; import jalview.datamodel.Alignment; import jalview.datamodel.AlignmentI; @@ -56,7 +57,7 @@ public class OverviewResColourFinderTest { SequenceI seq = new Sequence("name", "MA--TVLGSPRAPAFF"); AlignmentI al = new Alignment(new SequenceI[] { seq }); - final AlignViewport av = new AlignViewport(al); + final AlignViewportI av = new AlignViewport(al); ResidueColourFinder rcf = new OverviewResColourFinder(); // gaps are grey, residues white @@ -80,7 +81,7 @@ public class OverviewResColourFinderTest SequenceI seq = new Sequence("name", "MAT--GSPRAPAFF"); // FER1_MAIZE... + a // gap AlignmentI al = new Alignment(new SequenceI[] { seq }); - final AlignViewport av = new AlignViewport(al); + final AlignViewportI av = new AlignViewport(al); ResidueColourFinder rcf = new OverviewResColourFinder(); av.setGlobalColourScheme(new ZappoColourScheme()); @@ -126,7 +127,7 @@ public class OverviewResColourFinderTest SequenceI seq = new Sequence("name", "MAT--GSPRAPAFF"); // FER1_MAIZE... + a // gap AlignmentI al = new Alignment(new SequenceI[] { seq }); - final AlignViewport av = new AlignViewport(al); + final AlignViewportI av = new AlignViewport(al); ResidueColourFinder rcf = new OverviewResColourFinder(); Color[] newColours = new Color[24]; @@ -179,7 +180,7 @@ public class OverviewResColourFinderTest SequenceGroup[] groups = new SequenceGroup[1]; groups[0] = sg; - final AlignViewport av = new AlignViewport(al); + final AlignViewportI av = new AlignViewport(al); ResidueColourFinder rcf = new OverviewResColourFinder(); // G in group specified as magenta in Zappo @@ -230,8 +231,6 @@ public class OverviewResColourFinderTest { SequenceI seq = new Sequence("name", "MAT--GSPRAPAFF"); // FER1_MAIZE... + a // gap - AlignmentI al = new Alignment(new SequenceI[] { seq }); - final AlignViewport av = new AlignViewport(al); // non-legacy colouring ResidueColourFinder rcf = new OverviewResColourFinder(); @@ -269,9 +268,7 @@ public class OverviewResColourFinderTest // gaps gap colour c = rcf.getBoxColour(shader, seq, 3); - assertEquals( - jalview.renderer.OverviewResColourFinder.OVERVIEW_DEFAULT_GAP, - c); + assertEquals(OverviewResColourFinder.OVERVIEW_DEFAULT_GAP, c); // non legacy colouring with colour scheme rcf = new OverviewResColourFinder(false, Color.blue, Color.red);