Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

expect tests: removing requirement that requests are unique (so orderedRequestsSendResponses can tee up different responses for the same request when testing functions)

This commit is contained in:
Adam Lowe 2012-07-17 15:30:03 +01:00
parent 01f121a654
commit 20d3d0d603
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/test/java/org/jclouds/rest/internal/BaseRestApiExpectTest.java
View File

@ -80,7 +80,6 @@ import com.google.common.annotations.Beta;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.base.Objects; import com.google.common.base.Objects;
import com.google.common.base.Throwables; import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableBiMap;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
@ -440,13 +439,14 @@ public abstract class BaseRestApiExpectTest<S> {
public S requestsSendResponses(final Map<HttpRequest, HttpResponse> requestToResponse, Module module, public S requestsSendResponses(final Map<HttpRequest, HttpResponse> requestToResponse, Module module,
Properties props) { Properties props) {
return createClient(new Function<HttpRequest, HttpResponse>() { return createClient(new Function<HttpRequest, HttpResponse>() {
ImmutableBiMap<HttpRequest, HttpResponse> bimap = ImmutableBiMap.copyOf(requestToResponse);
@Override @Override
public HttpResponse apply(HttpRequest input) { public HttpResponse apply(HttpRequest input) {
HttpRequest matchedRequest = null;
HttpResponse response = null; HttpResponse response = null;
for (HttpRequest request : requestToResponse.keySet()) { for (HttpRequest request : requestToResponse.keySet()) {
if (httpRequestsAreEqual(input, request)) { if (httpRequestsAreEqual(input, request)) {
matchedRequest = request;
response = requestToResponse.get(request); response = requestToResponse.get(request);
} }
} }
@ -467,7 +467,7 @@ public abstract class BaseRestApiExpectTest<S> {
} else if (compareHttpRequestAsType(input) == HttpRequestComparisonType.DEFAULT) { } else if (compareHttpRequestAsType(input) == HttpRequestComparisonType.DEFAULT) {
// in case hashCode/equals doesn't do a full content check // in case hashCode/equals doesn't do a full content check
assertEquals(renderRequest(input), renderRequest(bimap.inverse().get(response))); assertEquals(renderRequest(input), renderRequest(matchedRequest));
} }
return response; return response;