git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
24a98fb
..
0dac04b
100644
(file)
--- 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()
Assert.assertTrue(!ftsRestClient.getAllDefaulDisplayedDataColumns()
.isEmpty());
Assert.assertEquals(ftsRestClient.getAllDefaulDisplayedDataColumns()
- .size(), 6);
+ .size(), 7);
}
@Test(groups = { "Functional" })
}
@Test(groups = { "Functional" })
@@
-76,7
+76,7
@@
public class FTSRestClientTest
String actual = ftsRestClient
.getDataColumnsFieldsAsCommaDelimitedString(wantedFields);
Assert.assertEquals(actual,
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<FTSDataColumnI> allFields = ftsRestClient
.getAllFTSDataColumns();
Assert.assertNotNull(allFields);
Collection<FTSDataColumnI> allFields = ftsRestClient
.getAllFTSDataColumns();
Assert.assertNotNull(allFields);
- Assert.assertEquals(allFields.size(), 116);
+ Assert.assertEquals(allFields.size(), 117);
}
@Test(groups = { "Functional" })
}
@Test(groups = { "Functional" })
@@
-95,7
+95,7
@@
public class FTSRestClientTest
Collection<FTSDataColumnI> searchalbeFields = ftsRestClient
.getSearchableDataColumns();
Assert.assertNotNull(searchalbeFields);
Collection<FTSDataColumnI> searchalbeFields = ftsRestClient
.getSearchableDataColumns();
Assert.assertNotNull(searchalbeFields);
- Assert.assertEquals(searchalbeFields.size(), 28);
+ Assert.assertEquals(searchalbeFields.size(), 30);
}
@Test(groups = { "Functional" })
}
@Test(groups = { "Functional" })
@@
-105,7
+105,7
@@
public class FTSRestClientTest
try
{
expectedPKColumn = ftsRestClient
try
{
expectedPKColumn = ftsRestClient
- .getDataColumnByNameOrCode("Entry Name");
+ .getDataColumnByNameOrCode("Uniprot Id");
Assert.assertNotNull(ftsRestClient.getPrimaryKeyColumn());
Assert.assertEquals(ftsRestClient.getPrimaryKeyColumn(),
expectedPKColumn);
Assert.assertNotNull(ftsRestClient.getPrimaryKeyColumn());
Assert.assertEquals(ftsRestClient.getPrimaryKeyColumn(),
expectedPKColumn);
@@
-239,14
+239,14
@@
public class FTSRestClientTest
uniqueSet.add(foundCol);
}
Assert.assertTrue(!uniqueSet.isEmpty());
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();
}
@Test(groups = { "Functional" })
public void coverageForMiscellaneousBranches()
{
String actual = ftsRestClient.getPrimaryKeyColumn().toString();
- Assert.assertEquals(actual, "Entry Name");
+ Assert.assertEquals(actual, "Uniprot Id");
String actualGroupStr;
try
String actualGroupStr;
try