refactored expect tests to throw a 'server error' when there's no state expectation configured

core/src/test/java/org/jclouds/rest/BaseRestClientExpectTest.java

@@ -23,14 +23,15 @@ import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import static org.jclouds.rest.RestContextFactory.contextSpec;
 import static org.jclouds.rest.RestContextFactory.createContext;
+import static org.testng.Assert.assertEquals;
 
 import java.io.IOException;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Properties;
+import java.util.Map.Entry;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -60,8 +61,8 @@ import org.testng.annotations.Test;
 
 import com.google.common.annotations.Beta;
 import com.google.common.base.Function;
-import com.google.common.base.Functions;
 import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableBiMap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -146,6 +147,18 @@ public abstract class BaseRestClientExpectTest<S> {
       return Payloads.newInputStreamPayload(getClass().getResourceAsStream(resource));
    }
 
+   public Payload payloadFromResourceWithContentType(String resource, String contentType) {
+      try {
+         Payload payload = Payloads.newStringPayload(Strings2
+                  .toStringAndClose(getClass().getResourceAsStream(resource)));
+         payload.getContentMetadata().setContentType(contentType);
+         return payload;
+      } catch (IOException e) {
+         throw Throwables.propagate(e);
+      }
+
+   }
+
    /**
     * Mock executor service which uses the supplied function to return http responses.
     */
@@ -266,11 +279,8 @@ public abstract class BaseRestClientExpectTest<S> {
 
    public S requestsSendResponses(HttpRequest requestA, HttpResponse responseA, HttpRequest requestB,
             HttpResponse responseB, HttpRequest requestC, HttpResponse responseC, Module module) {
-      return requestsSendResponses(ImmutableMap.of(requestA, responseA, requestB, responseB, requestC, responseC), module);
+      return requestsSendResponses(ImmutableMap.of(requestA, responseA, requestB, responseB, requestC, responseC),
-   }
+               module);
-
-   public S orderedRequestsSendResponses(HttpRequest requestA, HttpResponse responseA) {
-      return orderedRequestsSendResponses(ImmutableList.of(requestA), ImmutableList.of(responseA));
    }
 
    public S orderedRequestsSendResponses(HttpRequest requestA, HttpResponse responseA, HttpRequest requestB,
@@ -280,25 +290,29 @@ public abstract class BaseRestClientExpectTest<S> {
 
    public S orderedRequestsSendResponses(HttpRequest requestA, HttpResponse responseA, HttpRequest requestB,
             HttpResponse responseB, HttpRequest requestC, HttpResponse responseC) {
-      return orderedRequestsSendResponses(ImmutableList.of(requestA, requestB, requestC), ImmutableList.of(responseA, responseB, responseC));
+      return orderedRequestsSendResponses(ImmutableList.of(requestA, requestB, requestC), ImmutableList.of(responseA,
+               responseB, responseC));
    }
 
    public S orderedRequestsSendResponses(HttpRequest requestA, HttpResponse responseA, HttpRequest requestB,
-            HttpResponse responseB, HttpRequest requestC, HttpResponse responseC, HttpRequest requestD, HttpResponse responseD) {
+            HttpResponse responseB, HttpRequest requestC, HttpResponse responseC, HttpRequest requestD,
-      return orderedRequestsSendResponses(ImmutableList.of(requestA, requestB, requestC, requestD), ImmutableList.of(responseA, responseB, responseC, responseD));
+            HttpResponse responseD) {
+      return orderedRequestsSendResponses(ImmutableList.of(requestA, requestB, requestC, requestD), ImmutableList.of(
+               responseA, responseB, responseC, responseD));
    }
 
    public S orderedRequestsSendResponses(final List<HttpRequest> requests, final List<HttpResponse> responses) {
       final AtomicInteger counter = new AtomicInteger(0);
 
-      return createClient(new Function<HttpRequest,HttpResponse>() {
+      return createClient(new Function<HttpRequest, HttpResponse>() {
          @Override
          public HttpResponse apply(HttpRequest input) {
             int index = counter.getAndIncrement();
-            if (index >= requests.size()) {
+            if (index >= requests.size())
-               throw new IndexOutOfBoundsException("request index "+index+", but only "+requests.size()+" request/response pairs");
+               return HttpResponse.builder().statusCode(500).message(
-            }
+                        String.format("request %s is out of range (%s)", index, requests.size())).payload(
-            assert input.equals(requests.get(index)) : "expected="+requests.get(index)+"; actual="+input;
+                        Payloads.newStringPayload(renderRequest(input))).build();
+            assertEquals(renderRequest(input), renderRequest(requests.get(index)));
             return responses.get(index);
          }
       });
@@ -316,8 +330,21 @@ public abstract class BaseRestClientExpectTest<S> {
       return requestsSendResponses(requestToResponse, createModule());
    }
 
-   public S requestsSendResponses(Map<HttpRequest, HttpResponse> requestToResponse, Module module) {
+   public S requestsSendResponses(final Map<HttpRequest, HttpResponse> requestToResponse, Module module) {
-      return createClient(Functions.forMap(requestToResponse), module);
+      return createClient(new Function<HttpRequest, HttpResponse>() {
+         ImmutableBiMap<HttpRequest, HttpResponse> bimap = ImmutableBiMap.copyOf(requestToResponse);
+
+         @Override
+         public HttpResponse apply(HttpRequest input) {
+            if (!(requestToResponse.containsKey(input)))
+               return HttpResponse.builder().statusCode(500).message("no response configured for request").payload(
+                        Payloads.newStringPayload(renderRequest(input))).build();
+            HttpResponse response = requestToResponse.get(input);
+            // in case hashCode/equals doesn't do a full content check
+            assertEquals(renderRequest(input), renderRequest(bimap.inverse().get(response)));
+            return response;
+         }
+      }, module);
    }
 
    public String renderRequest(HttpRequest request) {

providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestClientExpectTest.java

@@ -46,8 +46,8 @@ public class VirtualGuestClientExpectTest extends BaseRestClientExpectTest<SoftL
                .endpoint(URI.create("https://api.softlayer.com/rest/v3/SoftLayer_Billing_Item/11/cancelService.json"))
                .headers(
                ImmutableMultimap.<String, String> builder()
-               .put("Authorization", "Basic aWRlbnRpdHk6Y3JlZGVudGlhbA==")
+               .put("Accept", "application/json")
-               .put("Accept", "application/json").build()).build();
+               .put("Authorization", "Basic aWRlbnRpdHk6Y3JlZGVudGlhbA==").build()).build();
 
       HttpResponse found = HttpResponse.builder().statusCode(200).build();