JAL-3829 more testing wit tdbeacons data columns and FTSclient

[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 f65fa84..b144aa5 100644 (file)
--- a/test/jalview/fts/threedbeacons/TDBeaconsFTSRestClientTest.java
+++ b/test/jalview/fts/threedbeacons/TDBeaconsFTSRestClientTest.java
@@ -246,7 +246,7 @@ public class TDBeaconsFTSRestClientTest
     try
     {
       wantedFields.add(TDBeaconsFTSRestClient.getInstance()
-              .getDataColumnByNameOrCode("id"));
+              .getDataColumnByNameOrCode("Model id"));
       wantedFields.add(TDBeaconsFTSRestClient.getInstance()
               .getDataColumnByNameOrCode("uniprot_accession"));
       wantedFields.add(TDBeaconsFTSRestClient.getInstance()
@@ -257,10 +257,10 @@ public class TDBeaconsFTSRestClientTest
     }
     try
     {
-      assertEquals(1, PDBFTSRestClient.getInstance()
+      assertEquals(1, TDBeaconsFTSRestClient.getInstance()
               .getPrimaryKeyColumIndex(wantedFields, true));
-//      assertEquals(4, PDBFTSRestClient.getInstance()
-//              .getPrimaryKeyColumIndex(wantedFields, false));
+//      assertEquals(3, TDBeaconsFTSRestClient.getInstance()
+//              .getPrimaryKeyColumIndex(wantedFields, true));
     } catch (Exception e)
     {
       e.printStackTrace();
@@ -275,11 +275,13 @@ public class TDBeaconsFTSRestClientTest
     try
     {
       wantedFields.add(TDBeaconsFTSRestClient.getInstance()
-              .getDataColumnByNameOrCode("id"));
+              .getDataColumnByNameOrCode("Model id"));
       wantedFields.add(TDBeaconsFTSRestClient.getInstance()
-              .getDataColumnByNameOrCode("uniprot_accession"));
+              .getDataColumnByNameOrCode("model_url"));
       wantedFields.add(TDBeaconsFTSRestClient.getInstance()
-              .getDataColumnByNameOrCode("entry name"));
+              .getDataColumnByNameOrCode("provider"));
+      wantedFields.add(TDBeaconsFTSRestClient.getInstance()
+              .getDataColumnByNameOrCode("qmean_avg_local_score"));
     } catch (Exception e1)
     {
       e1.printStackTrace();
@@ -289,10 +291,10 @@ public class TDBeaconsFTSRestClientTest
     FTSRestRequest request = new FTSRestRequest();
     request.setResponseSize(100);
     request.setFieldToSearchBy("P");
-    request.setSearchTerm("01308.json");
+    request.setSearchTerm("01318.json");
     request.setWantedFields(wantedFields);
     System.out.println("request : " + request.getFieldToSearchBy());
-    System.out.println(request.toString());
+    //System.out.println(request.toString());
 
     FTSRestResponse response;
     try
@@ -305,8 +307,8 @@ public class TDBeaconsFTSRestClientTest
       return;
     }
     assertTrue(response.getSearchSummary() != null);
-    assertTrue(response.getNumberOfItemsFound() > 99);
-    System.out.println(response.getSearchSummary());
-    System.out.println(response.getSearchSummary().size());
+    assertTrue(response.getNumberOfItemsFound() > 3); //4 atm
+    System.out.println("Search summary : \n" + response.getSearchSummary());
+    //System.out.println(response.getSearchSummary().size());
   }
 }