Request now parses the whole structures, need to fix the result

[jalview.git] / test / jalview / fts / threedbeacons / TDBeaconsFTSRestClientTest.java

diff --git a/test/jalview/fts/threedbeacons/TDBeaconsFTSRestClientTest.java b/test/jalview/fts/threedbeacons/TDBeaconsFTSRestClientTest.java
index fad7750..f65fa84 100644 (file)
--- a/test/jalview/fts/threedbeacons/TDBeaconsFTSRestClientTest.java
+++ b/test/jalview/fts/threedbeacons/TDBeaconsFTSRestClientTest.java
@@ -1,5 +1,6 @@
 package jalview.fts.threedbeacons;
 
+import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertTrue;
 
 import java.util.ArrayList;
@@ -19,6 +20,7 @@ import jalview.fts.api.FTSDataColumnI.FTSDataColumnGroupI;
 import jalview.fts.core.FTSRestClient;
 import jalview.fts.core.FTSRestRequest;
 import jalview.fts.core.FTSRestResponse;
+import jalview.fts.service.pdb.PDBFTSRestClient;
 import jalview.fts.service.threedbeacons.TDBeaconsFTSRestClient;
 import jalview.gui.JvOptionPane;
 
@@ -237,8 +239,35 @@ public class TDBeaconsFTSRestClientTest
     //Assert.assertEquals(uniqueSet.size(), 22); -> 1 or 2 currently for 3DB
   }
   
+  @Test(groups = { "Functional" })
+  public void getTDBIdColumIndexTest()
+  {
+    List<FTSDataColumnI> wantedFields = new ArrayList<FTSDataColumnI>();
+    try
+    {
+      wantedFields.add(TDBeaconsFTSRestClient.getInstance()
+              .getDataColumnByNameOrCode("id"));
+      wantedFields.add(TDBeaconsFTSRestClient.getInstance()
+              .getDataColumnByNameOrCode("uniprot_accession"));
+      wantedFields.add(TDBeaconsFTSRestClient.getInstance()
+              .getDataColumnByNameOrCode("entry name"));
+    } catch (Exception e)
+    {
+      e.printStackTrace();
+    }
+    try
+    {
+      assertEquals(1, PDBFTSRestClient.getInstance()
+              .getPrimaryKeyColumIndex(wantedFields, true));
+//      assertEquals(4, PDBFTSRestClient.getInstance()
+//              .getPrimaryKeyColumIndex(wantedFields, false));
+    } catch (Exception e)
+    {
+      e.printStackTrace();
+    }
+  }
   
-  
+
   @Test(groups = { "External", "Network" })  
   public void executeRequestTest()
   {
@@ -246,11 +275,11 @@ public class TDBeaconsFTSRestClientTest
     try
     {
       wantedFields.add(TDBeaconsFTSRestClient.getInstance()
-              .getDataColumnByNameOrCode("model_category"));
+              .getDataColumnByNameOrCode("id"));
       wantedFields.add(TDBeaconsFTSRestClient.getInstance()
-              .getDataColumnByNameOrCode("provider"));
+              .getDataColumnByNameOrCode("uniprot_accession"));
       wantedFields.add(TDBeaconsFTSRestClient.getInstance()
-              .getDataColumnByNameOrCode("created"));
+              .getDataColumnByNameOrCode("entry name"));
     } catch (Exception e1)
     {
       e1.printStackTrace();
@@ -258,8 +287,8 @@ public class TDBeaconsFTSRestClientTest
     System.out.println("wantedFields >>" + wantedFields);
 
     FTSRestRequest request = new FTSRestRequest();
-    //request.setAllowEmptySeq(false);
-    //request.setResponseSize(100);
+    request.setResponseSize(100);
+    request.setFieldToSearchBy("P");
     request.setSearchTerm("01308.json");
     request.setWantedFields(wantedFields);
     System.out.println("request : " + request.getFieldToSearchBy());
@@ -275,8 +304,9 @@ public class TDBeaconsFTSRestClientTest
       Assert.fail("Couldn't execute webservice call!");
       return;
     }
-    //assertTrue(response.getNumberOfItemsFound() > 99);
     assertTrue(response.getSearchSummary() != null);
-    assertTrue(response.getSearchSummary().size() > 99);
+    assertTrue(response.getNumberOfItemsFound() > 99);
+    System.out.println(response.getSearchSummary());
+    System.out.println(response.getSearchSummary().size());
   }
 }