Do not leave open streams when loading test mock files
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/a600a122 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/a600a122 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/a600a122 Branch: refs/heads/master Commit: a600a1221d09e34b3f379acd75a6b7ba3ee32c7f Parents: 89787b4 Author: Ignasi Barrera <[email protected]> Authored: Wed Oct 26 15:57:28 2016 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Wed Oct 26 15:57:28 2016 +0200 ---------------------------------------------------------------------- .../internal/BaseGoogleCloudStorageExpectTest.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/a600a122/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/internal/BaseGoogleCloudStorageExpectTest.java ---------------------------------------------------------------------- diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/internal/BaseGoogleCloudStorageExpectTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/internal/BaseGoogleCloudStorageExpectTest.java index 4246512..dd3c644 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/internal/BaseGoogleCloudStorageExpectTest.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/internal/BaseGoogleCloudStorageExpectTest.java @@ -49,14 +49,16 @@ import org.jclouds.googlecloudstorage.GoogleCloudStorageProviderMetadata; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.jclouds.io.Payload; -import org.jclouds.io.payloads.ByteSourcePayload; +import org.jclouds.io.Payloads; import org.jclouds.oauth.v2.filters.JWTBearerTokenFlow; import org.jclouds.oauth.v2.filters.TestJWTBearerTokenFlow; import org.jclouds.providers.ProviderMetadata; import org.jclouds.rest.internal.BaseRestApiExpectTest; +import com.google.common.base.Charsets; import com.google.common.base.Joiner; import com.google.common.base.Supplier; +import com.google.common.base.Throwables; import com.google.common.io.ByteSource; import com.google.common.io.Resources; import com.google.inject.Binder; @@ -167,6 +169,10 @@ public class BaseGoogleCloudStorageExpectTest<T> extends BaseRestApiExpectTest<T } protected Payload staticPayloadFromResource(String resource) { - return new ByteSourcePayload(Resources.asByteSource(Resources.getResource(getClass(), resource))); + try { + return Payloads.newStringPayload(Resources.toString(Resources.getResource(getClass(), resource), Charsets.UTF_8)); + } catch (IOException ex) { + throw Throwables.propagate(ex); + } } }
