JAL-3829 insert title for structures from PDBe

[jalview.git] / test / jalview / gui / structurechooser / StructureChooserQuerySourceTest.java

diff --git a/test/jalview/gui/structurechooser/StructureChooserQuerySourceTest.java b/test/jalview/gui/structurechooser/StructureChooserQuerySourceTest.java
index f492ce6..59c4a50 100644 (file)
--- a/test/jalview/gui/structurechooser/StructureChooserQuerySourceTest.java
+++ b/test/jalview/gui/structurechooser/StructureChooserQuerySourceTest.java
@@ -24,6 +24,7 @@ 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;
@@ -38,6 +39,7 @@ 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;
@@ -173,7 +175,9 @@ public class StructureChooserQuerySourceTest
   {
     System.out.println("seq >>>> " + upSeq);
     TDBeaconsFTSRestClientTest.setMock();
+    PDBFTSRestClient.setMock();
     StructureChooserQuerySource scquery = StructureChooserQuerySource.getQuerySourceFor(new SequenceI[] { upSeq});
+    // gets the lightweight proxy rather than the ThreeDBStructureChooserQuerySource
     AssertJUnit.assertTrue(scquery instanceof ThreeDBStructureChooserQuerySource);
     String query = scquery.buildQuery(upSeq);
     AssertJUnit.assertEquals("P38398", query);
@@ -260,6 +264,9 @@ public class StructureChooserQuerySourceTest
     
     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);
@@ -268,6 +275,7 @@ public class StructureChooserQuerySourceTest
       FTSRestResponse joinedResp = tdbquery.joinResponses(upResponse, pdbResponse);
       assertEquals(upResponse.getNumberOfItemsFound(),joinedResp.getNumberOfItemsFound());
       
+      
     } catch (Exception x)
     {
       x.printStackTrace();