X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Ffts%2Fcore%2FFTSRestClientTest.java;h=ddf60bcf25896a04e1be06c1282cc1136e38ed40;hb=7069dfb8eacf6405040429bb74ffc109706ddc49;hp=0dac04b98f9c284db5dc98e4885bb97c5222b3ff;hpb=b577ea70f354225426c5a5ecb8def7261e1cd3aa;p=jalview.git diff --git a/test/jalview/fts/core/FTSRestClientTest.java b/test/jalview/fts/core/FTSRestClientTest.java index 0dac04b..ddf60bc 100644 --- a/test/jalview/fts/core/FTSRestClientTest.java +++ b/test/jalview/fts/core/FTSRestClientTest.java @@ -76,7 +76,7 @@ public class FTSRestClientTest String actual = ftsRestClient .getDataColumnsFieldsAsCommaDelimitedString(wantedFields); Assert.assertEquals(actual, - "id,entry name,protein names,genes,organism,length,reviewed"); + "id,entry name,protein names,genes,organism,reviewed,length"); } @@ -151,7 +151,7 @@ public class FTSRestClientTest public void getDefaultResponsePageSize() { int defaultResSize = ftsRestClient.getDefaultResponsePageSize(); - Assert.assertEquals(defaultResSize, 100); + Assert.assertEquals(defaultResSize, 500); } @Test(groups = { "Functional" }) @@ -213,10 +213,12 @@ public class FTSRestClientTest FTSDataColumnI foundDataCol = ftsRestClient .getDataColumnByNameOrCode("Protein names"); Assert.assertNotNull(foundDataCol); - Assert.assertEquals(foundDataCol.getDataColumnClass(), String.class); + Assert.assertEquals(foundDataCol.getDataType().getDataTypeClass(), + String.class); foundDataCol = ftsRestClient.getDataColumnByNameOrCode("length"); Assert.assertNotNull(foundDataCol); - Assert.assertEquals(foundDataCol.getDataColumnClass(), Integer.class); + Assert.assertEquals(foundDataCol.getDataType().getDataTypeClass(), + Integer.class); // foundDataCol = ftsRestClient.getDataColumnByNameOrCode("length"); // Assert.assertNotNull(foundDataCol); // Assert.assertEquals(foundDataCol.getDataColumnClass(), Double.class);