Skip to content

Commit

Permalink
fix rebase problems
Browse files Browse the repository at this point in the history
  • Loading branch information
elek committed Aug 27, 2019
1 parent 9b7b962 commit 591346f
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
public class TestMultipartUploadWithCopy {

private final static ObjectEndpoint REST = new ObjectEndpoint();
;

private final static String BUCKET = "s3bucket";
private final static String KEY = "key2";
private final static String EXISTING_KEY = "key1";
Expand Down Expand Up @@ -137,7 +137,7 @@ public void testMultipart() throws Exception {
private String initiateMultipartUpload(String key) throws IOException,
OS3Exception {
setHeaders();
Response response = REST.multipartUpload(BUCKET, key, "", "", null);
Response response = REST.initializeMultipartUpload(BUCKET, key);
MultipartUploadInitiateResponse multipartUploadInitiateResponse =
(MultipartUploadInitiateResponse) response.getEntity();
assertNotNull(multipartUploadInitiateResponse.getUploadID());
Expand Down Expand Up @@ -193,7 +193,7 @@ private void completeMultipartUpload(String key,
CompleteMultipartUploadRequest completeMultipartUploadRequest,
String uploadID) throws IOException, OS3Exception {
setHeaders();
Response response = REST.multipartUpload(BUCKET, key, "", uploadID,
Response response = REST.completeMultipartUpload(BUCKET, key, uploadID,
completeMultipartUploadRequest);

assertEquals(response.getStatus(), 200);
Expand Down

0 comments on commit 591346f

Please sign in to comment.