Merge branch 'develop' into update_212_Dec_merge_with_21125_chamges

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

diff --git a/test/jalview/ext/ensembl/EnsemblGenomeTest.java b/test/jalview/ext/ensembl/EnsemblGenomeTest.java
index 11140f9..5515c05 100644 (file)
--- a/test/jalview/ext/ensembl/EnsemblGenomeTest.java
+++ b/test/jalview/ext/ensembl/EnsemblGenomeTest.java
@@ -52,13 +52,13 @@ public class EnsemblGenomeTest
   @BeforeClass(alwaysRun = true)
   public void setUp()
   {
-    SequenceOntologyFactory.setInstance(new SequenceOntologyLite());
+    SequenceOntologyFactory.setSequenceOntology(new SequenceOntologyLite());
   }
 
   @AfterClass(alwaysRun = true)
   public void tearDown()
   {
-    SequenceOntologyFactory.setInstance(null);
+    SequenceOntologyFactory.setSequenceOntology(null);
   }
 
   /**
@@ -75,8 +75,8 @@ public class EnsemblGenomeTest
     String transcriptId = "ABC123";
 
     // transcript at (start+10000) length 501
-    SequenceFeature sf = new SequenceFeature("transcript", "", 20000,
-            20500, 0f, null);
+    SequenceFeature sf = new SequenceFeature("transcript", "", 20000, 20500,
+            0f, null);
     sf.setValue("id", transcriptId);
     sf.setStrand("+");
     genomic.addSequenceFeature(sf);
@@ -89,8 +89,8 @@ public class EnsemblGenomeTest
 
     // Ensembl treats NMD_transcript_variant as if transcript
     // although strictly it is a sequence_variant in SO
-    sf = new SequenceFeature("NMD_transcript_variant", "", 11000, 12000,
-            0f, null);
+    sf = new SequenceFeature("NMD_transcript_variant", "", 11000, 12000, 0f,
+            null);
     sf.setValue("id", transcriptId);
     sf.setStrand("+");
     genomic.addSequenceFeature(sf);
@@ -133,16 +133,16 @@ public class EnsemblGenomeTest
     String accId = "ABC123";
     EnsemblGenome testee = new EnsemblGenome();
 
-    SequenceFeature sf = new SequenceFeature("transcript", "", 20000,
-            20500, 0f, null);
+    SequenceFeature sf = new SequenceFeature("transcript", "", 20000, 20500,
+            0f, null);
     assertFalse(testee.retainFeature(sf, accId));
 
     sf = new SequenceFeature("mature_transcript", "", 20000, 20500, 0f,
             null);
     assertFalse(testee.retainFeature(sf, accId));
 
-    sf = new SequenceFeature("NMD_transcript_variant", "", 20000, 20500,
-            0f, null);
+    sf = new SequenceFeature("NMD_transcript_variant", "", 20000, 20500, 0f,
+            null);
     assertFalse(testee.retainFeature(sf, accId));
 
     // other feature with no parent is kept