Merge branch 'develop' into features/JAL-2094_colourInterface

[jalview.git] / test / jalview / ext / ensembl / EnsemblGeneTest.java

diff --git a/test/jalview/ext/ensembl/EnsemblGeneTest.java b/test/jalview/ext/ensembl/EnsemblGeneTest.java
index 5cf296c..1779cb0 100644 (file)
--- a/test/jalview/ext/ensembl/EnsemblGeneTest.java
+++ b/test/jalview/ext/ensembl/EnsemblGeneTest.java
@@ -11,9 +11,9 @@ import jalview.datamodel.SequenceFeature;
 import jalview.datamodel.SequenceI;
 import jalview.io.gff.SequenceOntologyFactory;
 import jalview.io.gff.SequenceOntologyLite;
+import jalview.schemes.Colour;
 import jalview.util.MapList;
 
-import java.awt.Color;
 import java.util.List;
 
 import org.testng.annotations.AfterClass;
@@ -22,13 +22,13 @@ import org.testng.annotations.Test;
 
 public class EnsemblGeneTest
 {
-  @BeforeClass
+  @BeforeClass(alwaysRun = true)
   public void setUp()
   {
     SequenceOntologyFactory.setInstance(new SequenceOntologyLite());
   }
 
-  @AfterClass
+  @AfterClass(alwaysRun = true)
   public void tearDown()
   {
     SequenceOntologyFactory.setInstance(null);
@@ -250,9 +250,9 @@ public class EnsemblGeneTest
     assertTrue(fc.isFeatureDisplayed("sequence_variant"));
     assertTrue(fc.isFeatureDisplayed("feature_variant")); // subtype
     assertFalse(fc.isFeatureDisplayed("transcript"));
-    assertEquals(Color.RED, fc.getFeatureColour("sequence_variant")
+    assertEquals(Colour.red, fc.getFeatureColour("sequence_variant")
             .getColour());
-    assertEquals(Color.RED, fc.getFeatureColour("feature_variant")
+    assertEquals(Colour.red, fc.getFeatureColour("feature_variant")
             .getColour());
     assertTrue(fc.getFeatureColour("exon").isColourByLabel());
     assertTrue(fc.getFeatureColour("coding_exon").isColourByLabel());