JAL-3832 Gui working, with 3DBeacons parameters

[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 b144aa5..539af37 100644 (file)
--- a/test/jalview/fts/threedbeacons/TDBeaconsFTSRestClientTest.java
+++ b/test/jalview/fts/threedbeacons/TDBeaconsFTSRestClientTest.java
@@ -63,15 +63,15 @@ public class TDBeaconsFTSRestClientTest
   
   @Test
   public void getAllDefaulDisplayedDataColumns()
-  {
+  {     
+    // to change when resources.tdbeacons_data_columns.txt is changed
     Assert.assertNotNull(ftsRestClient
             .getAllDefaultDisplayedFTSDataColumns());
     System.out.println(ftsRestClient.getAllDefaultDisplayedFTSDataColumns());
     Assert.assertTrue(!ftsRestClient.getAllDefaultDisplayedFTSDataColumns()
             .isEmpty());
     Assert.assertEquals(ftsRestClient
-            .getAllDefaultDisplayedFTSDataColumns().size(), 3);
-    // currently 3, may change -> change this test and the nexts accordingly
+            .getAllDefaultDisplayedFTSDataColumns().size(), 8);
   }
   
   @Test(groups = { "Functional" })
@@ -85,10 +85,10 @@ public class TDBeaconsFTSRestClientTest
       Assert.assertEquals(foundIndex, -1);
       foundIndex = ftsRestClient.getPrimaryKeyColumIndex(wantedFields,
               false);
-      Assert.assertEquals(foundIndex, 0);
+      Assert.assertEquals(foundIndex, 1);
       foundIndex = ftsRestClient
               .getPrimaryKeyColumIndex(wantedFields, true);
-      Assert.assertEquals(foundIndex, 1);
+      Assert.assertEquals(foundIndex, 2);
     } catch (Exception e)
     {
       e.printStackTrace();
@@ -99,12 +99,13 @@ public class TDBeaconsFTSRestClientTest
   @Test(groups = { "Functional" })
   public void getDataColumnsFieldsAsCommaDelimitedString()
   {
+    // to change when resources.tdbeacons_data_columns.txt is changed
     Collection<FTSDataColumnI> wantedFields = ftsRestClient
             .getAllDefaultDisplayedFTSDataColumns();
     String actual = ftsRestClient
             .getDataColumnsFieldsAsCommaDelimitedString(wantedFields);
     Assert.assertEquals(actual,
-            "id,uniprot_accession,entry name");
+            "aligned_sequence,model_identifier,provider,id,uniprot_accession,entry_name,model_url,qmean_avg_local_score");
   }
   
   @Test(groups = { "Functional" })
@@ -114,27 +115,29 @@ public class TDBeaconsFTSRestClientTest
             .getAllFTSDataColumns();
     Assert.assertNotNull(allFields);
     //System.out.println(allFields.size());
-    Assert.assertEquals(allFields.size(), 3);
+    Assert.assertEquals(allFields.size(), 8);
   }
   
   @Test(groups = { "Functional" })
   public void getSearchableDataColumns()
-  {
+  {     
+    // to change when resources.tdbeacons_data_columns.txt is changed
     Collection<FTSDataColumnI> searchableFields = ftsRestClient
             .getSearchableDataColumns();
     Assert.assertNotNull(searchableFields);
     //System.out.println(searchableFields.size());
-    Assert.assertEquals(searchableFields.size(), 1); //only 1, as of first 3DB test
+    Assert.assertEquals(searchableFields.size(), 6); //only 1, as of first 3DB test
   }
   
   @Test(groups = { "Functional" })
   public void getPrimaryKeyColumn()
-  {
+  { 
+    // to change when resources.tdbeacons_data_columns.txt is changed
     FTSDataColumnI expectedPKColumn;
     try
     {
       expectedPKColumn = ftsRestClient
-              .getDataColumnByNameOrCode("Uniprot Id");
+              .getDataColumnByNameOrCode("Model id");
       Assert.assertNotNull(ftsRestClient.getPrimaryKeyColumn());
       Assert.assertEquals(ftsRestClient.getPrimaryKeyColumn(),
               expectedPKColumn);