From 52fc2c2be1f44481d997c8b004ffc913ef526d07 Mon Sep 17 00:00:00 2001
From: Adrian Cole <adrian@jclouds.org>
Date: Mon, 30 Jan 2012 23:30:48 -0800
Subject: [PATCH] make payloads repeatable

---
 .../org/jclouds/rest/BaseRestClientExpectTest.java    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/src/test/java/org/jclouds/rest/BaseRestClientExpectTest.java b/core/src/test/java/org/jclouds/rest/BaseRestClientExpectTest.java
index ee5ad65e2d..831fa29a6d 100644
--- a/core/src/test/java/org/jclouds/rest/BaseRestClientExpectTest.java
+++ b/core/src/test/java/org/jclouds/rest/BaseRestClientExpectTest.java
@@ -144,15 +144,16 @@ public abstract class BaseRestClientExpectTest<S> {
     * @return payload for use in http responses.
     */
    public Payload payloadFromResource(String resource) {
-      return Payloads.newInputStreamPayload(getClass().getResourceAsStream(resource));
+      try {
+         return payloadFromString(Strings2.toStringAndClose(getClass().getResourceAsStream(resource)));
+      } catch (IOException e) {
+         throw Throwables.propagate(e);
+      }
    }
 
    public Payload payloadFromResourceWithContentType(String resource, String contentType) {
       try {
-         Payload payload = Payloads.newStringPayload(Strings2
-                  .toStringAndClose(getClass().getResourceAsStream(resource)));
-         payload.getContentMetadata().setContentType(contentType);
-         return payload;
+         return payloadFromStringWithContentType(Strings2.toStringAndClose(getClass().getResourceAsStream(resource)), contentType);
       } catch (IOException e) {
          throw Throwables.propagate(e);
       }