package jalview.fts.threedbeacons;
+import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertTrue;
import java.util.ArrayList;
import jalview.fts.core.FTSRestClient;
import jalview.fts.core.FTSRestRequest;
import jalview.fts.core.FTSRestResponse;
+import jalview.fts.service.pdb.PDBFTSRestClient;
import jalview.fts.service.threedbeacons.TDBeaconsFTSRestClient;
import jalview.gui.JvOptionPane;
@Test
public void getAllDefaulDisplayedDataColumns()
- {
+ {
+ // to change when resources.tdbeacons_data_columns.txt is changed
Assert.assertNotNull(ftsRestClient
.getAllDefaultDisplayedFTSDataColumns());
System.out.println(ftsRestClient.getAllDefaultDisplayedFTSDataColumns());
Assert.assertTrue(!ftsRestClient.getAllDefaultDisplayedFTSDataColumns()
.isEmpty());
Assert.assertEquals(ftsRestClient
- .getAllDefaultDisplayedFTSDataColumns().size(), 3);
- // currently 3, may change -> change this test and the nexts accordingly
+ .getAllDefaultDisplayedFTSDataColumns().size(), 8);
}
@Test(groups = { "Functional" })
Assert.assertEquals(foundIndex, -1);
foundIndex = ftsRestClient.getPrimaryKeyColumIndex(wantedFields,
false);
- Assert.assertEquals(foundIndex, 0);
+ Assert.assertEquals(foundIndex, 1);
foundIndex = ftsRestClient
.getPrimaryKeyColumIndex(wantedFields, true);
- Assert.assertEquals(foundIndex, 1);
+ Assert.assertEquals(foundIndex, 2);
} catch (Exception e)
{
e.printStackTrace();
@Test(groups = { "Functional" })
public void getDataColumnsFieldsAsCommaDelimitedString()
{
+ // to change when resources.tdbeacons_data_columns.txt is changed
Collection<FTSDataColumnI> wantedFields = ftsRestClient
.getAllDefaultDisplayedFTSDataColumns();
String actual = ftsRestClient
.getDataColumnsFieldsAsCommaDelimitedString(wantedFields);
Assert.assertEquals(actual,
- "id,uniprot_accession,entry name");
+ "aligned_sequence,model_identifier,provider,id,uniprot_accession,entry_name,model_url,qmean_avg_local_score");
}
@Test(groups = { "Functional" })
.getAllFTSDataColumns();
Assert.assertNotNull(allFields);
//System.out.println(allFields.size());
- Assert.assertEquals(allFields.size(), 3);
+ Assert.assertEquals(allFields.size(), 8);
}
@Test(groups = { "Functional" })
public void getSearchableDataColumns()
- {
+ {
+ // to change when resources.tdbeacons_data_columns.txt is changed
Collection<FTSDataColumnI> searchableFields = ftsRestClient
.getSearchableDataColumns();
Assert.assertNotNull(searchableFields);
//System.out.println(searchableFields.size());
- Assert.assertEquals(searchableFields.size(), 1); //only 1, as of first 3DB test
+ Assert.assertEquals(searchableFields.size(), 6); //only 1, as of first 3DB test
}
@Test(groups = { "Functional" })
public void getPrimaryKeyColumn()
- {
+ {
+ // to change when resources.tdbeacons_data_columns.txt is changed
FTSDataColumnI expectedPKColumn;
try
{
expectedPKColumn = ftsRestClient
- .getDataColumnByNameOrCode("Uniprot Id");
+ .getDataColumnByNameOrCode("Model id");
Assert.assertNotNull(ftsRestClient.getPrimaryKeyColumn());
Assert.assertEquals(ftsRestClient.getPrimaryKeyColumn(),
expectedPKColumn);
//Assert.assertEquals(uniqueSet.size(), 22); -> 1 or 2 currently for 3DB
}
+ @Test(groups = { "Functional" })
+ public void getTDBIdColumIndexTest()
+ {
+ List<FTSDataColumnI> wantedFields = new ArrayList<FTSDataColumnI>();
+ try
+ {
+ wantedFields.add(TDBeaconsFTSRestClient.getInstance()
+ .getDataColumnByNameOrCode("Model id"));
+ wantedFields.add(TDBeaconsFTSRestClient.getInstance()
+ .getDataColumnByNameOrCode("uniprot_accession"));
+ wantedFields.add(TDBeaconsFTSRestClient.getInstance()
+ .getDataColumnByNameOrCode("entry name"));
+ } catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ try
+ {
+ assertEquals(1, TDBeaconsFTSRestClient.getInstance()
+ .getPrimaryKeyColumIndex(wantedFields, true));
+// assertEquals(3, TDBeaconsFTSRestClient.getInstance()
+// .getPrimaryKeyColumIndex(wantedFields, true));
+ } catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
-
+
@Test(groups = { "External", "Network" })
public void executeRequestTest()
{
try
{
wantedFields.add(TDBeaconsFTSRestClient.getInstance()
- .getDataColumnByNameOrCode("model_category"));
+ .getDataColumnByNameOrCode("Model id"));
+ wantedFields.add(TDBeaconsFTSRestClient.getInstance()
+ .getDataColumnByNameOrCode("model_url"));
wantedFields.add(TDBeaconsFTSRestClient.getInstance()
.getDataColumnByNameOrCode("provider"));
wantedFields.add(TDBeaconsFTSRestClient.getInstance()
- .getDataColumnByNameOrCode("created"));
+ .getDataColumnByNameOrCode("qmean_avg_local_score"));
} catch (Exception e1)
{
e1.printStackTrace();
System.out.println("wantedFields >>" + wantedFields);
FTSRestRequest request = new FTSRestRequest();
- //request.setAllowEmptySeq(false);
- //request.setResponseSize(100);
- request.setSearchTerm("01308.json");
+ request.setResponseSize(100);
+ request.setFieldToSearchBy("P");
+ request.setSearchTerm("01318.json");
request.setWantedFields(wantedFields);
System.out.println("request : " + request.getFieldToSearchBy());
- System.out.println(request.toString());
+ //System.out.println(request.toString());
FTSRestResponse response;
try
Assert.fail("Couldn't execute webservice call!");
return;
}
- //assertTrue(response.getNumberOfItemsFound() > 99);
assertTrue(response.getSearchSummary() != null);
- assertTrue(response.getSearchSummary().size() > 99);
+ assertTrue(response.getNumberOfItemsFound() > 3); //4 atm
+ System.out.println("Search summary : \n" + response.getSearchSummary());
+ //System.out.println(response.getSearchSummary().size());
}
}