X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fext%2Fensembl%2FEnsemblGeneTest.java;fp=test%2Fjalview%2Fext%2Fensembl%2FEnsemblGeneTest.java;h=e16197a34f49c17ce795bbb78140584a23d449af;hb=3efc24bc7b7855ff135fa96e35ab1004eaeb4f5e;hp=8b1e8404f7bb01e9f66cdc198d423df0d47e9bd5;hpb=dae56c38c3f14e96308540c30f35ca8f1d917edf;p=jalview.git diff --git a/test/jalview/ext/ensembl/EnsemblGeneTest.java b/test/jalview/ext/ensembl/EnsemblGeneTest.java index 8b1e840..e16197a 100644 --- a/test/jalview/ext/ensembl/EnsemblGeneTest.java +++ b/test/jalview/ext/ensembl/EnsemblGeneTest.java @@ -20,6 +20,8 @@ */ package jalview.ext.ensembl; +import java.util.Locale; + import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertFalse; import static org.testng.AssertJUnit.assertTrue; @@ -161,7 +163,7 @@ public class EnsemblGeneTest SequenceFeature sf3 = new SequenceFeature("NMD_transcript_variant", "", 22000, 22500, 0f, null); // id matching should not be case-sensitive - sf3.setValue("Parent", geneId.toLowerCase()); + sf3.setValue("Parent", geneId.toLowerCase(Locale.ROOT)); sf3.setValue("id", "transcript3"); genomic.addSequenceFeature(sf3); @@ -271,18 +273,24 @@ public class EnsemblGeneTest /** * Check behaviour of feature colour scheme for EnsemblGene sequences. - * Currently coded to display exon and sequence_variant (or sub-types) only, - * with sequence_variant in red above exon coloured by label. + * Currently coded to hide all except exon and sequence_variant (or sub-types) + * only, with sequence_variant in red above exon coloured by label. */ @Test(groups = "Functional") public void testGetFeatureColourScheme() { FeatureSettingsModelI fc = new EnsemblGene().getFeatureColourScheme(); - assertTrue(fc.isFeatureDisplayed("exon")); - assertTrue(fc.isFeatureDisplayed("coding_exon")); // subtype of exon - assertTrue(fc.isFeatureDisplayed("sequence_variant")); - assertTrue(fc.isFeatureDisplayed("feature_variant")); // subtype - assertFalse(fc.isFeatureDisplayed("transcript")); + assertFalse(fc.isFeatureDisplayed("exon")); + assertFalse(fc.isFeatureHidden("exon")); + assertFalse(fc.isFeatureDisplayed("coding_exon")); // subtype of exon + assertFalse(fc.isFeatureHidden("coding_exon")); // subtype of exon + assertFalse(fc.isFeatureDisplayed("sequence_variant")); + assertFalse(fc.isFeatureHidden("sequence_variant")); + assertFalse(fc.isFeatureDisplayed("feature_variant")); // subtype + assertFalse(fc.isFeatureHidden("feature_variant")); // subtype + assertTrue(fc.isFeatureHidden("transcript")); + assertTrue(fc.isFeatureHidden("CDS")); + assertEquals(Color.RED, fc.getFeatureColour("sequence_variant") .getColour()); assertEquals(Color.RED, fc.getFeatureColour("feature_variant")