X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=test%2Fjalview%2Fext%2Fensembl%2FEnsemblGeneTest.java;h=1779cb009a6d61c4bb151f54504a7fa6efd31835;hp=5cf296cf3afa9237fa73b9ebd66af474e7839c6c;hb=f2b03e9fecf41886ebf5f747fd4be02edf042bee;hpb=d737688dfdb8d00ed63a699fb86548499d75bcf2 diff --git a/test/jalview/ext/ensembl/EnsemblGeneTest.java b/test/jalview/ext/ensembl/EnsemblGeneTest.java index 5cf296c..1779cb0 100644 --- 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());