X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Ffts%2Fcore%2FFTSRestClientTest.java;fp=test%2Fjalview%2Ffts%2Fcore%2FFTSRestClientTest.java;h=0dac04b98f9c284db5dc98e4885bb97c5222b3ff;hb=a6626e6ecada2984ba9f11de957a14244d34be14;hp=24a98fb2ab0c8fb5ecf9bb3f825b124467efaa38;hpb=2fa90a51176bacbdc18661e99f3410a9b73da3fd;p=jalview.git diff --git a/test/jalview/fts/core/FTSRestClientTest.java b/test/jalview/fts/core/FTSRestClientTest.java index 24a98fb..0dac04b 100644 --- a/test/jalview/fts/core/FTSRestClientTest.java +++ b/test/jalview/fts/core/FTSRestClientTest.java @@ -65,7 +65,7 @@ public class FTSRestClientTest Assert.assertTrue(!ftsRestClient.getAllDefaulDisplayedDataColumns() .isEmpty()); Assert.assertEquals(ftsRestClient.getAllDefaulDisplayedDataColumns() - .size(), 6); + .size(), 7); } @Test(groups = { "Functional" }) @@ -76,7 +76,7 @@ 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"); } @@ -86,7 +86,7 @@ public class FTSRestClientTest Collection allFields = ftsRestClient .getAllFTSDataColumns(); Assert.assertNotNull(allFields); - Assert.assertEquals(allFields.size(), 116); + Assert.assertEquals(allFields.size(), 117); } @Test(groups = { "Functional" }) @@ -95,7 +95,7 @@ public class FTSRestClientTest Collection searchalbeFields = ftsRestClient .getSearchableDataColumns(); Assert.assertNotNull(searchalbeFields); - Assert.assertEquals(searchalbeFields.size(), 28); + Assert.assertEquals(searchalbeFields.size(), 30); } @Test(groups = { "Functional" }) @@ -105,7 +105,7 @@ public class FTSRestClientTest try { expectedPKColumn = ftsRestClient - .getDataColumnByNameOrCode("Entry Name"); + .getDataColumnByNameOrCode("Uniprot Id"); Assert.assertNotNull(ftsRestClient.getPrimaryKeyColumn()); Assert.assertEquals(ftsRestClient.getPrimaryKeyColumn(), expectedPKColumn); @@ -239,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