Fix multipart upload pause #1536
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,156 @@ | ||
| /** | ||
| * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"). | ||
| * You may not use this file except in compliance with the License. | ||
| * A copy of the License is located at | ||
| * | ||
| * http://aws.amazon.com/apache2.0 | ||
| * | ||
| * or in the "license" file accompanying this file. This file is distributed | ||
| * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either | ||
| * express or implied. See the License for the specific language governing | ||
| * permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package com.amazonaws.mobileconnectors.s3.transferutility; | ||
|
|
||
| import android.content.Context; | ||
| import android.support.test.InstrumentationRegistry; | ||
|
|
||
| import com.amazonaws.services.s3.S3IntegrationTestBase; | ||
|
|
||
| import org.junit.AfterClass; | ||
| import org.junit.Before; | ||
| import org.junit.BeforeClass; | ||
| import org.junit.Test; | ||
|
|
||
| import java.io.File; | ||
| import java.util.Date; | ||
| import java.util.concurrent.CountDownLatch; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| public final class PauseTransferIntegrationTest extends S3IntegrationTestBase { | ||
|
|
||
| private static final String bucketName = "amazon-transfer-util-integ-test-" + new Date().getTime(); | ||
| private static TransferUtility util; | ||
| private static Context context = InstrumentationRegistry.getContext(); | ||
|
|
||
| private File file; | ||
| private CountDownLatch started; | ||
| private CountDownLatch paused; | ||
| private CountDownLatch resumed; | ||
| private CountDownLatch completed; | ||
|
|
||
| /** | ||
| * Creates and initializes all the test resources needed for these tests. | ||
| */ | ||
| @BeforeClass | ||
| public static void setUpBeforeClass() throws Exception { | ||
| setUp(); | ||
| TransferNetworkLossHandler.getInstance(context); | ||
| util = TransferUtility.builder() | ||
| .context(context) | ||
| .s3Client(s3) | ||
| .build(); | ||
|
|
||
| try { | ||
| s3.createBucket(bucketName); | ||
| waitForBucketCreation(bucketName); | ||
| } catch (final Exception e) { | ||
| System.out.println("Error in creating the bucket. " | ||
| + "Please manually create the bucket " + bucketName); | ||
| } | ||
| } | ||
|
|
||
| @AfterClass | ||
| public static void tearDown() { | ||
| try { | ||
| deleteBucketAndAllContents(bucketName); | ||
| } catch (final Exception e) { | ||
| System.out.println("Error in deleting the bucket. " | ||
| + "Please manually delete the bucket " + bucketName); | ||
| e.printStackTrace(); | ||
| } | ||
| } | ||
|
|
||
| @Before | ||
| public void setUpLatches() { | ||
| started = new CountDownLatch(1); | ||
| paused = new CountDownLatch(1); | ||
| resumed = new CountDownLatch(1); | ||
| completed = new CountDownLatch(1); | ||
| } | ||
|
|
||
| @Test | ||
| public void testSinglePartUploadPause() throws Exception { | ||
| // Small (1KB) file upload | ||
| file = getRandomTempFile("small", 1000L); | ||
| testUploadPause(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testMultiPartUploadPause() throws Exception { | ||
| // Large (10MB) file upload | ||
| file = getRandomSparseFile("large", 10L * 1024 * 1024); | ||
| testUploadPause(); | ||
| } | ||
|
|
||
| private void testUploadPause() throws Exception { | ||
| // start transfer and wait for progress | ||
| TransferObserver observer = util.upload(bucketName, file.getName(), file); | ||
| observer.setTransferListener(new TestListener()); | ||
| started.await(100, TimeUnit.MILLISECONDS); | ||
|
|
||
| // pause and wait | ||
| util.pause(observer.getId()); | ||
| paused.await(100, TimeUnit.MILLISECONDS); | ||
| Thread.sleep(1000); // throws if progress is made | ||
|
|
||
| // resume if pause was properly executed | ||
| util.resume(observer.getId()); | ||
| resumed.await(100, TimeUnit.MILLISECONDS); | ||
|
|
||
| // cancel early to avoid having to wait for completion | ||
| util.cancel(observer.getId()); | ||
| completed.await(100, TimeUnit.MILLISECONDS); | ||
| } | ||
|
|
||
| private final class TestListener implements TransferListener { | ||
| @Override | ||
| public void onStateChanged(int id, TransferState state) { | ||
| switch (state) { | ||
| case CANCELED: | ||
| case COMPLETED: | ||
| completed.countDown(); | ||
| break; | ||
| case PAUSED: | ||
| paused.countDown(); | ||
| break; | ||
| case IN_PROGRESS: | ||
| if (paused.getCount() == 0) { | ||
| // Post-pause | ||
| resumed.countDown(); | ||
| } else { | ||
| // Pre-pause | ||
| started.countDown(); | ||
| } | ||
| break; | ||
| case FAILED: | ||
| throw new RuntimeException("Failed transfer."); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void onProgressChanged(int id, long bytesCurrent, long bytesTotal) { | ||
| if (paused.getCount() == 0 && resumed.getCount() > 0) { | ||
| throw new RuntimeException("Progress made even while paused."); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void onError(int id, Exception ex) { | ||
| throw new RuntimeException(ex); | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we name it like
BUCKET_NAMEto be consistent with convention and rest of the codebase?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yea oops. A mistake that was copy + pasted from my previous mistake. will fix them