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-3829 allow multiple URL mocks and include P01308 in 3d-beacons mocks
[jalview.git]
/
src
/
jalview
/
fts
/
service
/
threedbeacons
/
TDBeaconsFTSRestClient.java
diff --git
a/src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java
b/src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java
index
8263b22
..
08edcdf
100644
(file)
--- a/
src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java
+++ b/
src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java
@@
-99,7
+99,7
@@
public class TDBeaconsFTSRestClient extends FTSRestClient
String responseString = null;
// Check the response status and report exception if one occurs
String responseString = null;
// Check the response status and report exception if one occurs
- int responseStatus = isMocked() ? (mockQuery.equals(query) ? 200 : 404) : clientResponse.getStatus();
+ int responseStatus = isMocked() ? (mockQueries.containsKey(query) ? 200 : 404) : clientResponse.getStatus();
switch (responseStatus)
{
// if success
switch (responseStatus)
{
// if success
@@
-110,7
+110,7
@@
public class TDBeaconsFTSRestClient extends FTSRestClient
}
else
{
}
else
{
- responseString = isMocked() ? mockResponse: clientResponse.getEntity(String.class);
+ responseString = isMocked() ? mockQueries.get(query): clientResponse.getEntity(String.class);
}
break;
case 400:
}
break;
case 400: