Factor out MPU test ByteSource offsets

pull/114/head
Andrew Gaul 2016-01-09 17:22:05 -08:00
rodzic cc516e7ede
commit 564463c0e0
1 zmienionych plików z 10 dodań i 9 usunięć

Wyświetl plik

@ -318,28 +318,29 @@ public final class S3AwsSdkTest {
client.initiateMultipartUpload(initRequest); client.initiateMultipartUpload(initRequest);
String uploadId = initResponse.getUploadId(); String uploadId = initResponse.getUploadId();
UploadPartRequest uploadRequest = new UploadPartRequest() ByteSource byteSource1 = byteSource.slice(0, partSize);
UploadPartRequest uploadRequest1 = new UploadPartRequest()
.withBucketName(containerName).withKey(key) .withBucketName(containerName).withKey(key)
.withUploadId(uploadId).withPartNumber(1) .withUploadId(uploadId).withPartNumber(1)
.withInputStream(byteSource.openStream()) .withInputStream(byteSource1.openStream())
.withPartSize(partSize); .withPartSize(byteSource1.size());
UploadPartResult uploadPartResult = client.uploadPart(uploadRequest); UploadPartResult uploadPartResult1 = client.uploadPart(uploadRequest1);
PartETag partETag = uploadPartResult.getPartETag(); PartETag partETag1 = uploadPartResult1.getPartETag();
ByteSource byteSource2 = byteSource.slice(partSize, size - partSize);
UploadPartRequest uploadRequest2 = new UploadPartRequest() UploadPartRequest uploadRequest2 = new UploadPartRequest()
.withBucketName(containerName).withKey(key) .withBucketName(containerName).withKey(key)
.withUploadId(uploadId).withPartNumber(2) .withUploadId(uploadId).withPartNumber(2)
.withInputStream(byteSource .withInputStream(byteSource2.openStream())
.slice(partSize, size - partSize).openStream()) .withPartSize(byteSource2.size());
.withPartSize(size - partSize);
UploadPartResult uploadPartResult2 = client.uploadPart(uploadRequest2); UploadPartResult uploadPartResult2 = client.uploadPart(uploadRequest2);
PartETag partETag2 = uploadPartResult2.getPartETag(); PartETag partETag2 = uploadPartResult2.getPartETag();
// must be mutable since AWK SDK sorts parts // must be mutable since AWK SDK sorts parts
List<PartETag> partETagList = new ArrayList<PartETag>(); List<PartETag> partETagList = new ArrayList<PartETag>();
partETagList.add(partETag); partETagList.add(partETag1);
partETagList.add(partETag2); partETagList.add(partETag2);
CompleteMultipartUploadRequest completeRequest = new CompleteMultipartUploadRequest completeRequest = new