JAL-2371 CollectionColourScheme wraps ColourSchemeI

[jalview.git] / test / jalview / schemes / ColourSchemesTest.java

diff --git a/test/jalview/schemes/ColourSchemesTest.java b/test/jalview/schemes/ColourSchemesTest.java
index 6527756..39d58f8 100644 (file)
--- a/test/jalview/schemes/ColourSchemesTest.java
+++ b/test/jalview/schemes/ColourSchemesTest.java
@@ -34,9 +34,9 @@ public class ColourSchemesTest
    */
   class Stripy extends ResidueColourScheme
   {
-    private ColourSchemeI odd;
+    private ResidueColourScheme odd;
 
-    private ColourSchemeI even;
+    private ResidueColourScheme even;
 
     private Stripy()
     {
@@ -50,8 +50,8 @@ public class ColourSchemesTest
      */
     private Stripy(ColourSchemeI cs1, ColourSchemeI cs2)
     {
-      odd = cs1;
-      even = cs2;
+      odd = (ResidueColourScheme) cs1;
+      even = (ResidueColourScheme) cs2;
     }
 
     @Override
@@ -92,15 +92,16 @@ public class ColourSchemesTest
    */
   class MyClustal extends ResidueColourScheme
   {
-    ColourSchemeI delegate;
+    ClustalxColourScheme delegate;
 
     private MyClustal()
     {
     }
 
-    private MyClustal(ColourSchemeI scheme)
+    private MyClustal(AnnotatedCollectionI sg,
+            Map<SequenceI, SequenceCollectionI> hiddenRepSequences)
     {
-      delegate = scheme;
+      delegate = new ClustalxColourScheme(sg, hiddenRepSequences);
     }
 
     @Override
@@ -147,8 +148,7 @@ public class ColourSchemesTest
     public ColourSchemeI getInstance(AnnotatedCollectionI sg,
             Map<SequenceI, SequenceCollectionI> hiddenRepSequences)
     {
-      return new MyClustal(new ClustalxColourScheme().getInstance(sg,
-              hiddenRepSequences));
+      return new MyClustal(sg,              hiddenRepSequences);
     }
 
     @Override