JAL-1563 fixed failing tests for FTS Rest Client core

[jalview.git] / test / jalview / fts / core / FTSRestClientTest.java

diff --git a/test/jalview/fts/core/FTSRestClientTest.java b/test/jalview/fts/core/FTSRestClientTest.java
index fa36cac..0dac04b 100644 (file)
--- a/test/jalview/fts/core/FTSRestClientTest.java
+++ b/test/jalview/fts/core/FTSRestClientTest.java
@@ -24,7 +24,7 @@ public class FTSRestClientTest
       @Override
       public String getColumnDataConfigFileName()
       {
-        return "examples/testdata/test_fts_data_columns.conf";
+        return "/fts/uniprot_data_columns.txt";
       }
 
       @Override
@@ -65,7 +65,7 @@ public class FTSRestClientTest
     Assert.assertTrue(!ftsRestClient.getAllDefaulDisplayedDataColumns()
             .isEmpty());
     Assert.assertEquals(ftsRestClient.getAllDefaulDisplayedDataColumns()
-            .size(), 6);
+            .size(), 7);
   }
 
   @Test(groups = { "Functional" })
@@ -76,19 +76,9 @@ public class FTSRestClientTest
     String actual = ftsRestClient
             .getDataColumnsFieldsAsCommaDelimitedString(wantedFields);
     Assert.assertEquals(actual,
-            "entry name,protein names,genes,organism,created,last-modified");
+            "id,entry name,protein names,genes,organism,length,reviewed");
   }
 
-  @Test(groups = { "Functional" })
-  public void getDataColumnsFieldsAsTabDelimitedString()
-  {
-    Collection<FTSDataColumnI> wantedFields = ftsRestClient
-            .getAllDefaulDisplayedDataColumns();
-    String actual = ftsRestClient
-            .getDataColumnsFieldsAsTabDelimitedString(wantedFields);
-    Assert.assertEquals(actual,
-            "Entry Name\tProtein names\tGene Names\tOrganism\tDate of creation\tDate of last modification");
-  }
 
   @Test(groups = { "Functional" })
   public void getAllFTSDataColumns()
@@ -96,7 +86,7 @@ public class FTSRestClientTest
     Collection<FTSDataColumnI> allFields = ftsRestClient
             .getAllFTSDataColumns();
     Assert.assertNotNull(allFields);
-    Assert.assertEquals(allFields.size(), 116);
+    Assert.assertEquals(allFields.size(), 117);
   }
 
   @Test(groups = { "Functional" })
@@ -105,7 +95,7 @@ public class FTSRestClientTest
     Collection<FTSDataColumnI> searchalbeFields = ftsRestClient
             .getSearchableDataColumns();
     Assert.assertNotNull(searchalbeFields);
-    Assert.assertEquals(searchalbeFields.size(), 28);
+    Assert.assertEquals(searchalbeFields.size(), 30);
   }
 
   @Test(groups = { "Functional" })
@@ -115,7 +105,7 @@ public class FTSRestClientTest
     try
     {
       expectedPKColumn = ftsRestClient
-              .getDataColumnByNameOrCode("Entry Name");
+              .getDataColumnByNameOrCode("Uniprot Id");
       Assert.assertNotNull(ftsRestClient.getPrimaryKeyColumn());
       Assert.assertEquals(ftsRestClient.getPrimaryKeyColumn(),
               expectedPKColumn);
@@ -249,14 +239,14 @@ public class FTSRestClientTest
       uniqueSet.add(foundCol);
     }
     Assert.assertTrue(!uniqueSet.isEmpty());
-    Assert.assertEquals(uniqueSet.size(), 28);
+    Assert.assertEquals(uniqueSet.size(), 30);
   }
 
   @Test(groups = { "Functional" })
   public void coverageForMiscellaneousBranches()
   {
     String actual = ftsRestClient.getPrimaryKeyColumn().toString();
-    Assert.assertEquals(actual, "Entry Name");
+    Assert.assertEquals(actual, "Uniprot Id");
 
     String actualGroupStr;
     try
@@ -268,11 +258,11 @@ public class FTSRestClientTest
               "unavailable group").toString();
     } catch (Exception e)
     {
-      e.printStackTrace();
+      Assert.assertTrue(true);
     }
 
     String actualResourseFile = ftsRestClient
-            .getResourceFile("fts/uniprot_data_columns.conf");
+            .getResourceFile("/fts/uniprot_data_columns.txt");
     Assert.assertNotNull(actualResourseFile);
     Assert.assertTrue(actualResourseFile.length() > 31);
   }
@@ -285,7 +275,6 @@ public class FTSRestClientTest
       ftsRestClient.getDataColumnByNameOrCode("unavailable column");
     } catch (Exception e)
     {
-      e.printStackTrace();
       System.out.println(e.getMessage());
       String expectedMessage = "Couldn't find data column with name : unavailable column";
       Assert.assertEquals(e.getMessage(), expectedMessage);
@@ -295,7 +284,6 @@ public class FTSRestClientTest
       ftsRestClient.getDataColumnGroupById("unavailable column group Id");
     } catch (Exception e)
     {
-      e.printStackTrace();
       System.out.println(e.getMessage());
       String expectedMessage = "Couldn't find data column group with id : unavailable column group Id";
       Assert.assertEquals(e.getMessage(), expectedMessage);