Repository: jclouds-labs Updated Branches: refs/heads/master dbadb279f -> 85b30385e
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/java/org/jclouds/b2/features/MultipartApiMockTest.java ---------------------------------------------------------------------- diff --git a/b2/src/test/java/org/jclouds/b2/features/MultipartApiMockTest.java b/b2/src/test/java/org/jclouds/b2/features/MultipartApiMockTest.java deleted file mode 100644 index 147167c..0000000 --- a/b2/src/test/java/org/jclouds/b2/features/MultipartApiMockTest.java +++ /dev/null @@ -1,246 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License 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 org.jclouds.b2.features; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.jclouds.b2.features.B2TestUtils.api; -import static org.jclouds.b2.features.B2TestUtils.assertAuthentication; -import static org.jclouds.b2.features.B2TestUtils.assertRequest; -import static org.jclouds.b2.features.B2TestUtils.createMockWebServer; -import static org.jclouds.b2.features.B2TestUtils.stringFromResource; - -import java.net.URI; -import java.util.Collection; -import java.util.Date; -import java.util.Map; - -import org.jclouds.io.Payload; -import org.jclouds.io.Payloads; -import org.jclouds.b2.domain.Action; -import org.jclouds.b2.domain.B2Object; -import org.jclouds.b2.domain.GetUploadPartResponse; -import org.jclouds.b2.domain.ListPartsResponse; -import org.jclouds.b2.domain.ListUnfinishedLargeFilesResponse; -import org.jclouds.b2.domain.MultipartUploadResponse; -import org.jclouds.b2.domain.UploadPartResponse; -import org.jclouds.utils.TestUtils; -import org.testng.annotations.Test; - -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.squareup.okhttp.mockwebserver.MockResponse; -import com.squareup.okhttp.mockwebserver.MockWebServer; - -@Test(groups = "unit", testName = "MultipartApiMockTest") -public final class MultipartApiMockTest { - private static final String ACCOUNT_ID = "YOUR_ACCOUNT_ID"; - private static final String AUTHORIZATION_TOKEN = "3_20160409004829_42b8f80ba60fb4323dcaad98_ec81302316fccc2260201cbf17813247f312cf3b_000_uplg"; - private static final String BUCKET_NAME = "BUCKET_NAME"; - private static final String BUCKET_ID = "e73ede9c9c8412db49f60715"; - private static final String CONTENT_TYPE = "b2/x-auto"; - private static final String FILE_ID = "4_za71f544e781e6891531b001a_f200ec353a2184825_d20160409_m004829_c000_v0001016_t0028"; - private static final Map<String, String> FILE_INFO = ImmutableMap.of("author", "unknown"); - private static final String FILE_NAME = "bigfile.dat"; - private static final String SHA1 = "062685a84ab248d2488f02f6b01b948de2514ad8"; - private static final Date UPLOAD_TIMESTAMP = new Date(1460162909000L); - - public void testStartLargeFile() throws Exception { - MockWebServer server = createMockWebServer(); - server.enqueue(new MockResponse().setBody(stringFromResource("/authorize_account_response.json"))); - server.enqueue(new MockResponse().setBody(stringFromResource("/start_large_file_response.json"))); - - try { - MultipartApi api = api(server.getUrl("/").toString(), "b2").getMultipartApi(); - MultipartUploadResponse response = api.startLargeFile(BUCKET_ID, FILE_NAME, CONTENT_TYPE, FILE_INFO); - assertThat(response.accountId()).isEqualTo(ACCOUNT_ID); - assertThat(response.bucketId()).isEqualTo(BUCKET_ID); - assertThat(response.contentType()).isEqualTo(CONTENT_TYPE); - assertThat(response.fileId()).isEqualTo(FILE_ID); - assertThat(response.fileInfo()).isEqualTo(FILE_INFO); - assertThat(response.fileName()).isEqualTo(FILE_NAME); - assertThat(response.uploadTimestamp()).isEqualTo(UPLOAD_TIMESTAMP); - - assertThat(server.getRequestCount()).isEqualTo(2); - assertAuthentication(server); - assertRequest(server.takeRequest(), "POST", "/b2api/v1/b2_start_large_file", "/start_large_file_request.json"); - } finally { - server.shutdown(); - } - } - - public void testCancelLargeFile() throws Exception { - MockWebServer server = createMockWebServer(); - server.enqueue(new MockResponse().setBody(stringFromResource("/authorize_account_response.json"))); - server.enqueue(new MockResponse().setBody(stringFromResource("/cancel_large_file_response.json"))); - - try { - MultipartApi api = api(server.getUrl("/").toString(), "b2").getMultipartApi(); - B2Object response = api.cancelLargeFile(FILE_ID); - assertThat(response.accountId()).isEqualTo(ACCOUNT_ID); - assertThat(response.bucketId()).isEqualTo(BUCKET_ID); - assertThat(response.fileId()).isEqualTo(FILE_ID); - assertThat(response.fileName()).isEqualTo(FILE_NAME); - - assertThat(server.getRequestCount()).isEqualTo(2); - assertAuthentication(server); - assertRequest(server.takeRequest(), "POST", "/b2api/v1/b2_cancel_large_file", "/cancel_large_file_request.json"); - } finally { - server.shutdown(); - } - } - - public void testFinishLargeFile() throws Exception { - MockWebServer server = createMockWebServer(); - server.enqueue(new MockResponse().setBody(stringFromResource("/authorize_account_response.json"))); - server.enqueue(new MockResponse().setBody(stringFromResource("/finish_large_file_response.json"))); - Collection<String> sha1 = ImmutableList.of( - "0000000000000000000000000000000000000000", - "ffffffffffffffffffffffffffffffffffffffff"); - - try { - MultipartApi api = api(server.getUrl("/").toString(), "b2").getMultipartApi(); - B2Object response = api.finishLargeFile(FILE_ID, sha1); - assertThat(response.accountId()).isEqualTo(ACCOUNT_ID); - assertThat(response.action()).isEqualTo(Action.UPLOAD); - assertThat(response.bucketId()).isEqualTo(BUCKET_ID); - assertThat(response.contentLength()).isEqualTo(208158542); - assertThat(response.contentSha1()).isEqualTo("none"); - assertThat(response.contentType()).isEqualTo(CONTENT_TYPE); - assertThat(response.fileId()).isEqualTo(FILE_ID); - assertThat(response.fileInfo()).isEqualTo(FILE_INFO); - assertThat(response.fileName()).isEqualTo(FILE_NAME); - assertThat(response.uploadTimestamp()).isEqualTo(UPLOAD_TIMESTAMP); - - assertThat(server.getRequestCount()).isEqualTo(2); - assertAuthentication(server); - assertRequest(server.takeRequest(), "POST", "/b2api/v1/b2_finish_large_file", "/finish_large_file_request.json"); - } finally { - server.shutdown(); - } - } - - public void testGetUploadPartUrl() throws Exception { - MockWebServer server = createMockWebServer(); - server.enqueue(new MockResponse().setBody(stringFromResource("/authorize_account_response.json"))); - server.enqueue(new MockResponse().setBody(stringFromResource("/get_upload_part_url_response.json"))); - - try { - MultipartApi api = api(server.getUrl("/").toString(), "b2").getMultipartApi(); - GetUploadPartResponse response = api.getUploadPartUrl(FILE_ID); - assertThat(response.authorizationToken()).isEqualTo(AUTHORIZATION_TOKEN); - assertThat(response.fileId()).isEqualTo(FILE_ID); - assertThat(response.uploadUrl()).isEqualTo(URI.create("https://pod-000-1016-09.backblaze.com/b2api/v1/b2_upload_part/4_ze73ede9c9c8412db49f60715_f100b4e93fbae6252_d20150824_m224353_c900_v8881000_t0001/0037";)); - - assertThat(server.getRequestCount()).isEqualTo(2); - assertAuthentication(server); - assertRequest(server.takeRequest(), "POST", "/b2api/v1/b2_get_upload_part_url", "/get_upload_part_url_request.json"); - } finally { - server.shutdown(); - } - } - - public void testUploadPart() throws Exception { - MockWebServer server = createMockWebServer(); - server.enqueue(new MockResponse().setBody(stringFromResource("/upload_part_response.json"))); - - try { - MultipartApi api = api(server.getUrl("/").toString(), "b2").getMultipartApi(); - GetUploadPartResponse uploadPart = GetUploadPartResponse.create(FILE_ID, server.getUrl("/b2api/v1/b2_upload_part/4a48fe8875c6214145260818/c001_v0001007_t0042").toURI(), AUTHORIZATION_TOKEN); - long contentLength = 100 * 1000 * 1000; - Payload payload = Payloads.newByteSourcePayload(TestUtils.randomByteSource().slice(0, contentLength)); - payload.getContentMetadata().setContentLength(contentLength); - UploadPartResponse response = api.uploadPart(uploadPart, 1, SHA1, payload); - assertThat(response.contentLength()).isEqualTo(contentLength); - assertThat(response.contentSha1()).isEqualTo(SHA1); - assertThat(response.fileId()).isEqualTo(FILE_ID); - assertThat(response.partNumber()).isEqualTo(1); - - assertThat(server.getRequestCount()).isEqualTo(1); - assertRequest(server.takeRequest(), "POST", "/b2api/v1/b2_upload_part/4a48fe8875c6214145260818/c001_v0001007_t0042"); - } finally { - server.shutdown(); - } - } - - public void testListParts() throws Exception { - MockWebServer server = createMockWebServer(); - server.enqueue(new MockResponse().setBody(stringFromResource("/authorize_account_response.json"))); - server.enqueue(new MockResponse().setBody(stringFromResource("/list_parts_response.json"))); - - try { - MultipartApi api = api(server.getUrl("/").toString(), "b2").getMultipartApi(); - ListPartsResponse response = api.listParts(FILE_ID, 1, 1000); - assertThat(response.nextPartNumber()).isNull(); - assertThat(response.parts()).hasSize(3); - - ListPartsResponse.Entry entry = response.parts().get(0); - assertThat(entry.contentLength()).isEqualTo(100000000); - assertThat(entry.contentSha1()).isEqualTo("062685a84ab248d2488f02f6b01b948de2514ad8"); - assertThat(entry.fileId()).isEqualTo("4_ze73ede9c9c8412db49f60715_f100b4e93fbae6252_d20150824_m224353_c900_v8881000_t0001"); - assertThat(entry.partNumber()).isEqualTo(1); - assertThat(entry.uploadTimestamp()).isEqualTo(new Date(1462212185000L)); - - entry = response.parts().get(1); - assertThat(entry.contentLength()).isEqualTo(100000000); - assertThat(entry.contentSha1()).isEqualTo("cf634751c3d9f6a15344f23cbf13f3fc9542addf"); - assertThat(entry.fileId()).isEqualTo("4_ze73ede9c9c8412db49f60715_f100b4e93fbae6252_d20150824_m224353_c900_v8881000_t0001"); - assertThat(entry.partNumber()).isEqualTo(2); - assertThat(entry.uploadTimestamp()).isEqualTo(new Date(1462212296000L)); - - entry = response.parts().get(2); - assertThat(entry.contentLength()).isEqualTo(8158554); - assertThat(entry.contentSha1()).isEqualTo("00ad164147cbbd60aedb2b04ff66b0f74f962753"); - assertThat(entry.fileId()).isEqualTo("4_ze73ede9c9c8412db49f60715_f100b4e93fbae6252_d20150824_m224353_c900_v8881000_t0001"); - assertThat(entry.partNumber()).isEqualTo(3); - assertThat(entry.uploadTimestamp()).isEqualTo(new Date(1462212327000L)); - - assertThat(server.getRequestCount()).isEqualTo(2); - assertAuthentication(server); - assertRequest(server.takeRequest(), "POST", "/b2api/v1/b2_list_parts", "/list_parts_request.json"); - } finally { - server.shutdown(); - } - } - - public void testListUnfinishedLargeFiles() throws Exception { - MockWebServer server = createMockWebServer(); - server.enqueue(new MockResponse().setBody(stringFromResource("/authorize_account_response.json"))); - server.enqueue(new MockResponse().setBody(stringFromResource("/list_unfinished_large_files_response.json"))); - - try { - MultipartApi api = api(server.getUrl("/").toString(), "b2").getMultipartApi(); - ListUnfinishedLargeFilesResponse response = api.listUnfinishedLargeFiles(BUCKET_ID, FILE_ID, 1000); - assertThat(response.nextFileId()).isNull(); - assertThat(response.files()).hasSize(1); - - ListUnfinishedLargeFilesResponse.Entry entry = response.files().get(0); - assertThat(entry.accountId()).isEqualTo(ACCOUNT_ID); - assertThat(entry.bucketId()).isEqualTo(BUCKET_ID); - assertThat(entry.contentType()).isEqualTo("application/octet-stream"); - assertThat(entry.fileId()).isEqualTo("4_ze73ede9c9c8412db49f60715_f100b4e93fbae6252_d20150824_m224353_c900_v8881000_t0001"); - assertThat(entry.fileInfo()).isEqualTo(FILE_INFO); - assertThat(entry.fileName()).isEqualTo(FILE_NAME); - assertThat(entry.uploadTimestamp()).isEqualTo(new Date(1462212184000L)); - - assertThat(server.getRequestCount()).isEqualTo(2); - assertAuthentication(server); - assertRequest(server.takeRequest(), "POST", "/b2api/v1/b2_list_unfinished_large_files", "/list_unfinished_large_files_request.json"); - } finally { - server.shutdown(); - } - } -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/java/org/jclouds/b2/features/ObjectApiLiveTest.java ---------------------------------------------------------------------- diff --git a/b2/src/test/java/org/jclouds/b2/features/ObjectApiLiveTest.java b/b2/src/test/java/org/jclouds/b2/features/ObjectApiLiveTest.java deleted file mode 100644 index 3de3cdb..0000000 --- a/b2/src/test/java/org/jclouds/b2/features/ObjectApiLiveTest.java +++ /dev/null @@ -1,284 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License 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 org.jclouds.b2.features; - -import static org.assertj.core.api.Assertions.assertThat; - -import java.io.IOException; -import java.io.InputStream; -import java.util.Map; -import java.util.Random; - -import org.jclouds.io.Payload; -import org.jclouds.io.Payloads; -import org.jclouds.b2.domain.Action; -import org.jclouds.b2.domain.B2Object; -import org.jclouds.b2.domain.B2ObjectList; -import org.jclouds.b2.domain.Bucket; -import org.jclouds.b2.domain.BucketType; -import org.jclouds.b2.domain.HideFileResponse; -import org.jclouds.b2.domain.UploadFileResponse; -import org.jclouds.b2.domain.UploadUrlResponse; -import org.jclouds.b2.internal.BaseB2ApiLiveTest; -import org.jclouds.util.Closeables2; -import org.jclouds.utils.TestUtils; -import org.testng.annotations.Test; - -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.hash.Hashing; -import com.google.common.io.ByteSource; - -public final class ObjectApiLiveTest extends BaseB2ApiLiveTest { - private static final Random random = new Random(); - - @Test(groups = "live") - public void testGetFileInfo() throws Exception { - BucketApi bucketApi = api.getBucketApi(); - ObjectApi objectApi = api.getObjectApi(); - - ByteSource byteSource = TestUtils.randomByteSource().slice(0, 1024); - Payload payload = Payloads.newByteSourcePayload(byteSource); - payload.getContentMetadata().setContentLength(byteSource.size()); - String fileName = "file-name"; - String contentSha1 = byteSource.hash(Hashing.sha1()).toString(); - String contentType = "text/plain"; - payload.getContentMetadata().setContentType(contentType); - Map<String, String> fileInfo = ImmutableMap.of("author", "unknown"); - - Bucket response = bucketApi.createBucket(getBucketName(), BucketType.ALL_PRIVATE); - UploadFileResponse uploadFile = null; - try { - UploadUrlResponse uploadUrl = objectApi.getUploadUrl(response.bucketId()); - - uploadFile = objectApi.uploadFile(uploadUrl, fileName, contentSha1, fileInfo, payload); - - B2Object b2Object = objectApi.getFileInfo(uploadFile.fileId()); - assertThat(b2Object.fileId()).isEqualTo(uploadFile.fileId()); - assertThat(b2Object.fileName()).isEqualTo(fileName); - assertThat(b2Object.accountId()).isEqualTo(response.accountId()); - assertThat(b2Object.bucketId()).isEqualTo(response.bucketId()); - assertThat(b2Object.contentLength()).isEqualTo(byteSource.size()); - assertThat(b2Object.contentSha1()).isEqualTo(contentSha1); - assertThat(b2Object.contentType()).isEqualTo(contentType); - assertThat(b2Object.fileInfo()).isEqualTo(fileInfo); - assertThat(b2Object.action()).isEqualTo(Action.UPLOAD); - assertThat(b2Object.uploadTimestamp()).isAfterYear(2015); - assertThat(b2Object.payload()).isNull(); - } finally { - if (uploadFile != null) { - objectApi.deleteFileVersion(uploadFile.fileName(), uploadFile.fileId()); - } - bucketApi.deleteBucket(response.bucketId()); - } - } - - @Test(groups = "live") - public void testDownloadFileById() throws Exception { - BucketApi bucketApi = api.getBucketApi(); - ObjectApi objectApi = api.getObjectApi(); - - ByteSource byteSource = TestUtils.randomByteSource().slice(0, 1024); - Payload payload = Payloads.newByteSourcePayload(byteSource); - payload.getContentMetadata().setContentLength(byteSource.size()); - String fileName = "file-name"; - String contentSha1 = byteSource.hash(Hashing.sha1()).toString(); - String contentType = "text/plain"; - payload.getContentMetadata().setContentType(contentType); - Map<String, String> fileInfo = ImmutableMap.of("author", "unknown"); - - Bucket response = bucketApi.createBucket(getBucketName(), BucketType.ALL_PRIVATE); - UploadFileResponse uploadFile = null; - try { - UploadUrlResponse uploadUrl = objectApi.getUploadUrl(response.bucketId()); - - uploadFile = objectApi.uploadFile(uploadUrl, fileName, contentSha1, fileInfo, payload); - - B2Object b2Object = objectApi.downloadFileById(uploadFile.fileId()); - payload = b2Object.payload(); - assertThat(b2Object.fileName()).isEqualTo(fileName); - assertThat(b2Object.contentSha1()).isEqualTo(contentSha1); - assertThat(b2Object.fileInfo()).isEqualTo(fileInfo); - assertThat(b2Object.uploadTimestamp()).isAfterYear(2015); - assertThat(payload.getContentMetadata().getContentType()).isEqualTo(contentType); - - InputStream actual = null; - InputStream expected = null; - try { - actual = payload.openStream(); - expected = byteSource.openStream(); - assertThat(actual).hasContentEqualTo(expected); - } finally { - Closeables2.closeQuietly(expected); - Closeables2.closeQuietly(actual); - } - } finally { - if (uploadFile != null) { - objectApi.deleteFileVersion(uploadFile.fileName(), uploadFile.fileId()); - } - bucketApi.deleteBucket(response.bucketId()); - } - } - - @Test(groups = "live") - public void testDownloadFileByName() throws Exception { - BucketApi bucketApi = api.getBucketApi(); - ObjectApi objectApi = api.getObjectApi(); - - String bucketName = getBucketName(); - ByteSource byteSource = TestUtils.randomByteSource().slice(0, 1024); - Payload payload = Payloads.newByteSourcePayload(byteSource); - payload.getContentMetadata().setContentLength(byteSource.size()); - String fileName = "file name"; // intentionally using spaces in file name - String contentSha1 = byteSource.hash(Hashing.sha1()).toString(); - String contentType = "text/plain"; - payload.getContentMetadata().setContentType(contentType); - Map<String, String> fileInfo = ImmutableMap.of("author", "unknown"); - - Bucket response = bucketApi.createBucket(bucketName, BucketType.ALL_PRIVATE); - UploadFileResponse uploadFile = null; - try { - UploadUrlResponse uploadUrl = objectApi.getUploadUrl(response.bucketId()); - - uploadFile = objectApi.uploadFile(uploadUrl, fileName, contentSha1, fileInfo, payload); - - B2Object b2Object = objectApi.downloadFileByName(bucketName, fileName); - payload = b2Object.payload(); - assertThat(b2Object.fileName()).isEqualTo(fileName); - assertThat(b2Object.contentSha1()).isEqualTo(contentSha1); - assertThat(b2Object.fileInfo()).isEqualTo(fileInfo); - assertThat(b2Object.uploadTimestamp()).isAfterYear(2015); - assertThat(payload.getContentMetadata().getContentType()).isEqualTo(contentType); - - InputStream actual = null; - InputStream expected = null; - try { - actual = payload.openStream(); - expected = byteSource.openStream(); - assertThat(actual).hasContentEqualTo(expected); - } finally { - Closeables2.closeQuietly(expected); - Closeables2.closeQuietly(actual); - } - } finally { - if (uploadFile != null) { - objectApi.deleteFileVersion(uploadFile.fileName(), uploadFile.fileId()); - } - bucketApi.deleteBucket(response.bucketId()); - } - } - - @Test(groups = "live") - public void testListFileNames() throws Exception { - BucketApi bucketApi = api.getBucketApi(); - ObjectApi objectApi = api.getObjectApi(); - - Bucket response = bucketApi.createBucket(getBucketName(), BucketType.ALL_PRIVATE); - int numFiles = 3; - ImmutableList.Builder<UploadFileResponse> uploadFiles = ImmutableList.builder(); - try { - for (int i = 0; i < numFiles; ++i) { - uploadFiles.add(createFile(objectApi, response.bucketId(), "file" + i)); - } - - B2ObjectList list = objectApi.listFileNames(response.bucketId(), null, null); - assertThat(list.files()).hasSize(numFiles); - } finally { - for (UploadFileResponse uploadFile : uploadFiles.build()) { - objectApi.deleteFileVersion(uploadFile.fileName(), uploadFile.fileId()); - } - bucketApi.deleteBucket(response.bucketId()); - } - } - - @Test(groups = "live") - public void testListFileVersions() throws Exception { - BucketApi bucketApi = api.getBucketApi(); - ObjectApi objectApi = api.getObjectApi(); - - Bucket response = bucketApi.createBucket(getBucketName(), BucketType.ALL_PRIVATE); - int numFiles = 3; - ImmutableList.Builder<UploadFileResponse> uploadFiles = ImmutableList.builder(); - try { - for (int i = 0; i < numFiles; ++i) { - uploadFiles.add(createFile(objectApi, response.bucketId(), "file")); - } - - B2ObjectList list = objectApi.listFileNames(response.bucketId(), null, null); - assertThat(list.files()).hasSize(1); - - list = objectApi.listFileVersions(response.bucketId(), null, null, null); - assertThat(list.files()).hasSize(numFiles); - } finally { - for (UploadFileResponse uploadFile : uploadFiles.build()) { - objectApi.deleteFileVersion(uploadFile.fileName(), uploadFile.fileId()); - } - bucketApi.deleteBucket(response.bucketId()); - } - } - - @Test(groups = "live") - public void testHideFile() throws Exception { - BucketApi bucketApi = api.getBucketApi(); - ObjectApi objectApi = api.getObjectApi(); - String fileName = "file-name"; - - Bucket response = bucketApi.createBucket(getBucketName(), BucketType.ALL_PRIVATE); - UploadFileResponse uploadFile = null; - HideFileResponse hideFile = null; - try { - uploadFile = createFile(objectApi, response.bucketId(), fileName); - - B2ObjectList list = objectApi.listFileNames(response.bucketId(), null, null); - assertThat(list.files()).hasSize(1); - - hideFile = objectApi.hideFile(response.bucketId(), fileName); - - list = objectApi.listFileNames(response.bucketId(), null, null); - assertThat(list.files()).isEmpty(); - - list = objectApi.listFileVersions(response.bucketId(), null, null, null); - assertThat(list.files()).hasSize(2); - } finally { - if (hideFile != null) { - objectApi.deleteFileVersion(hideFile.fileName(), hideFile.fileId()); - } - if (uploadFile != null) { - objectApi.deleteFileVersion(uploadFile.fileName(), uploadFile.fileId()); - } - bucketApi.deleteBucket(response.bucketId()); - } - } - - private static String getBucketName() { - return "jcloudstestbucket-" + random.nextInt(Integer.MAX_VALUE); - } - - private static UploadFileResponse createFile(ObjectApi objectApi, String bucketId, String fileName) throws IOException { - ByteSource byteSource = TestUtils.randomByteSource().slice(0, 1024); - Payload payload = Payloads.newByteSourcePayload(byteSource); - payload.getContentMetadata().setContentLength(byteSource.size()); - String contentSha1 = byteSource.hash(Hashing.sha1()).toString(); - String contentType = "text/plain"; - payload.getContentMetadata().setContentType(contentType); - Map<String, String> fileInfo = ImmutableMap.of("author", "unknown"); - - UploadUrlResponse uploadUrl = objectApi.getUploadUrl(bucketId); - - return objectApi.uploadFile(uploadUrl, fileName, contentSha1, fileInfo, payload); - } -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/java/org/jclouds/b2/features/ObjectApiMockTest.java ---------------------------------------------------------------------- diff --git a/b2/src/test/java/org/jclouds/b2/features/ObjectApiMockTest.java b/b2/src/test/java/org/jclouds/b2/features/ObjectApiMockTest.java deleted file mode 100644 index 8524210..0000000 --- a/b2/src/test/java/org/jclouds/b2/features/ObjectApiMockTest.java +++ /dev/null @@ -1,436 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License 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 org.jclouds.b2.features; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; -import static org.jclouds.b2.features.B2TestUtils.api; -import static org.jclouds.b2.features.B2TestUtils.assertAuthentication; -import static org.jclouds.b2.features.B2TestUtils.assertRequest; -import static org.jclouds.b2.features.B2TestUtils.createMockWebServer; -import static org.jclouds.b2.features.B2TestUtils.stringFromResource; - -import java.net.URI; -import java.util.Date; -import java.util.Map; - -import org.jclouds.blobstore.ContainerNotFoundException; -import org.jclouds.blobstore.KeyNotFoundException; -import org.jclouds.http.options.GetOptions; -import org.jclouds.io.Payload; -import org.jclouds.io.Payloads; -import org.jclouds.b2.domain.Action; -import org.jclouds.b2.domain.B2Object; -import org.jclouds.b2.domain.B2ObjectList; -import org.jclouds.b2.domain.DeleteFileResponse; -import org.jclouds.b2.domain.HideFileResponse; -import org.jclouds.b2.domain.UploadFileResponse; -import org.jclouds.b2.domain.UploadUrlResponse; -import org.jclouds.b2.reference.B2Headers; -import org.testng.annotations.Test; - -import com.google.common.collect.ImmutableMap; -import com.google.common.net.HttpHeaders; -import com.squareup.okhttp.mockwebserver.MockResponse; -import com.squareup.okhttp.mockwebserver.MockWebServer; -import com.squareup.okhttp.mockwebserver.RecordedRequest; - -@Test(groups = "unit", testName = "ObjectApiMockTest") -public final class ObjectApiMockTest { - private static final String BUCKET_NAME = "BUCKET_NAME"; - private static final String BUCKET_ID = "4a48fe8875c6214145260818"; - private static final String FILE_ID = "4_h4a48fe8875c6214145260818_f000000000000472a_d20140104_m032022_c001_v0000123_t0104"; - private static final String FILE_NAME = "typing_test.txt"; - private static final String CONTENT_TYPE = "text/plain"; - private static final String SHA1 = "bae5ed658ab3546aee12f23f36392f35dba1ebdd"; - private static final String PAYLOAD = "The quick brown fox jumped over the lazy dog.\n"; - private static final Map<String, String> FILE_INFO = ImmutableMap.of("author", "unknown"); - - public void testGetUploadUrl() throws Exception { - MockWebServer server = createMockWebServer(); - server.enqueue(new MockResponse().setBody(stringFromResource("/authorize_account_response.json"))); - server.enqueue(new MockResponse().setBody(stringFromResource("/get_upload_url_response.json"))); - - try { - ObjectApi api = api(server.getUrl("/").toString(), "b2").getObjectApi(); - UploadUrlResponse response = api.getUploadUrl(BUCKET_ID); - assertThat(response.bucketId()).isEqualTo(BUCKET_ID); - assertThat(response.uploadUrl()).isEqualTo(URI.create("https://pod-000-1005-03.backblaze.com/b2api/v1/b2_upload_file?cvt=c001_v0001005_t0027&bucket=4a48fe8875c6214145260818";)); - assertThat(response.authorizationToken()).isEqualTo("2_20151009170037_f504a0f39a0f4e657337e624_9754dde94359bd7b8f1445c8f4cc1a231a33f714_upld"); - - assertThat(server.getRequestCount()).isEqualTo(2); - assertAuthentication(server); - assertRequest(server.takeRequest(), "POST", "/b2api/v1/b2_get_upload_url", "/get_upload_url_request.json"); - } finally { - server.shutdown(); - } - } - - public void testGetUploadUrlDeletedBucket() throws Exception { - MockWebServer server = createMockWebServer(); - server.enqueue(new MockResponse().setBody(stringFromResource("/authorize_account_response.json"))); - server.enqueue(new MockResponse().setResponseCode(400).setBody(stringFromResource("/get_upload_url_deleted_bucket_response.json"))); - - try { - ObjectApi api = api(server.getUrl("/").toString(), "b2").getObjectApi(); - try { - api.getUploadUrl(BUCKET_ID); - failBecauseExceptionWasNotThrown(ContainerNotFoundException.class); - } catch (ContainerNotFoundException cnfe) { - // expected - } - - assertThat(server.getRequestCount()).isEqualTo(2); - assertAuthentication(server); - assertRequest(server.takeRequest(), "POST", "/b2api/v1/b2_get_upload_url", "/get_upload_url_request.json"); - } finally { - server.shutdown(); - } - } - - public void testUploadFile() throws Exception { - MockWebServer server = createMockWebServer(); - server.enqueue(new MockResponse().setBody(stringFromResource("/upload_file_response.json"))); - - try { - ObjectApi api = api(server.getUrl("/").toString(), "b2").getObjectApi(); - String accountId = "d522aa47a10f"; - - UploadUrlResponse uploadUrl = UploadUrlResponse.create(BUCKET_ID, server.getUrl("/b2api/v1/b2_upload_file/4a48fe8875c6214145260818/c001_v0001007_t0042").toURI(), "FAKE-AUTHORIZATION-TOKEN"); - Payload payload = Payloads.newStringPayload(PAYLOAD); - payload.getContentMetadata().setContentType(CONTENT_TYPE); - UploadFileResponse response = api.uploadFile(uploadUrl, FILE_NAME, SHA1, FILE_INFO, payload); - - assertThat(response.fileId()).isEqualTo(FILE_ID); - assertThat(response.fileName()).isEqualTo(FILE_NAME); - assertThat(response.accountId()).isEqualTo(accountId); - assertThat(response.bucketId()).isEqualTo(BUCKET_ID); - assertThat(response.contentLength()).isEqualTo(PAYLOAD.length()); - assertThat(response.contentSha1()).isEqualTo(SHA1); - assertThat(response.contentType()).isEqualTo(CONTENT_TYPE); - assertThat(response.fileInfo()).isEqualTo(FILE_INFO); - - assertThat(server.getRequestCount()).isEqualTo(1); - assertRequest(server.takeRequest(), "POST", "/b2api/v1/b2_upload_file/4a48fe8875c6214145260818/c001_v0001007_t0042"); - } finally { - server.shutdown(); - } - } - - public void testDeleteFileVersion() throws Exception { - MockWebServer server = createMockWebServer(); - server.enqueue(new MockResponse().setBody(stringFromResource("/authorize_account_response.json"))); - server.enqueue(new MockResponse().setBody(stringFromResource("/delete_object_response.json"))); - - try { - ObjectApi api = api(server.getUrl("/").toString(), "b2").getObjectApi(); - DeleteFileResponse response = api.deleteFileVersion(FILE_NAME, FILE_ID); - assertThat(response.fileName()).isEqualTo(FILE_NAME); - assertThat(response.fileId()).isEqualTo(FILE_ID); - - assertThat(server.getRequestCount()).isEqualTo(2); - assertAuthentication(server); - assertRequest(server.takeRequest(), "POST", "/b2api/v1/b2_delete_file_version", "/delete_object_request.json"); - } finally { - server.shutdown(); - } - } - - public void testDeleteAlreadyDeletedFileVersion() throws Exception { - MockWebServer server = createMockWebServer(); - server.enqueue(new MockResponse().setBody(stringFromResource("/authorize_account_response.json"))); - server.enqueue(new MockResponse().setResponseCode(400).setBody(stringFromResource("/delete_file_version_already_deleted_response.json"))); - - try { - ObjectApi api = api(server.getUrl("/").toString(), "b2").getObjectApi(); - try { - api.deleteFileVersion(FILE_NAME, FILE_ID); - failBecauseExceptionWasNotThrown(KeyNotFoundException.class); - } catch (KeyNotFoundException knfe) { - // expected - } - - assertThat(server.getRequestCount()).isEqualTo(2); - assertAuthentication(server); - assertRequest(server.takeRequest(), "POST", "/b2api/v1/b2_delete_file_version", "/delete_object_request.json"); - } finally { - server.shutdown(); - } - } - - public void testGetFileInfo() throws Exception { - MockWebServer server = createMockWebServer(); - server.enqueue(new MockResponse().setBody(stringFromResource("/authorize_account_response.json"))); - server.enqueue(new MockResponse().setBody(stringFromResource("/get_file_info_response.json"))); - - try { - ObjectApi api = api(server.getUrl("/").toString(), "b2").getObjectApi(); - B2Object b2Object = api.getFileInfo("4_ze73ede9c9c8412db49f60715_f100b4e93fbae6252_d20150824_m224353_c900_v8881000_t0001"); - assertThat(b2Object.fileId()).isEqualTo("4_ze73ede9c9c8412db49f60715_f100b4e93fbae6252_d20150824_m224353_c900_v8881000_t0001"); - assertThat(b2Object.fileName()).isEqualTo("akitty.jpg"); - assertThat(b2Object.accountId()).isEqualTo("7eecc42b9675"); - assertThat(b2Object.bucketId()).isEqualTo("e73ede9c9c8412db49f60715"); - assertThat(b2Object.contentLength()).isEqualTo(122573); - assertThat(b2Object.contentSha1()).isEqualTo("a01a21253a07fb08a354acd30f3a6f32abb76821"); - assertThat(b2Object.contentType()).isEqualTo("image/jpeg"); - assertThat(b2Object.fileInfo()).isEqualTo(ImmutableMap.<String, String>of()); - assertThat(b2Object.action()).isEqualTo(Action.UPLOAD); - assertThat(b2Object.uploadTimestamp()).isAfterYear(2014); - assertThat(b2Object.payload()).isNull(); - - assertThat(server.getRequestCount()).isEqualTo(2); - assertAuthentication(server); - assertRequest(server.takeRequest(), "POST", "/b2api/v1/b2_get_file_info", "/get_file_info_request.json"); - } finally { - server.shutdown(); - } - } - - public void testGetFileInfoDeletedFileVersion() throws Exception { - MockWebServer server = createMockWebServer(); - server.enqueue(new MockResponse().setBody(stringFromResource("/authorize_account_response.json"))); - server.enqueue(new MockResponse().setResponseCode(404).setBody(stringFromResource("/get_file_info_deleted_file_response.json"))); - - try { - ObjectApi api = api(server.getUrl("/").toString(), "b2").getObjectApi(); - B2Object b2Object = api.getFileInfo("4_ze73ede9c9c8412db49f60715_f100b4e93fbae6252_d20150824_m224353_c900_v8881000_t0001"); - assertThat(b2Object).isNull(); - - assertThat(server.getRequestCount()).isEqualTo(2); - assertAuthentication(server); - assertRequest(server.takeRequest(), "POST", "/b2api/v1/b2_get_file_info", "/get_file_info_request.json"); - } finally { - server.shutdown(); - } - } - - public void testDownloadFileById() throws Exception { - MockWebServer server = createMockWebServer(); - server.enqueue(new MockResponse().setBody(stringFromResource("/authorize_account_response.json"))); - - server.enqueue(new MockResponse() - .addHeader(HttpHeaders.CONTENT_TYPE, CONTENT_TYPE) - .addHeader(B2Headers.FILE_ID, FILE_ID) - .addHeader(B2Headers.FILE_NAME, FILE_NAME) - .addHeader(B2Headers.CONTENT_SHA1, SHA1) - .addHeader(B2Headers.UPLOAD_TIMESTAMP, String.valueOf(1500000000000L)) - .addHeader(B2Headers.FILE_INFO_PREFIX + FILE_INFO.entrySet().iterator().next().getKey(), FILE_INFO.entrySet().iterator().next().getValue()) - .setBody(PAYLOAD)); - - try { - ObjectApi api = api(server.getUrl("/").toString(), "b2").getObjectApi(); - - B2Object b2Object = api.downloadFileById(FILE_ID); - - assertThat(b2Object.fileId()).isEqualTo(FILE_ID); - assertThat(b2Object.fileName()).isEqualTo(FILE_NAME); - assertThat(b2Object.contentSha1()).isEqualTo(SHA1); - assertThat(b2Object.fileInfo()).isEqualTo(FILE_INFO); - assertThat(b2Object.uploadTimestamp()).isAfterYear(2015); - assertThat(b2Object.payload().getContentMetadata().getContentLength()).isEqualTo(PAYLOAD.length()); - assertThat(b2Object.payload().getContentMetadata().getContentType()).isEqualTo(CONTENT_TYPE); - - assertThat(server.getRequestCount()).isEqualTo(2); - - RecordedRequest request = server.takeRequest(); - assertThat(request.getMethod()).isEqualTo("GET"); - assertThat(request.getPath()).isEqualTo("/b2api/v1/b2_authorize_account"); - - request = server.takeRequest(); - assertThat(request.getMethod()).isEqualTo("GET"); - assertThat(request.getPath()).isEqualTo("/b2api/v1/b2_download_file_by_id?fileId=4_h4a48fe8875c6214145260818_f000000000000472a_d20140104_m032022_c001_v0000123_t0104"); - } finally { - server.shutdown(); - } - } - - public void testDownloadFileByIdOptions() throws Exception { - MockWebServer server = createMockWebServer(); - server.enqueue(new MockResponse().setBody(stringFromResource("/authorize_account_response.json"))); - - server.enqueue(new MockResponse() - .addHeader(HttpHeaders.CONTENT_TYPE, CONTENT_TYPE) - .addHeader(B2Headers.FILE_ID, FILE_ID) - .addHeader(B2Headers.FILE_NAME, FILE_NAME) - .addHeader(B2Headers.CONTENT_SHA1, SHA1) - .addHeader(B2Headers.UPLOAD_TIMESTAMP, String.valueOf(1500000000000L)) - .addHeader(B2Headers.FILE_INFO_PREFIX + FILE_INFO.entrySet().iterator().next().getKey(), FILE_INFO.entrySet().iterator().next().getValue()) - .setBody(PAYLOAD)); - - try { - ObjectApi api = api(server.getUrl("/").toString(), "b2").getObjectApi(); - - B2Object b2Object = api.downloadFileById(FILE_ID, new GetOptions().range(42, 69)); - - assertThat(server.getRequestCount()).isEqualTo(2); - - RecordedRequest request = server.takeRequest(); - assertThat(request.getMethod()).isEqualTo("GET"); - assertThat(request.getPath()).isEqualTo("/b2api/v1/b2_authorize_account"); - - request = server.takeRequest(); - assertThat(request.getMethod()).isEqualTo("GET"); - assertThat(request.getPath()).isEqualTo("/b2api/v1/b2_download_file_by_id?fileId=4_h4a48fe8875c6214145260818_f000000000000472a_d20140104_m032022_c001_v0000123_t0104"); - assertThat(request.getHeaders()).contains("Range: bytes=42-69"); - } finally { - server.shutdown(); - } - } - - public void testDownloadFileByName() throws Exception { - MockWebServer server = createMockWebServer(); - server.enqueue(new MockResponse().setBody(stringFromResource("/authorize_account_response.json"))); - - server.enqueue(new MockResponse() - .addHeader(HttpHeaders.CONTENT_TYPE, CONTENT_TYPE) - .addHeader(B2Headers.FILE_ID, FILE_ID) - .addHeader(B2Headers.FILE_NAME, FILE_NAME) - .addHeader(B2Headers.CONTENT_SHA1, SHA1) - .addHeader(B2Headers.UPLOAD_TIMESTAMP, String.valueOf(1500000000000L)) - .addHeader(B2Headers.FILE_INFO_PREFIX + FILE_INFO.entrySet().iterator().next().getKey(), FILE_INFO.entrySet().iterator().next().getValue()) - .setBody(PAYLOAD)); - - try { - ObjectApi api = api(server.getUrl("/").toString(), "b2").getObjectApi(); - - B2Object b2Object = api.downloadFileByName(BUCKET_NAME, FILE_NAME); - - assertThat(b2Object.fileId()).isEqualTo(FILE_ID); - assertThat(b2Object.fileName()).isEqualTo(FILE_NAME); - assertThat(b2Object.contentSha1()).isEqualTo(SHA1); - assertThat(b2Object.fileInfo()).isEqualTo(FILE_INFO); - assertThat(b2Object.uploadTimestamp()).isAfterYear(2015); - assertThat(b2Object.payload().getContentMetadata().getContentLength()).isEqualTo(PAYLOAD.length()); - assertThat(b2Object.payload().getContentMetadata().getContentType()).isEqualTo(CONTENT_TYPE); - - assertThat(server.getRequestCount()).isEqualTo(2); - - RecordedRequest request = server.takeRequest(); - assertThat(request.getMethod()).isEqualTo("GET"); - assertThat(request.getPath()).isEqualTo("/b2api/v1/b2_authorize_account"); - - request = server.takeRequest(); - assertThat(request.getMethod()).isEqualTo("GET"); - assertThat(request.getPath()).isEqualTo("/file/BUCKET_NAME/typing_test.txt"); - } finally { - server.shutdown(); - } - } - - public void testListFileNames() throws Exception { - MockWebServer server = createMockWebServer(); - server.enqueue(new MockResponse().setBody(stringFromResource("/authorize_account_response.json"))); - server.enqueue(new MockResponse().setBody(stringFromResource("/list_file_names_response.json"))); - - try { - ObjectApi api = api(server.getUrl("/").toString(), "b2").getObjectApi(); - String accountId = "d522aa47a10f"; - - B2ObjectList list = api.listFileNames(BUCKET_ID, null, null); - - assertThat(list.nextFileName()).isNull(); - assertThat(list.files()).hasSize(2); - - B2ObjectList.Entry object = list.files().get(0); - assertThat(object.action()).isEqualTo(Action.UPLOAD); - assertThat(object.fileId()).isEqualTo("4_z27c88f1d182b150646ff0b16_f1004ba650fe24e6b_d20150809_m012853_c100_v0009990_t0000"); - assertThat(object.fileName()).isEqualTo("files/hello.txt"); - assertThat(object.size()).isEqualTo(6); - assertThat(object.uploadTimestamp()).isEqualTo(new Date(1439083733000L)); - - object = list.files().get(1); - assertThat(object.action()).isEqualTo(Action.UPLOAD); - assertThat(object.fileId()).isEqualTo("4_z27c88f1d182b150646ff0b16_f1004ba650fe24e6c_d20150809_m012854_c100_v0009990_t0000"); - assertThat(object.fileName()).isEqualTo("files/world.txt"); - assertThat(object.size()).isEqualTo(6); - assertThat(object.uploadTimestamp()).isEqualTo(new Date(1439083734000L)); - - assertThat(server.getRequestCount()).isEqualTo(2); - assertAuthentication(server); - assertRequest(server.takeRequest(), "POST", "/b2api/v1/b2_list_file_names", "/list_file_names_request.json"); - } finally { - server.shutdown(); - } - } - - public void testListFileVersions() throws Exception { - MockWebServer server = createMockWebServer(); - server.enqueue(new MockResponse().setBody(stringFromResource("/authorize_account_response.json"))); - server.enqueue(new MockResponse().setBody(stringFromResource("/list_file_versions_response.json"))); - - try { - ObjectApi api = api(server.getUrl("/").toString(), "b2").getObjectApi(); - String accountId = "d522aa47a10f"; - - B2ObjectList list = api.listFileVersions(BUCKET_ID, null, null, null); - - assertThat(list.nextFileId()).isEqualTo("4_z27c88f1d182b150646ff0b16_f100920ddab886247_d20150809_m232316_c100_v0009990_t0003"); - assertThat(list.nextFileName()).isEqualTo("files/world.txt"); - assertThat(list.files()).hasSize(3); - - B2ObjectList.Entry object = list.files().get(0); - assertThat(object.action()).isEqualTo(Action.UPLOAD); - assertThat(object.fileId()).isEqualTo("4_z27c88f1d182b150646ff0b16_f100920ddab886245_d20150809_m232316_c100_v0009990_t0003"); - assertThat(object.fileName()).isEqualTo("files/hello.txt"); - assertThat(object.size()).isEqualTo(6); - assertThat(object.uploadTimestamp()).isEqualTo(new Date(1439162596000L)); - - object = list.files().get(1); - assertThat(object.action()).isEqualTo(Action.HIDE); - assertThat(object.fileId()).isEqualTo("4_z27c88f1d182b150646ff0b16_f100920ddab886247_d20150809_m232323_c100_v0009990_t0005"); - assertThat(object.fileName()).isEqualTo("files/world.txt"); - assertThat(object.size()).isEqualTo(0); - assertThat(object.uploadTimestamp()).isEqualTo(new Date(1439162603000L)); - - object = list.files().get(2); - assertThat(object.action()).isEqualTo(Action.UPLOAD); - assertThat(object.fileId()).isEqualTo("4_z27c88f1d182b150646ff0b16_f100920ddab886246_d20150809_m232316_c100_v0009990_t0003"); - assertThat(object.fileName()).isEqualTo("files/world.txt"); - assertThat(object.size()).isEqualTo(6); - assertThat(object.uploadTimestamp()).isEqualTo(new Date(1439162596000L)); - - assertThat(server.getRequestCount()).isEqualTo(2); - assertAuthentication(server); - assertRequest(server.takeRequest(), "POST", "/b2api/v1/b2_list_file_versions", "/list_file_versions_request.json"); - } finally { - server.shutdown(); - } - } - - public void testHideFile() throws Exception { - MockWebServer server = createMockWebServer(); - server.enqueue(new MockResponse().setBody(stringFromResource("/authorize_account_response.json"))); - server.enqueue(new MockResponse().setBody(stringFromResource("/hide_file_response.json"))); - - try { - ObjectApi api = api(server.getUrl("/").toString(), "b2").getObjectApi(); - String accountId = "d522aa47a10f"; - - HideFileResponse response = api.hideFile(BUCKET_ID, FILE_NAME); - assertThat(response.action()).isEqualTo(Action.HIDE); - assertThat(response.fileId()).isEqualTo("4_h4a48fe8875c6214145260818_f000000000000472a_d20140104_m032022_c001_v0000123_t0104"); - assertThat(response.fileName()).isEqualTo(FILE_NAME); - assertThat(response.uploadTimestamp()).isEqualTo(new Date(1437815673000L)); - - assertThat(server.getRequestCount()).isEqualTo(2); - assertAuthentication(server); - assertRequest(server.takeRequest(), "POST", "/b2api/v1/b2_hide_file", "/hide_file_request.json"); - } finally { - server.shutdown(); - } - } -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/java/org/jclouds/b2/internal/BaseB2ApiLiveTest.java ---------------------------------------------------------------------- diff --git a/b2/src/test/java/org/jclouds/b2/internal/BaseB2ApiLiveTest.java b/b2/src/test/java/org/jclouds/b2/internal/BaseB2ApiLiveTest.java deleted file mode 100644 index 0b8ace0..0000000 --- a/b2/src/test/java/org/jclouds/b2/internal/BaseB2ApiLiveTest.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License 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 org.jclouds.b2.internal; - -import org.jclouds.apis.ApiMetadata; -import org.jclouds.apis.BaseApiLiveTest; -import org.jclouds.b2.B2Api; -import org.jclouds.b2.B2ApiMetadata; - -public class BaseB2ApiLiveTest extends BaseApiLiveTest<B2Api> { - protected BaseB2ApiLiveTest() { - provider = "b2"; - } - - @Override - protected ApiMetadata createApiMetadata() { - return new B2ApiMetadata(); - } -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/authorize_account_response.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/authorize_account_response.json b/b2/src/test/resources/authorize_account_response.json deleted file mode 100644 index ba02ea7..0000000 --- a/b2/src/test/resources/authorize_account_response.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "accountId": "YOUR_ACCOUNT_ID", - "apiUrl": "http://localhost";, - "authorizationToken": "2_20150807002553_443e98bf57f978fa58c284f8_24d25d99772e3ba927778b39c9b0198f412d2163_acct", - "downloadUrl": "http://localhost";, - "minimumPartSize": 100000000 -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/bucket.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/bucket.json b/b2/src/test/resources/bucket.json deleted file mode 100644 index 50b2bde..0000000 --- a/b2/src/test/resources/bucket.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "bucketId" : "4a48fe8875c6214145260818", - "accountId" : "010203040506", - "bucketName" : "any_name_you_pick", - "bucketType" : "allPrivate" -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/cancel_large_file_request.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/cancel_large_file_request.json b/b2/src/test/resources/cancel_large_file_request.json deleted file mode 100644 index 7dd68bd..0000000 --- a/b2/src/test/resources/cancel_large_file_request.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "fileId": "4_za71f544e781e6891531b001a_f200ec353a2184825_d20160409_m004829_c000_v0001016_t0028" -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/cancel_large_file_response.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/cancel_large_file_response.json b/b2/src/test/resources/cancel_large_file_response.json deleted file mode 100644 index 84c6c0e..0000000 --- a/b2/src/test/resources/cancel_large_file_response.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "accountId": "YOUR_ACCOUNT_ID", - "bucketId": "e73ede9c9c8412db49f60715", - "fileId": "4_za71f544e781e6891531b001a_f200ec353a2184825_d20160409_m004829_c000_v0001016_t0028", - "fileName": "bigfile.dat" -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/create_bucket_request.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/create_bucket_request.json b/b2/src/test/resources/create_bucket_request.json deleted file mode 100644 index 8b72ad5..0000000 --- a/b2/src/test/resources/create_bucket_request.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "accountId": "ACCOUNT_ID", - "bucketName": "any_name_you_pick", - "bucketType": "allPrivate" -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/delete_bucket_already_deleted_response.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/delete_bucket_already_deleted_response.json b/b2/src/test/resources/delete_bucket_already_deleted_response.json deleted file mode 100644 index 6ac1748..0000000 --- a/b2/src/test/resources/delete_bucket_already_deleted_response.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "status" : 400, - "code" : "bad_bucket_id", - "message" : "Bucket id 4a48fe8875c6214145260818 does not exist" -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/delete_bucket_request.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/delete_bucket_request.json b/b2/src/test/resources/delete_bucket_request.json deleted file mode 100644 index 8719353..0000000 --- a/b2/src/test/resources/delete_bucket_request.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "accountId": "ACCOUNT_ID", - "bucketId": "4a48fe8875c6214145260818" -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/delete_file_version_already_deleted_response.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/delete_file_version_already_deleted_response.json b/b2/src/test/resources/delete_file_version_already_deleted_response.json deleted file mode 100644 index 43dd03d..0000000 --- a/b2/src/test/resources/delete_file_version_already_deleted_response.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "status" : 400, - "code" : "file_not_present", - "message" : "File not present: file-name 4_za7acecf18b053f3258580715_f1036e7f957cafbe1_d20160609_m045216_c001_v0001011_t0035" -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/delete_object_request.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/delete_object_request.json b/b2/src/test/resources/delete_object_request.json deleted file mode 100644 index faccfa8..0000000 --- a/b2/src/test/resources/delete_object_request.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "fileName": "typing_test.txt", - "fileId": "4_h4a48fe8875c6214145260818_f000000000000472a_d20140104_m032022_c001_v0000123_t0104" -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/delete_object_response.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/delete_object_response.json b/b2/src/test/resources/delete_object_response.json deleted file mode 100644 index 768ce19..0000000 --- a/b2/src/test/resources/delete_object_response.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "fileId" : "4_h4a48fe8875c6214145260818_f000000000000472a_d20140104_m032022_c001_v0000123_t0104", - "fileName" : "typing_test.txt" -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/finish_large_file_request.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/finish_large_file_request.json b/b2/src/test/resources/finish_large_file_request.json deleted file mode 100644 index 8cef10a..0000000 --- a/b2/src/test/resources/finish_large_file_request.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "partSha1Array": [ - "0000000000000000000000000000000000000000", - "ffffffffffffffffffffffffffffffffffffffff" - ], - "fileId": "4_za71f544e781e6891531b001a_f200ec353a2184825_d20160409_m004829_c000_v0001016_t0028" -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/finish_large_file_response.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/finish_large_file_response.json b/b2/src/test/resources/finish_large_file_response.json deleted file mode 100644 index b663239..0000000 --- a/b2/src/test/resources/finish_large_file_response.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "accountId": "YOUR_ACCOUNT_ID", - "action": "upload", - "bucketId": "e73ede9c9c8412db49f60715", - "contentLength": 208158542, - "contentSha1": "none", - "contentType": "b2/x-auto", - "fileId": "4_za71f544e781e6891531b001a_f200ec353a2184825_d20160409_m004829_c000_v0001016_t0028", - "fileInfo": { - "author": "unknown" - }, - "fileName": "bigfile.dat", - "uploadTimestamp": 1460162909000 -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/get_file_info_deleted_file_response.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/get_file_info_deleted_file_response.json b/b2/src/test/resources/get_file_info_deleted_file_response.json deleted file mode 100644 index 5cf4eab..0000000 --- a/b2/src/test/resources/get_file_info_deleted_file_response.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "status" : 404, - "code" : "not_found", - "message" : "file_state_deleted" -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/get_file_info_request.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/get_file_info_request.json b/b2/src/test/resources/get_file_info_request.json deleted file mode 100644 index 5ab3a63..0000000 --- a/b2/src/test/resources/get_file_info_request.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "fileId": "4_ze73ede9c9c8412db49f60715_f100b4e93fbae6252_d20150824_m224353_c900_v8881000_t0001" -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/get_file_info_response.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/get_file_info_response.json b/b2/src/test/resources/get_file_info_response.json deleted file mode 100644 index b322d86..0000000 --- a/b2/src/test/resources/get_file_info_response.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "accountId": "7eecc42b9675", - "bucketId": "e73ede9c9c8412db49f60715", - "contentLength": 122573, - "contentSha1": "a01a21253a07fb08a354acd30f3a6f32abb76821", - "contentType": "image/jpeg", - "fileId": "4_ze73ede9c9c8412db49f60715_f100b4e93fbae6252_d20150824_m224353_c900_v8881000_t0001", - "fileInfo": {}, - "fileName": "akitty.jpg", - "action": "upload", - "uploadTimestamp": 1439083733000 -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/get_upload_part_url_request.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/get_upload_part_url_request.json b/b2/src/test/resources/get_upload_part_url_request.json deleted file mode 100644 index 7dd68bd..0000000 --- a/b2/src/test/resources/get_upload_part_url_request.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "fileId": "4_za71f544e781e6891531b001a_f200ec353a2184825_d20160409_m004829_c000_v0001016_t0028" -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/get_upload_part_url_response.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/get_upload_part_url_response.json b/b2/src/test/resources/get_upload_part_url_response.json deleted file mode 100644 index 7ebf04e..0000000 --- a/b2/src/test/resources/get_upload_part_url_response.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "authorizationToken": "3_20160409004829_42b8f80ba60fb4323dcaad98_ec81302316fccc2260201cbf17813247f312cf3b_000_uplg", - "fileId": "4_za71f544e781e6891531b001a_f200ec353a2184825_d20160409_m004829_c000_v0001016_t0028", - "uploadUrl": "https://pod-000-1016-09.backblaze.com/b2api/v1/b2_upload_part/4_ze73ede9c9c8412db49f60715_f100b4e93fbae6252_d20150824_m224353_c900_v8881000_t0001/0037"; -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/get_upload_url_deleted_bucket_response.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/get_upload_url_deleted_bucket_response.json b/b2/src/test/resources/get_upload_url_deleted_bucket_response.json deleted file mode 100644 index 007a1eb..0000000 --- a/b2/src/test/resources/get_upload_url_deleted_bucket_response.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "status" : 400, - "code" : "bad_bucket_id", - "message" : "Bucket b7ecac119bd53f3258580715 does not exist" -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/get_upload_url_request.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/get_upload_url_request.json b/b2/src/test/resources/get_upload_url_request.json deleted file mode 100644 index 80cb5ba..0000000 --- a/b2/src/test/resources/get_upload_url_request.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "bucketId" : "4a48fe8875c6214145260818" -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/get_upload_url_response.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/get_upload_url_response.json b/b2/src/test/resources/get_upload_url_response.json deleted file mode 100644 index 0be7f61..0000000 --- a/b2/src/test/resources/get_upload_url_response.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "bucketId" : "4a48fe8875c6214145260818", - "uploadUrl" : "https://pod-000-1005-03.backblaze.com/b2api/v1/b2_upload_file?cvt=c001_v0001005_t0027&bucket=4a48fe8875c6214145260818";, - "authorizationToken" : "2_20151009170037_f504a0f39a0f4e657337e624_9754dde94359bd7b8f1445c8f4cc1a231a33f714_upld" -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/hide_file_request.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/hide_file_request.json b/b2/src/test/resources/hide_file_request.json deleted file mode 100644 index 10e05e0..0000000 --- a/b2/src/test/resources/hide_file_request.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "bucketId": "4a48fe8875c6214145260818", - "fileName": "typing_test.txt" -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/hide_file_response.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/hide_file_response.json b/b2/src/test/resources/hide_file_response.json deleted file mode 100644 index 85c6853..0000000 --- a/b2/src/test/resources/hide_file_response.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "action" : "hide", - "fileId" : "4_h4a48fe8875c6214145260818_f000000000000472a_d20140104_m032022_c001_v0000123_t0104", - "fileName" : "typing_test.txt", - "uploadTimestamp" : 1437815673000 -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/list_buckets_request.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/list_buckets_request.json b/b2/src/test/resources/list_buckets_request.json deleted file mode 100644 index e2854f5..0000000 --- a/b2/src/test/resources/list_buckets_request.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "accountId": "ACCOUNT_ID" -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/list_buckets_response.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/list_buckets_response.json b/b2/src/test/resources/list_buckets_response.json deleted file mode 100644 index dbf4ad8..0000000 --- a/b2/src/test/resources/list_buckets_response.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "buckets": [ - { - "bucketId": "4a48fe8875c6214145260818", - "accountId": "30f20426f0b1", - "bucketName" : "Kitten Videos", - "bucketType": "allPrivate" - }, - { - "bucketId" : "5b232e8875c6214145260818", - "accountId": "30f20426f0b1", - "bucketName": "Puppy Videos", - "bucketType": "allPublic" - }, - { - "bucketId": "87ba238875c6214145260818", - "accountId": "30f20426f0b1", - "bucketName": "Vacation Pictures", - "bucketType" : "allPrivate" - } ] -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/list_file_names_request.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/list_file_names_request.json b/b2/src/test/resources/list_file_names_request.json deleted file mode 100644 index 32b805c..0000000 --- a/b2/src/test/resources/list_file_names_request.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "bucketId": "4a48fe8875c6214145260818" -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/list_file_names_response.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/list_file_names_response.json b/b2/src/test/resources/list_file_names_response.json deleted file mode 100644 index 51d95ba..0000000 --- a/b2/src/test/resources/list_file_names_response.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "files": [ - { - "action": "upload", - "fileId": "4_z27c88f1d182b150646ff0b16_f1004ba650fe24e6b_d20150809_m012853_c100_v0009990_t0000", - "fileName": "files/hello.txt", - "size": 6, - "uploadTimestamp": 1439083733000 - }, - { - "action": "upload", - "fileId": "4_z27c88f1d182b150646ff0b16_f1004ba650fe24e6c_d20150809_m012854_c100_v0009990_t0000", - "fileName": "files/world.txt", - "size": 6, - "uploadTimestamp": 1439083734000 - } - ], - "nextFileName": null -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/list_file_versions_request.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/list_file_versions_request.json b/b2/src/test/resources/list_file_versions_request.json deleted file mode 100644 index b083b91..0000000 --- a/b2/src/test/resources/list_file_versions_request.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "bucketId": "4a48fe8875c6214145260818" -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/list_file_versions_response.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/list_file_versions_response.json b/b2/src/test/resources/list_file_versions_response.json deleted file mode 100644 index e7aaf48..0000000 --- a/b2/src/test/resources/list_file_versions_response.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "files": [ - { - "action": "upload", - "fileId": "4_z27c88f1d182b150646ff0b16_f100920ddab886245_d20150809_m232316_c100_v0009990_t0003", - "fileName": "files/hello.txt", - "size": 6, - "uploadTimestamp": 1439162596000 - }, - { - "action": "hide", - "fileId": "4_z27c88f1d182b150646ff0b16_f100920ddab886247_d20150809_m232323_c100_v0009990_t0005", - "fileName": "files/world.txt", - "size": 0, - "uploadTimestamp": 1439162603000 - }, - { - "action": "upload", - "fileId": "4_z27c88f1d182b150646ff0b16_f100920ddab886246_d20150809_m232316_c100_v0009990_t0003", - "fileName": "files/world.txt", - "size": 6, - "uploadTimestamp": 1439162596000 - } - ], - "nextFileId": "4_z27c88f1d182b150646ff0b16_f100920ddab886247_d20150809_m232316_c100_v0009990_t0003", - "nextFileName": "files/world.txt" -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/list_parts_request.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/list_parts_request.json b/b2/src/test/resources/list_parts_request.json deleted file mode 100644 index f998faa..0000000 --- a/b2/src/test/resources/list_parts_request.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "fileId": "4_za71f544e781e6891531b001a_f200ec353a2184825_d20160409_m004829_c000_v0001016_t0028", - "startPartNumber": 1, - "maxPartCount": 1000 -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/list_parts_response.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/list_parts_response.json b/b2/src/test/resources/list_parts_response.json deleted file mode 100644 index 6b4ccab..0000000 --- a/b2/src/test/resources/list_parts_response.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "nextPartNumber": null, - "parts": [ - { - "contentLength": 100000000, - "contentSha1": "062685a84ab248d2488f02f6b01b948de2514ad8", - "fileId": "4_ze73ede9c9c8412db49f60715_f100b4e93fbae6252_d20150824_m224353_c900_v8881000_t0001", - "partNumber": 1, - "uploadTimestamp": 1462212185000 - }, - { - "contentLength": 100000000, - "contentSha1": "cf634751c3d9f6a15344f23cbf13f3fc9542addf", - "fileId": "4_ze73ede9c9c8412db49f60715_f100b4e93fbae6252_d20150824_m224353_c900_v8881000_t0001", - "partNumber": 2, - "uploadTimestamp": 1462212296000 - }, - { - "contentLength": 8158554, - "contentSha1": "00ad164147cbbd60aedb2b04ff66b0f74f962753", - "fileId": "4_ze73ede9c9c8412db49f60715_f100b4e93fbae6252_d20150824_m224353_c900_v8881000_t0001", - "partNumber": 3, - "uploadTimestamp": 1462212327000 - } - ] -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/list_unfinished_large_files_request.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/list_unfinished_large_files_request.json b/b2/src/test/resources/list_unfinished_large_files_request.json deleted file mode 100644 index e86d2a9..0000000 --- a/b2/src/test/resources/list_unfinished_large_files_request.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "bucketId": "e73ede9c9c8412db49f60715", - "startFileId": "4_za71f544e781e6891531b001a_f200ec353a2184825_d20160409_m004829_c000_v0001016_t0028", - "maxFileCount": 1000 -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/list_unfinished_large_files_response.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/list_unfinished_large_files_response.json b/b2/src/test/resources/list_unfinished_large_files_response.json deleted file mode 100644 index 753c589..0000000 --- a/b2/src/test/resources/list_unfinished_large_files_response.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "files": [ - { - "accountId": "YOUR_ACCOUNT_ID", - "bucketId": "e73ede9c9c8412db49f60715", - "contentType": "application/octet-stream", - "fileId": "4_ze73ede9c9c8412db49f60715_f100b4e93fbae6252_d20150824_m224353_c900_v8881000_t0001", - "fileInfo": { - "author": "unknown" - }, - "fileName": "bigfile.dat", - "uploadTimestamp": 1462212184000 - } - ], - "nextFileId": null -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/log4j.xml ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/log4j.xml b/b2/src/test/resources/log4j.xml deleted file mode 100644 index 9b64842..0000000 --- a/b2/src/test/resources/log4j.xml +++ /dev/null @@ -1,106 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - - <!-- - For more configuration infromation and examples see the Apache - Log4j website: http://logging.apache.org/log4j/ - --> -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"; - debug="false"> - - <!-- A time/date based rolling appender --> - <appender name="WIREFILE" class="org.apache.log4j.DailyRollingFileAppender"> - <param name="File" value="target/test-data/jclouds-wire.log" /> - <param name="Append" value="true" /> - - <!-- Rollover at midnight each day --> - <param name="DatePattern" value="'.'yyyy-MM-dd" /> - - <param name="Threshold" value="TRACE" /> - - <layout class="org.apache.log4j.PatternLayout"> - <!-- The default pattern: Date Priority [Category] Message\n --> - <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" /> - - <!-- - The full pattern: Date MS Priority [Category] - (Thread:NDC) Message\n <param name="ConversionPattern" - value="%d %-5r %-5p [%c] (%t:%x) %m%n"/> - --> - </layout> - </appender> - - <!-- A time/date based rolling appender --> - <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender"> - <param name="File" value="target/test-data/jclouds.log" /> - <param name="Append" value="true" /> - - <!-- Rollover at midnight each day --> - <param name="DatePattern" value="'.'yyyy-MM-dd" /> - - <param name="Threshold" value="TRACE" /> - - <layout class="org.apache.log4j.PatternLayout"> - <!-- The default pattern: Date Priority [Category] Message\n --> - <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" /> - - <!-- - The full pattern: Date MS Priority [Category] - (Thread:NDC) Message\n <param name="ConversionPattern" - value="%d %-5r %-5p [%c] (%t:%x) %m%n"/> - --> - </layout> - </appender> - <!-- A time/date based rolling appender --> - <appender name="BLOBSTOREFILE" class="org.apache.log4j.DailyRollingFileAppender"> - <param name="File" value="target/test-data/jclouds-blobstore.log" /> - <param name="Append" value="true" /> - <param name="DatePattern" value="'.'yyyy-MM-dd" /> - <param name="Threshold" value="TRACE" /> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" /> - </layout> - </appender> - - <appender name="ASYNC" class="org.apache.log4j.AsyncAppender"> - <appender-ref ref="FILE" /> - </appender> - - <appender name="ASYNCWIRE" class="org.apache.log4j.AsyncAppender"> - <appender-ref ref="WIREFILE" /> - </appender> - - <appender name="ASYNCBLOBSTORE" class="org.apache.log4j.AsyncAppender"> - <appender-ref ref="BLOBSTOREFILE" /> - </appender> - <!-- ================ --> - <!-- Limit categories --> - <!-- ================ --> - - <category name="org.jclouds"> - <priority value="DEBUG" /> - <appender-ref ref="ASYNC" /> - </category> - - <category name="jclouds.headers"> - <priority value="DEBUG" /> - <appender-ref ref="ASYNCWIRE" /> - </category> - <!-- - NOTE enabling this will break stream tests <category - name="jclouds.wire"> <priority value="DEBUG" /> <appender-ref - ref="ASYNCWIRE" /> </category> - --> - <category name="jclouds.blobstore"> - <priority value="DEBUG" /> - <appender-ref ref="ASYNCBLOBSTORE" /> - </category> - <!-- ======================= --> - <!-- Setup the Root category --> - <!-- ======================= --> - - <root> - <priority value="WARN" /> - </root> - -</log4j:configuration> http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/start_large_file_request.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/start_large_file_request.json b/b2/src/test/resources/start_large_file_request.json deleted file mode 100644 index 3b4e90f..0000000 --- a/b2/src/test/resources/start_large_file_request.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "fileName": "bigfile.dat", - "bucketId": "e73ede9c9c8412db49f60715", - "contentType": "b2/x-auto", - "fileInfo": { - "author": "unknown" - } -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/start_large_file_response.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/start_large_file_response.json b/b2/src/test/resources/start_large_file_response.json deleted file mode 100644 index 01838b4..0000000 --- a/b2/src/test/resources/start_large_file_response.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "accountId": "YOUR_ACCOUNT_ID", - "bucketId": "e73ede9c9c8412db49f60715", - "contentType": "b2/x-auto", - "fileId": "4_za71f544e781e6891531b001a_f200ec353a2184825_d20160409_m004829_c000_v0001016_t0028", - "fileInfo": { - "author": "unknown" - }, - "fileName": "bigfile.dat", - "uploadTimestamp": 1460162909000 -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/update_bucket_request.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/update_bucket_request.json b/b2/src/test/resources/update_bucket_request.json deleted file mode 100644 index 64cc475..0000000 --- a/b2/src/test/resources/update_bucket_request.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "accountId": "ACCOUNT_ID", - "bucketId": "4a48fe8875c6214145260818", - "bucketType": "allPrivate" -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/upload_file_response.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/upload_file_response.json b/b2/src/test/resources/upload_file_response.json deleted file mode 100644 index 7833124..0000000 --- a/b2/src/test/resources/upload_file_response.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "fileId" : "4_h4a48fe8875c6214145260818_f000000000000472a_d20140104_m032022_c001_v0000123_t0104", - "fileName" : "typing_test.txt", - "accountId" : "d522aa47a10f", - "bucketId" : "4a48fe8875c6214145260818", - "contentLength" : 46, - "contentSha1" : "bae5ed658ab3546aee12f23f36392f35dba1ebdd", - "contentType" : "text/plain", - "uploadTimestamp" : 0, - "fileInfo" : { - "author" : "unknown" - } -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/b2/src/test/resources/upload_part_response.json ---------------------------------------------------------------------- diff --git a/b2/src/test/resources/upload_part_response.json b/b2/src/test/resources/upload_part_response.json deleted file mode 100644 index fb99aa4..0000000 --- a/b2/src/test/resources/upload_part_response.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "contentLength": 100000000, - "contentSha1": "062685a84ab248d2488f02f6b01b948de2514ad8", - "fileId": "4_za71f544e781e6891531b001a_f200ec353a2184825_d20160409_m004829_c000_v0001016_t0028", - "partNumber": 1 -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/85b30385/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b873a76..4edf998 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,6 @@ <modules> <module>azurecompute-arm</module> <module>azurecompute</module> - <module>b2</module> <module>cdmi</module> <module>cloudsigma2</module> <module>cloudsigma2-hnl</module>
