JAL-1705 further unit tests

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

diff --git a/test/jalview/ext/ensembl/EnsemblSeqProxyTest.java b/test/jalview/ext/ensembl/EnsemblSeqProxyTest.java
index 31745e5..ed936d5 100644 (file)
--- a/test/jalview/ext/ensembl/EnsemblSeqProxyTest.java
+++ b/test/jalview/ext/ensembl/EnsemblSeqProxyTest.java
@@ -21,6 +21,8 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
@@ -106,6 +108,18 @@ public class EnsemblSeqProxyTest
                   + "NRDQIIFMVGRGYLSPDLSKVRSNCPKAMKRLMAECLKKKRDERPLFPQILASIELLARS\n"
                   + "LPKIHRSASEPSLNRAGFQTEDFSLYACASPKTPIQAGGYGAFPVH" } };
 
+  @BeforeClass
+  public void setUp()
+  {
+    SequenceOntologyFactory.setInstance(new SequenceOntologyLite());
+  }
+
+  @AfterClass
+  public void tearDown()
+  {
+    SequenceOntologyFactory.setInstance(null);
+  }
+
   @DataProvider(name = "queries")
   public Object[][] createQueryData(Method m)
   {
@@ -306,10 +320,9 @@ public class EnsemblSeqProxyTest
     sf = new SequenceFeature("exon", "", 7, 9, 0f, null);
     ds.addSequenceFeature(sf);
     // CDS for dna 10-12
-    sf = new SequenceFeature("some_cds", "", 10, 12, 0f, null);
+    sf = new SequenceFeature("CDS_predicted", "", 10, 12, 0f, null);
     ds.addSequenceFeature(sf);
 
-    SequenceOntologyFactory.setInstance(new SequenceOntologyLite());
     List<int[]> ranges = new ArrayList<int[]>();
     int mappedLength = testee.getCdsRanges(dnaSeq, ranges);
     assertEquals(6, mappedLength);
@@ -346,10 +359,9 @@ public class EnsemblSeqProxyTest
     ds.addSequenceFeature(sf);
     ds.addSequenceFeature(sf);
     // CDS for dna 13-15
-    sf = new SequenceFeature("some_cds", "", 13, 15, 0f, null);
+    sf = new SequenceFeature("CDS_predicted", "", 13, 15, 0f, null);
     ds.addSequenceFeature(sf);
   
-    SequenceOntologyFactory.setInstance(new SequenceOntologyLite());
     List<int[]> ranges = new ArrayList<int[]>();
     int mappedLength = testee.getCdsRanges(dnaSeq, ranges);