JAL-3829 fixed up the 3d-beacons data columns definitions, tests and client.

[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 0656d67..06e1869 100644 (file)
--- a/test/jalview/fts/threedbeacons/TDBeaconsFTSRestClientTest.java
+++ b/test/jalview/fts/threedbeacons/TDBeaconsFTSRestClientTest.java
@@ -71,7 +71,7 @@ public class TDBeaconsFTSRestClientTest
     Assert.assertTrue(!ftsRestClient.getAllDefaultDisplayedFTSDataColumns()
             .isEmpty());
     Assert.assertEquals(ftsRestClient
-            .getAllDefaultDisplayedFTSDataColumns().size(), 8);
+            .getAllDefaultDisplayedFTSDataColumns().size(), 10);
   }
   
   @Test(groups = { "Functional" })
@@ -85,10 +85,10 @@ public class TDBeaconsFTSRestClientTest
       Assert.assertEquals(foundIndex, -1);
       foundIndex = ftsRestClient.getPrimaryKeyColumIndex(wantedFields,
               false);
-      Assert.assertEquals(foundIndex, 1);
+      Assert.assertEquals(foundIndex, 0);
       foundIndex = ftsRestClient
               .getPrimaryKeyColumIndex(wantedFields, true);
-      Assert.assertEquals(foundIndex, 2);
+      Assert.assertEquals(foundIndex, 1);
     } catch (Exception e)
     {
       e.printStackTrace();
@@ -105,7 +105,7 @@ public class TDBeaconsFTSRestClientTest
     String actual = ftsRestClient
             .getDataColumnsFieldsAsCommaDelimitedString(wantedFields);
     Assert.assertEquals(actual,
-            "aligned_sequence,model_identifier,provider,id,uniprot_accession,entry_name,model_url,qmean_avg_local_score");
+            "model_identifier,provider,entry_name,qmean_avg_local_score,uniprot_start,uniprot_end,resolution,coverage,model_category,created");
   }
   
   @Test(groups = { "Functional" })
@@ -115,7 +115,7 @@ public class TDBeaconsFTSRestClientTest
             .getAllFTSDataColumns();
     Assert.assertNotNull(allFields);
     //System.out.println(allFields.size());
-    Assert.assertEquals(allFields.size(), 8);
+    Assert.assertEquals(allFields.size(), 15);
   }
   
   @Test(groups = { "Functional" })
@@ -126,7 +126,7 @@ public class TDBeaconsFTSRestClientTest
             .getSearchableDataColumns();
     Assert.assertNotNull(searchableFields);
     //System.out.println(searchableFields.size());
-    Assert.assertEquals(searchableFields.size(), 6); //only 1, as of first 3DB test
+    Assert.assertEquals(searchableFields.size(), 1); //only 1: uniprot accession
   }
   
   @Test(groups = { "Functional" })
@@ -278,13 +278,19 @@ public class TDBeaconsFTSRestClientTest
     try
     {
       wantedFields.add(TDBeaconsFTSRestClient.getInstance()
-              .getDataColumnByNameOrCode("Model_id"));
+              .getDataColumnByNameOrCode("Model Id"));
       wantedFields.add(TDBeaconsFTSRestClient.getInstance()
               .getDataColumnByNameOrCode("model_url"));
       wantedFields.add(TDBeaconsFTSRestClient.getInstance()
               .getDataColumnByNameOrCode("provider"));
       wantedFields.add(TDBeaconsFTSRestClient.getInstance()
+              .getDataColumnByNameOrCode("model_category"));
+      wantedFields.add(TDBeaconsFTSRestClient.getInstance()
               .getDataColumnByNameOrCode("qmean_avg_local_score"));
+      wantedFields.add(TDBeaconsFTSRestClient.getInstance()
+              .getDataColumnByNameOrCode("uniprot_start"));
+      wantedFields.add(TDBeaconsFTSRestClient.getInstance()
+              .getDataColumnByNameOrCode("uniprot_end"));
     } catch (Exception e1)
     {
       e1.printStackTrace();
@@ -293,8 +299,8 @@ public class TDBeaconsFTSRestClientTest
 
     FTSRestRequest request = new FTSRestRequest();
     request.setResponseSize(100);
-    request.setFieldToSearchBy("P");
-    request.setSearchTerm("01318.json");
+    request.setFieldToSearchBy("");
+    request.setSearchTerm("P01318.json");
     request.setWantedFields(wantedFields);
     System.out.println("request : " + request.getFieldToSearchBy());
     //System.out.println(request.toString());