JAL-2371 CollectionColourScheme wraps ColourSchemeI

[jalview.git] / test / jalview / io / Jalview2xmlTests.java

diff --git a/test/jalview/io/Jalview2xmlTests.java b/test/jalview/io/Jalview2xmlTests.java
index 734bfe0..5b99fa1 100644 (file)
--- a/test/jalview/io/Jalview2xmlTests.java
+++ b/test/jalview/io/Jalview2xmlTests.java
@@ -163,7 +163,7 @@ public class Jalview2xmlTests extends Jalview2xmlBase
     SequenceGroup sg = new SequenceGroup();
     sg.setStartRes(57);
     sg.setEndRes(92);
-    sg.cs = gcs;
+    sg.cs.setColourScheme(gcs);
     af.getViewport().getAlignment().addGroup(sg);
     sg.addSequence(af.getViewport().getAlignment().getSequenceAt(1), false);
     sg.addSequence(af.getViewport().getAlignment().getSequenceAt(2), true);
@@ -179,7 +179,7 @@ public class Jalview2xmlTests extends Jalview2xmlBase
 
     ColourSchemeI _rcs = af.getViewport().getGlobalColourScheme();
     ColourSchemeI _rgcs = af.getViewport().getAlignment().getGroups()
-            .get(0).cs;
+            .get(0).getColourScheme();
     assertNotNull("Didn't recover global colourscheme", _rcs);
     assertTrue("Didn't recover annotation colour global scheme",
             _rcs instanceof AnnotationColourGradient);
@@ -192,8 +192,8 @@ public class Jalview2xmlTests extends Jalview2xmlBase
     for (int p = 0, pSize = af.getViewport().getAlignment().getWidth(); p < pSize
             && (!diffseqcols || !diffgseqcols); p++)
     {
-      if (_rcs.findColour(sqs[0].getCharAt(p), p, sqs[0]) != _rcs
-              .findColour(sqs[5].getCharAt(p), p, sqs[5]))
+      if (_rcs.findColour(sqs[0].getCharAt(p), p, sqs[0], null, 0f) != _rcs
+              .findColour(sqs[5].getCharAt(p), p, sqs[5], null, 0f))
       {
         diffseqcols = true;
       }
@@ -212,8 +212,8 @@ public class Jalview2xmlTests extends Jalview2xmlBase
     for (int p = 0, pSize = af.getViewport().getAlignment().getWidth(); p < pSize
             && (!diffseqcols || !diffgseqcols); p++)
     {
-      if (_rgcs.findColour(sqs[1].getCharAt(p), p, sqs[1]) != _rgcs
-              .findColour(sqs[2].getCharAt(p), p, sqs[2]))
+      if (_rgcs.findColour(sqs[1].getCharAt(p), p, sqs[1], null, 0f) != _rgcs
+              .findColour(sqs[2].getCharAt(p), p, sqs[2], null, 0f))
       {
         diffgseqcols = true;
       }
@@ -381,8 +381,8 @@ public class Jalview2xmlTests extends Jalview2xmlBase
             Desktop.getAlignFrames().length,
             Desktop.getAlignmentPanels(af.getViewport().getSequenceSetId()).length);
     Assert.assertEquals(
-            oldviews,
-            Desktop.getAlignmentPanels(af.getViewport().getSequenceSetId()).length);
+            Desktop.getAlignmentPanels(af.getViewport().getSequenceSetId()).length,
+            oldviews);
   }
 
   /**