JAL-1705 reworked Ensembl clients now fetching and mapping features &

[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 b456919..3ca74b0 100644 (file)
--- a/test/jalview/ext/ensembl/EnsemblSeqProxyTest.java
+++ b/test/jalview/ext/ensembl/EnsemblSeqProxyTest.java
@@ -1,53 +1,28 @@
 package jalview.ext.ensembl;
 
 import jalview.datamodel.Alignment;
+import jalview.datamodel.AlignmentI;
 import jalview.datamodel.SequenceI;
-import jalview.ext.ensembl.SeqFetcher.EnsemblSeqType;
 import jalview.io.AppletFormatAdapter;
 import jalview.io.FastaFile;
 import jalview.io.FileParse;
-import jalview.util.DBRefUtils;
 
 import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.Arrays;
+import java.util.List;
 
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
+
 public class EnsemblSeqProxyTest
 {
-  @Test
-  public void testCheckEnsembl()
-  {
-    SeqFetcher sf = new SeqFetcher();
-    sf.setTestEnsemblStatus(true);
-    sf.setTesting(true);
-    Assert.assertTrue(sf.isEnsemblAvailable());
-    sf.setTestEnsemblStatus(false);
-    Assert.assertFalse(sf.isEnsemblAvailable());
-  }
-
-  @Test(suiteName = "live")
-  public void testLiveCheckEnsembl()
-  {
-    SeqFetcher sf = new SeqFetcher();
-    boolean isAvailable = sf.isEnsemblAvailable();
-    System.out.println("Ensembl is "
-            + (isAvailable ? "UP!" : "DOWN ******************* BAD!"));
-  }
-
-  @DataProvider(name = "ens_seqs")
-  public Object[][] createData(Method m)
-  {
-    System.out.println(m.getName());
-    return allSeqs;
-  }
-
-  public static Object[][] allSeqs = new Object[][]
-  {
+  private static final Object[][] allSeqs = new Object[][] {
       {
-          EnsemblSeqType.PROTEIN,
+          new EnsemblProtein(),
           "CCDS5863.1",
           ">CCDS5863.1\n"
                   + "MAALSGGGGGGAEPGQALFNGDMEPEAGAGAGAAASSAADPAIPEEVWNIKQMIKLTQEH\n"
@@ -64,7 +39,7 @@ public class EnsemblSeqProxyTest
                   + "NRDQIIFMVGRGYLSPDLSKVRSNCPKAMKRLMAECLKKKRDERPLFPQILASIELLARS\n"
                   + "LPKIHRSASEPSLNRAGFQTEDFSLYACASPKTPIQAGGYGAFPVH\n" },
       {
-          EnsemblSeqType.TRANSCRIPT,
+          new EnsemblCdna(),
           "CCDS5863.1",
           ">CCDS5863.1\n"
                   + "ATGGCGGCGCTGAGCGGTGGCGGTGGTGGCGGCGCGGAGCCGGGCCAGGCTCTGTTCAAC\n"
@@ -107,7 +82,7 @@ public class EnsemblSeqProxyTest
                   + "GAGGATTTTAGTCTATATGCTTGTGCTTCTCCAAAAACACCCATCCAGGCAGGGGGATAT\n"
                   + "GGTGCGTTTCCTGTCCACTGA\n" },
       {
-          EnsemblSeqType.PROTEIN,
+          new EnsemblProtein(),
           "ENSP00000288602",
           ">ENSP00000288602\n"
                   + "MAALSGGGGGGAEPGQALFNGDMEPEAGAGAGAAASSAADPAIPEEVWNIKQMIKLTQEH\n"
@@ -124,12 +99,35 @@ public class EnsemblSeqProxyTest
                   + "NRDQIIFMVGRGYLSPDLSKVRSNCPKAMKRLMAECLKKKRDERPLFPQILASIELLARS\n"
                   + "LPKIHRSASEPSLNRAGFQTEDFSLYACASPKTPIQAGGYGAFPVH" } };
 
+  @DataProvider(name = "queries")
+  public Object[][] createQueryData(Method m)
+  {
+    return new Object[][] { { "CCDS5863.1" }, { "ENSP00000288602" } };
+  }
+
+  @Test(dataProvider = "queries")
+  public void testIsValidReference(String query) throws Exception
+  {
+    EnsemblSequenceFetcher esq = new EnsemblProtein();
+    Assert.assertTrue(esq.isValidReference(query),
+            "Expected reference string " + query
+                    + " to be valid for regex "
+                    + esq.getAccessionValidator().toString());
+  }
+
+  @DataProvider(name = "ens_seqs")
+  public Object[][] createData(Method m)
+  {
+    System.out.println(m.getName());
+    return allSeqs;
+  }
+
   @Test(dataProvider = "ens_seqs", suiteName = "live")
-  public void testGetOneSeqs(EnsemblSeqType type, String sq, String fastasq)
+  public void testGetOneSeqs(EnsemblRestClient proxy, String sq, String fastasq)
           throws Exception
   {
-    SeqFetcher sf = new SeqFetcher();
-    FileParse fp = sf.getSequenceReader(type, Arrays.asList(new String[]
+    FileParse fp = proxy.getSequenceReader(Arrays
+            .asList(new String[]
     { sq }));
     SequenceI[] sqs = new FastaFile(fp).getSeqsAsArray();
     FastaFile trueRes = new FastaFile(fastasq, AppletFormatAdapter.PASTE);
@@ -152,34 +150,62 @@ public class EnsemblSeqProxyTest
               "Sequences differ for " + tr.getName() + "\n" + "Exp:"
                       + tr.getSequenceAsString() + "\n" + "Got:"
                       + rseq[0].getSequenceAsString());
-
+  
     }
   }
 
-  @Test(dataProvider = "ens_seqs")
-  public void testRegexForProxy(EnsemblSeqType type, String sq,
-          String fastasq) throws Exception
+  @Test(suiteName = "live")
+  public void testLiveCheckEnsembl()
   {
-    EnsemblSeqProxy esq = new EnsemblProtein();
-    Assert.assertTrue(esq.isValidReference(sq),
-            "Expected reference string " + sq + " to be valid for regex "
-                    + esq.getAccessionValidator().toString());
-    
-    Assert.assertEquals(sq, DBRefUtils.processQueryToAccessionFor(esq, sq),
-            "Regex for " + esq.getClass().toString() + " not correct.");
+    EnsemblRestClient sf = new EnsemblRestClient()
+    {
+
+      @Override
+      public String getDbName()
+      {
+        // TODO Auto-generated method stub
+        return null;
+      }
+
+      @Override
+      public AlignmentI getSequenceRecords(String queries) throws Exception
+      {
+        // TODO Auto-generated method stub
+        return null;
+      }
+
+      @Override
+      protected URL getUrl(List<String> ids) throws MalformedURLException
+      {
+        // TODO Auto-generated method stub
+        return null;
+      }
+
+      @Override
+      public boolean useGetRequest()
+      {
+        // TODO Auto-generated method stub
+        return false;
+      }
+
+      @Override
+      public String getRequestMimeType()
+      {
+        // TODO Auto-generated method stub
+        return null;
+      }
+
+      @Override
+      public String getResponseMimeType()
+      {
+        // TODO Auto-generated method stub
+        return null;
+      }
+
+    };
+    boolean isAvailable = sf.isEnsemblAvailable();
+    System.out.println("Ensembl is "
+            + (isAvailable ? "UP!"
+                    : "DOWN or unreachable ******************* BAD!"));
   }
-  // @Test(dataProvider = "ens_seqs", suiteName = "live")
-  // public void testGetOneSeqs(EnsemblSeqType type, String sq, String fastasq)
-  // throws Exception
-  // {
-  //
-  // {
-  // Assert.assertTrue(rseq[0].getDBRef() != null
-  // && rseq[0].getDBRef().length > 0,
-  // "No database references added to sequence by fetcher.");
-  // Assert.assertNotNull(DBRefUtils.searchRefs(rseq[0].getDBRef(),
-  // new DBRefEntry("ENSEMBL", null, sq)),
-  // "Could't find database references added to sequence by fetcher.");
-  //
-  // }
 }
\ No newline at end of file