X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2Fstructurechooser%2FStructureChooserQuerySourceTest.java;h=acedfed66662920b105e6490e239b56bd1c5071e;hb=db005f38bdad89aef8e22750682edf2eecccc0e0;hp=b6b4615cf4d1e05b0014acefc430b33b63da7944;hpb=1782673a61778d3aec570fbfc291ab21f99af7a3;p=jalview.git

diff --git a/test/jalview/gui/structurechooser/StructureChooserQuerySourceTest.java b/test/jalview/gui/structurechooser/StructureChooserQuerySourceTest.java
index b6b4615..acedfed 100644
--- a/test/jalview/gui/structurechooser/StructureChooserQuerySourceTest.java
+++ b/test/jalview/gui/structurechooser/StructureChooserQuerySourceTest.java
@@ -21,8 +21,13 @@
 package jalview.gui.structurechooser;
 
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+import java.util.Collection;
 import java.util.Vector;
 
+import org.junit.Assert;
 import org.testng.AssertJUnit;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeClass;
@@ -34,9 +39,13 @@ import jalview.datamodel.DBRefSource;
 import jalview.datamodel.PDBEntry;
 import jalview.datamodel.Sequence;
 import jalview.datamodel.SequenceI;
+import jalview.fts.api.FTSData;
 import jalview.fts.core.FTSRestRequest;
+import jalview.fts.core.FTSRestResponse;
+import jalview.fts.service.pdb.PDBFTSRestClient;
 import jalview.fts.threedbeacons.TDBeaconsFTSRestClientTest;
 import jalview.gui.JvOptionPane;
+import jalview.jbgui.FilterOption;
 
 public class StructureChooserQuerySourceTest
 {
@@ -242,21 +251,35 @@ public class StructureChooserQuerySourceTest
   public void cascadingThreeDBandPDBQuerys()
   {
     TDBeaconsFTSRestClientTest.setMock();
-    
-    StructureChooserQuerySource scquery = StructureChooserQuerySource.getQuerySourceFor(new SequenceI[] { upSeq});
+    PDBFTSRestClient.setMock();
+    ThreeDBStructureChooserQuerySource tdbquery = new ThreeDBStructureChooserQuerySource();
+    PDBStructureChooserQuerySource pdbquery  = new PDBStructureChooserQuerySource();
+            
 
-    // query TDB for doc
-    // query PDBe for PDB entry metadata
-    // Combine
     
-    FTSRestRequest tdbQuery = new FTSRestRequest();
-    tdbQuery.setResponseSize(100);
-    tdbQuery.setFieldToSearchBy("");
-    tdbQuery.setSearchTerm(scquery.buildQuery(upSeq));
-    tdbQuery.setWantedFields(scquery.getDocFieldPrefs().getStructureSummaryFields());
-    //scquery.fetchStructuresMetaData(upSeq, null, null, false);
-    String secondaryPdbQuery;
-    //secondaryPdbQuery = ((ThreeDBStructureChooserQuerySource)scquery).buildPDBFTSquery();
+    FTSRestResponse upResponse = null;
+    FTSRestResponse pdbResponse = null;
+    
+    try {
+      upResponse = tdbquery.fetchStructuresMetaData(upSeq, tdbquery.getDocFieldPrefs().getStructureSummaryFields(),  null, false);
+      // test ranking without additional PDBe data
+      FTSRestResponse firstRanked = tdbquery.selectFirstRankedQuery(upSeq, upResponse.getSearchSummary(), tdbquery.getDocFieldPrefs().getStructureSummaryFields(), "", false);
+      assertTrue(firstRanked.getNumberOfItemsFound()==upResponse.getNumberOfItemsFound());
+      // NB Could have race condition here 
+      String pdb_Query = tdbquery.buildPDBFTSQueryFor(upResponse);
+      assertTrue(pdb_Query.trim().length()>0);
+      pdbResponse = tdbquery.fetchStructuresMetaDataFor(pdbquery, upResponse);
+      assertTrue(pdbResponse.getNumberOfItemsFound()>0);
+      FTSRestResponse joinedResp = tdbquery.joinResponses(upResponse, pdbResponse);
+      assertEquals(upResponse.getNumberOfItemsFound(),joinedResp.getNumberOfItemsFound());
+      
+      
+    } catch (Exception x)
+    {
+      x.printStackTrace();
+      Assert.fail("Unexpected Exception");
+    }
+    StructureChooserQuerySource scquery = StructureChooserQuerySource.getQuerySourceFor(new SequenceI[] { upSeq});
 
   }