X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fdbsources%2FRemoteFormatTest.java;h=e04d19520679e02fd4a8f3f05dc8387e374a2a09;hb=95d7a34b009144b172d60bbb5827df2fbb43524e;hp=a9cad8020b18a86b0dde6f56b59b53c5cecb86e5;hpb=278ab3940ed405ca90993ebaf117f43a4e8aec26;p=jalview.git

diff --git a/test/jalview/ws/dbsources/RemoteFormatTest.java b/test/jalview/ws/dbsources/RemoteFormatTest.java
index a9cad80..e04d195 100644
--- a/test/jalview/ws/dbsources/RemoteFormatTest.java
+++ b/test/jalview/ws/dbsources/RemoteFormatTest.java
@@ -1,18 +1,30 @@
 package jalview.ws.dbsources;
 
-import static org.testng.AssertJUnit.assertFalse;
-import static org.testng.AssertJUnit.assertTrue;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
 
+import jalview.analysis.AlignSeq;
+import jalview.bin.Cache;
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.DBRefSource;
+import jalview.datamodel.SequenceI;
+import jalview.ext.ensembl.EnsemblGenomes;
 import jalview.fts.api.FTSData;
 import jalview.fts.api.FTSDataColumnI;
 import jalview.fts.api.FTSRestClientI;
 import jalview.fts.core.FTSRestRequest;
 import jalview.fts.core.FTSRestResponse;
 import jalview.fts.service.uniprot.UniProtFTSRestClient;
+import jalview.ws.SequenceFetcher;
+import jalview.ws.seqfetcher.DbSourceProxy;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 /**
@@ -27,64 +39,60 @@ import org.testng.annotations.Test;
  */
 public class RemoteFormatTest
 {
-  @Test(groups = "Network")
-  public void testFetchUniprot()
-  {
-    // P00340
-  }
-
-  @Test(groups = "Network")
-  public void testFetchPdb()
-  {
-    // 1QIP
-  }
-
-  @Test(groups = "Network")
-  public void testFetchEmbl()
-  {
-    // X53828
-  }
+  SequenceFetcher sf;
 
-  @Test(groups = "Network")
-  public void testFetchEmblCDS()
+  @BeforeTest(alwaysRun = true)
+  public void setUp() throws Exception
   {
-    // CAA37824
-  }
-
-  @Test(groups = "Network")
-  public void testFetchEnsembl()
-  {
-    // ENSG00000157764
-  }
+    Cache.loadProperties("test/jalview/io/testProps.jvprops");
+    // ensure 'add annotation from structure' is selected
+    Cache.applicationProperties.setProperty("STRUCT_FROM_PDB",
+            Boolean.TRUE.toString());
+    Cache.applicationProperties.setProperty("ADD_SS_ANN",
+            Boolean.TRUE.toString());
 
-  @Test(groups = "Network")
-  public void testFetchEnsemblGenomes()
-  {
-    // DDB_G0283883
-  }
-
-  @Test(groups = "Network")
-  public void testFetchPfamSeed()
-  {
-    // PF03760
+    sf = new SequenceFetcher();
   }
 
-  @Test(groups = "Network")
-  public void testFetchPfamFull()
+  @DataProvider(name = "AccessionData")
+  protected Object[][] getAccessions()
   {
-    // PF03760
+    return new Object[][] { { DBRefSource.UNIPROT, "P30419" },
+        { DBRefSource.PDB, "1QIP" }, { DBRefSource.EMBL, "X53828" },
+        { DBRefSource.EMBLCDS, "CAA37824" },
+        { DBRefSource.ENSEMBL, "ENSG00000157764" },
+        { new EnsemblGenomes().getDbSource(), "DDB_G0283883" },
+        { new PfamFull().getDbSource(), "PF03760" },
+        { new PfamSeed().getDbSource(), "PF03760" },
+        { new RfamSeed().getDbSource(), "RF00014" } };
   }
 
-  @Test(groups = "Network")
-  public void testFetchRfamSeed()
+  @Test(groups = "Network", dataProvider = "AccessionData")
+  public void testFetchAccession(String dbSource, String accessionId)
+          throws Exception
   {
-    // RF00014
+    System.out.println("Fetching " + accessionId + " from " + dbSource);
+    List<DbSourceProxy> sps = sf.getSourceProxy(dbSource);
+    assertFalse(sps.isEmpty());
+    AlignmentI al = sps.get(0).getSequenceRecords(accessionId);
+    assertNotNull(al);
+    assertTrue(al.getHeight() > 0);
+    SequenceI sq = al.getSequenceAt(0);
+    // suppress this check as only Uniprot and PDB acquire PDB refs
+    // assertTrue(sq.getAllPDBEntries().size() > 0, "No PDBEntry on sequence.");
+    assertTrue(sq.getDBRefs().length > 0, "No DBRef on sequence.");
+    // suppress this test as only certain databases provide 'primary' dbrefs
+    // assertFalse(sq.getPrimaryDBRefs().isEmpty());
+    int length = AlignSeq.extractGaps("-. ", sq.getSequenceAsString())
+            .length();
+    assertEquals(sq.getEnd() - sq.getStart() + 1, length,
+            "Sequence start/end doesn't match number of residues in sequence");
   }
 
   @Test(groups = { "Network" })
   public void testUniprotFreeTextSearch() throws Exception
   {
-    List<FTSDataColumnI> wantedFields = new ArrayList<FTSDataColumnI>();
+    List<FTSDataColumnI> wantedFields = new ArrayList<>();
     FTSRestClientI client = UniProtFTSRestClient.getInstance();
     wantedFields.add(client.getDataColumnByNameOrCode("id"));
     wantedFields.add(client.getDataColumnByNameOrCode("entry name"));
@@ -106,7 +114,8 @@ public class RemoteFormatTest
     assertTrue(response.getSearchSummary().size() > 20);
     // verify we successfully filtered out the header row (JAL-2485)
     FTSData header = response.getSearchSummary().iterator().next();
-    assertFalse("Failed to filter out summary header row",
-            header.getSummaryData()[0].toString().equalsIgnoreCase("Entry"));
+    assertFalse(
+            header.getSummaryData()[0].toString().equalsIgnoreCase("Entry"),
+            "Failed to filter out summary header row");
   }
 }