public void getPrimaryKeyColumIndexTest()
{
Collection<FTSDataColumnI> wantedFields = ftsRestClient
- .getAllDefaulDisplayedDataColumns();
+ .getAllDefaultDisplayedFTSDataColumns();
int foundIndex = -1;
try
{
@Test(groups = { "Functional" })
public void getAllDefaulDisplayedDataColumns()
{
- Assert.assertNotNull(ftsRestClient.getAllDefaulDisplayedDataColumns());
- Assert.assertTrue(!ftsRestClient.getAllDefaulDisplayedDataColumns()
+ Assert.assertNotNull(ftsRestClient.getAllDefaultDisplayedFTSDataColumns());
+ Assert.assertTrue(!ftsRestClient.getAllDefaultDisplayedFTSDataColumns()
.isEmpty());
- Assert.assertEquals(ftsRestClient.getAllDefaulDisplayedDataColumns()
- .size(), 6);
+ Assert.assertEquals(ftsRestClient.getAllDefaultDisplayedFTSDataColumns()
+ .size(), 7);
}
@Test(groups = { "Functional" })
public void getDataColumnsFieldsAsCommaDelimitedString()
{
Collection<FTSDataColumnI> wantedFields = ftsRestClient
- .getAllDefaulDisplayedDataColumns();
+ .getAllDefaultDisplayedFTSDataColumns();
String actual = ftsRestClient
.getDataColumnsFieldsAsCommaDelimitedString(wantedFields);
Assert.assertEquals(actual,
- "entry name,protein names,genes,organism,created,last-modified");
+ "id,entry name,protein names,genes,organism,reviewed,length");
}
- @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()
Collection<FTSDataColumnI> allFields = ftsRestClient
.getAllFTSDataColumns();
Assert.assertNotNull(allFields);
- Assert.assertEquals(allFields.size(), 116);
+ Assert.assertEquals(allFields.size(), 117);
}
@Test(groups = { "Functional" })
Collection<FTSDataColumnI> searchalbeFields = ftsRestClient
.getSearchableDataColumns();
Assert.assertNotNull(searchalbeFields);
- Assert.assertEquals(searchalbeFields.size(), 28);
+ Assert.assertEquals(searchalbeFields.size(), 22);
}
@Test(groups = { "Functional" })
try
{
expectedPKColumn = ftsRestClient
- .getDataColumnByNameOrCode("Entry Name");
+ .getDataColumnByNameOrCode("Uniprot Id");
Assert.assertNotNull(ftsRestClient.getPrimaryKeyColumn());
Assert.assertEquals(ftsRestClient.getPrimaryKeyColumn(),
expectedPKColumn);
public void getDefaultResponsePageSize()
{
int defaultResSize = ftsRestClient.getDefaultResponsePageSize();
- Assert.assertEquals(defaultResSize, 100);
+ Assert.assertEquals(defaultResSize, 500);
}
@Test(groups = { "Functional" })
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);
.getSearchableDataColumns();
for (FTSDataColumnI foundCol : searchableCols)
{
+ System.out.println(foundCol.toString());
uniqueSet.add(foundCol);
uniqueSet.add(foundCol);
}
Assert.assertTrue(!uniqueSet.isEmpty());
- Assert.assertEquals(uniqueSet.size(), 28);
+ Assert.assertEquals(uniqueSet.size(), 22);
}
@Test(groups = { "Functional" })
public void coverageForMiscellaneousBranches()
{
String actual = ftsRestClient.getPrimaryKeyColumn().toString();
- Assert.assertEquals(actual, "Entry Name");
+ Assert.assertEquals(actual, "Uniprot Id");
String actualGroupStr;
try