Updated Branches: refs/heads/1.6.x 8e16ecb3e -> 0143a56fb
Simplify testPutFileParallel Create only one temporary file and use explicit delete instead finalization to remove it. Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/e2489f39 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/e2489f39 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/e2489f39 Branch: refs/heads/1.6.x Commit: e2489f394278742ffbbde00160117d1107f8bb4b Parents: 8e16ecb Author: Andrew Gaul <[email protected]> Authored: Mon Aug 26 23:19:57 2013 -0700 Committer: Andrew Gaul <[email protected]> Committed: Mon Sep 2 19:36:15 2013 -0700 ---------------------------------------------------------------------- .../integration/internal/BaseBlobIntegrationTest.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/e2489f39/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java ---------------------------------------------------------------------- diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java index fceeb85..f404806 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java @@ -127,8 +127,7 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest { public void testPutFileParallel() throws InterruptedException, IOException, TimeoutException { File payloadFile = File.createTempFile("testPutFileParallel", "png"); - Files.copy(createTestInput(), payloadFile); - payloadFile.deleteOnExit(); + Files.write(createTestInput(), payloadFile); final Payload testPayload = Payloads.newFilePayload(payloadFile); final byte[] md5 = md5Supplier(testPayload); @@ -165,6 +164,7 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest { assert exceptions.size() == 0 : exceptions; } finally { + payloadFile.delete(); returnContainer(container); } } @@ -604,13 +604,10 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest { assertEquals(metadata.getContentMetadata().getContentMD5(), md5().hashString(TEST_STRING, UTF_8).asBytes()); } - private File createTestInput() throws IOException { - File file = File.createTempFile("testimg", "png"); - file.deleteOnExit(); + private byte[] createTestInput() throws IOException { Random random = new Random(); byte[] buffer = new byte[random.nextInt(2 * 1024 * 1024)]; random.nextBytes(buffer); - Files.copy(ByteStreams.newInputStreamSupplier(buffer), file); - return file; + return buffer; } }
