JAL-2360 refactoring for JalviewColourScheme enum,

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

diff --git a/test/jalview/io/Jalview2xmlTests.java b/test/jalview/io/Jalview2xmlTests.java
index de12086..434619e 100644 (file)
--- a/test/jalview/io/Jalview2xmlTests.java
+++ b/test/jalview/io/Jalview2xmlTests.java
@@ -64,6 +64,7 @@ import org.testng.annotations.Test;
 public class Jalview2xmlTests extends Jalview2xmlBase
 {
 
+  @Override
   @BeforeClass(alwaysRun = true)
   public void setUpJvOptionPane()
   {
@@ -82,7 +83,7 @@ public class Jalview2xmlTests extends Jalview2xmlBase
     assertTrue("Didn't read input file " + inFile, af != null);
     int olddsann = countDsAnn(af.getViewport());
     assertTrue("Didn't find any dataset annotations", olddsann > 0);
-    af.rnahelicesColour_actionPerformed(null);
+    af.rnahelicesColour_actionPerformed();
     assertTrue(
             "Couldn't apply RNA helices colourscheme",
             af.getViewport().getGlobalColourScheme() instanceof jalview.schemes.RNAHelicesColour);
@@ -119,8 +120,8 @@ public class Jalview2xmlTests extends Jalview2xmlBase
             .getGlobalColourScheme().getClass(), TCoffeeColourScheme.class);
     assertNotNull("Recognise T-Coffee score from string",
             ColourSchemeProperty.getColour(af.getViewport()
-                    .getAlignment(), ColourSchemeProperty.getColourName(af
-                    .getViewport().getGlobalColourScheme())));
+                    .getAlignment(), af.getViewport()
+                    .getGlobalColourScheme().getSchemeName()));
 
     assertTrue("Failed to store as a project.",
             af.saveAlignment(tfile, FileFormat.Jalview));