Repository: jclouds-labs-aws Updated Branches: refs/heads/master c4dad4c42 -> 2040dc369
Using assertj assertions testng assertions have been replaced with assertj assertions. Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/commit/311de980 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/tree/311de980 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/diff/311de980 Branch: refs/heads/master Commit: 311de980a5c6b0fe4c5fedc403cda524976e1dc0 Parents: c4dad4c Author: Roman C. Coedo <[email protected]> Authored: Thu Jul 3 16:15:21 2014 +0200 Committer: Andrew Gaul <[email protected]> Committed: Thu Jul 3 16:04:34 2014 -0700 ---------------------------------------------------------------------- .../jclouds/glacier/GlacierClientLiveTest.java | 23 +-- .../jclouds/glacier/GlacierClientMockTest.java | 185 +++++++++---------- .../glacier/util/AWSRequestSignerV4Test.java | 4 +- .../jclouds/glacier/util/ContentRangeTest.java | 29 +-- .../org/jclouds/glacier/util/TreeHashTest.java | 36 ++-- 5 files changed, 137 insertions(+), 140 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/311de980/glacier/src/test/java/org/jclouds/glacier/GlacierClientLiveTest.java ---------------------------------------------------------------------- diff --git a/glacier/src/test/java/org/jclouds/glacier/GlacierClientLiveTest.java b/glacier/src/test/java/org/jclouds/glacier/GlacierClientLiveTest.java index 175de46..34750e9 100644 --- a/glacier/src/test/java/org/jclouds/glacier/GlacierClientLiveTest.java +++ b/glacier/src/test/java/org/jclouds/glacier/GlacierClientLiveTest.java @@ -19,9 +19,6 @@ package org.jclouds.glacier; import static org.assertj.core.api.Assertions.assertThat; import static org.jclouds.glacier.util.TestUtils.MiB; import static org.jclouds.glacier.util.TestUtils.buildPayload; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertTrue; import java.util.UUID; @@ -29,7 +26,6 @@ import org.jclouds.apis.BaseApiLiveTest; import org.jclouds.glacier.domain.MultipartUploadMetadata; import org.jclouds.glacier.domain.PaginatedMultipartUploadCollection; import org.jclouds.glacier.domain.PaginatedVaultCollection; -import org.jclouds.glacier.domain.VaultMetadata; import org.jclouds.glacier.util.ContentRange; import org.testng.annotations.Test; @@ -51,13 +47,12 @@ public class GlacierClientLiveTest extends BaseApiLiveTest<GlacierClient>{ @Test(groups = { "integration", "live" }) public void testDeleteVaultIfEmptyOrNotFound() throws Exception { - assertTrue(api.deleteVault(UUID.randomUUID().toString())); + assertThat(api.deleteVault(UUID.randomUUID().toString())).isTrue(); } @Test(groups = { "integration", "live" }) public void testDescribeNonExistentVault() throws Exception { - VaultMetadata vault = api.describeVault(UUID.randomUUID().toString()); - assertNull(vault); + assertThat(api.describeVault(UUID.randomUUID().toString())).isNull(); } @Test(groups = { "integration", "live" }) @@ -88,7 +83,7 @@ public class GlacierClientLiveTest extends BaseApiLiveTest<GlacierClient>{ public void testInitiateAndAbortMultipartUpload() throws Exception { String uploadId = api.initiateMultipartUpload(VAULT_NAME1, 8); try { - assertNotNull(uploadId); + assertThat(uploadId).isNotNull(); } finally { api.abortMultipartUpload(VAULT_NAME1, uploadId); } @@ -99,15 +94,15 @@ public class GlacierClientLiveTest extends BaseApiLiveTest<GlacierClient>{ long partSizeInMb = 1; String uploadId = api.initiateMultipartUpload(VAULT_NAME1, partSizeInMb); try { - assertNotNull(api.uploadPart(VAULT_NAME1, uploadId, - ContentRange.fromPartNumber(0, partSizeInMb), buildPayload(partSizeInMb * MiB))); + assertThat(api.uploadPart(VAULT_NAME1, uploadId, + ContentRange.fromPartNumber(0, partSizeInMb), buildPayload(partSizeInMb * MiB))).isNotNull(); PaginatedMultipartUploadCollection uploads = api.listMultipartUploads(VAULT_NAME1); ImmutableList.Builder<String> list = ImmutableList.builder(); for (MultipartUploadMetadata upload : uploads) { list.add(upload.getMultipartUploadId()); } assertThat(list.build()).contains(uploadId); - assertTrue(api.abortMultipartUpload(VAULT_NAME1, uploadId)); + assertThat(api.abortMultipartUpload(VAULT_NAME1, uploadId)).isTrue(); } finally { api.abortMultipartUpload(VAULT_NAME1, uploadId); } @@ -117,8 +112,8 @@ public class GlacierClientLiveTest extends BaseApiLiveTest<GlacierClient>{ dependsOnMethods = { "testListAndDescribeVaults", "testListMultipartUploadsWithEmptyList", "testInitiateAndAbortMultipartUpload", "testListMultipartUploads" }) public void testDeleteVault() throws Exception { - assertTrue(api.deleteVault(VAULT_NAME1)); - assertTrue(api.deleteVault(VAULT_NAME2)); - assertTrue(api.deleteVault(VAULT_NAME3)); + assertThat(api.deleteVault(VAULT_NAME1)).isTrue(); + assertThat(api.deleteVault(VAULT_NAME2)).isTrue(); + assertThat(api.deleteVault(VAULT_NAME3)).isTrue(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/311de980/glacier/src/test/java/org/jclouds/glacier/GlacierClientMockTest.java ---------------------------------------------------------------------- diff --git a/glacier/src/test/java/org/jclouds/glacier/GlacierClientMockTest.java b/glacier/src/test/java/org/jclouds/glacier/GlacierClientMockTest.java index b679b44..cec3c24 100644 --- a/glacier/src/test/java/org/jclouds/glacier/GlacierClientMockTest.java +++ b/glacier/src/test/java/org/jclouds/glacier/GlacierClientMockTest.java @@ -25,35 +25,29 @@ import static org.jclouds.glacier.util.TestUtils.MiB; import static org.jclouds.glacier.util.TestUtils.buildPayload; import static org.jclouds.util.Strings2.urlEncode; import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; import java.io.IOException; import java.net.URI; import java.net.URL; -import java.util.Iterator; import java.util.Properties; import java.util.Set; import org.jclouds.ContextBuilder; import org.jclouds.concurrent.config.ExecutorServiceModule; -import org.jclouds.glacier.domain.ArchiveMetadata; import org.jclouds.glacier.domain.ArchiveMetadataCollection; import org.jclouds.glacier.domain.ArchiveRetrievalJobRequest; import org.jclouds.glacier.domain.InventoryRetrievalJobRequest; import org.jclouds.glacier.domain.JobMetadata; import org.jclouds.glacier.domain.MultipartUploadMetadata; -import org.jclouds.glacier.domain.PaginatedJobCollection; import org.jclouds.glacier.domain.PaginatedMultipartUploadCollection; import org.jclouds.glacier.domain.PaginatedVaultCollection; -import org.jclouds.glacier.domain.PartMetadata; import org.jclouds.glacier.domain.VaultMetadata; import org.jclouds.glacier.options.PaginationOptions; import org.jclouds.glacier.reference.GlacierHeaders; import org.jclouds.glacier.util.ContentRange; import org.jclouds.http.HttpResponseException; -import org.jclouds.io.ByteSources; import org.jclouds.io.Payload; import org.jclouds.json.Json; import org.jclouds.json.internal.GsonWrapper; @@ -146,8 +140,8 @@ public class GlacierClientMockTest { mr.addHeader(HttpHeaders.LOCATION, VAULT_LOCATION); server.enqueue(mr); - URI responseUri = client.createVault(VAULT_NAME); - assertEquals(responseUri.toString(), server.getUrl("/") + VAULT_LOCATION.substring(1)); + assertThat(client.createVault(VAULT_NAME)).isEqualTo(URI.create(server.getUrl("/") + VAULT_LOCATION.substring(1))); + assertEquals(server.takeRequest().getRequestLine(), "PUT /-/vaults/" + VAULT_NAME + " " + HTTP); } @@ -155,7 +149,8 @@ public class GlacierClientMockTest { public void testDeleteVault() throws InterruptedException { server.enqueue(buildBaseResponse(204)); - assertTrue(client.deleteVault(VAULT_NAME)); + assertThat(client.deleteVault(VAULT_NAME)).isTrue(); + assertEquals(server.takeRequest().getRequestLine(), "DELETE /-/vaults/" + VAULT_NAME + " " + HTTP); } @@ -167,12 +162,13 @@ public class GlacierClientMockTest { mr.addHeader(HttpHeaders.CONTENT_LENGTH, mr.getBody().length); server.enqueue(mr); - VaultMetadata vm = client.describeVault(VAULT_NAME); + VaultMetadata vault = client.describeVault(VAULT_NAME); + assertThat(vault.getVaultName()).isEqualTo(VAULT_NAME); + assertThat(vault.getVaultARN()).isEqualTo(VAULT_ARN); + assertThat(vault.getSizeInBytes()).isEqualTo(78088912); + assertThat(vault.getNumberOfArchives()).isEqualTo(192); + assertEquals(server.takeRequest().getRequestLine(), "GET /-/vaults/" + VAULT_NAME + " " + HTTP); - assertEquals(vm.getVaultName(), VAULT_NAME); - assertEquals(vm.getVaultARN(), VAULT_ARN); - assertEquals(vm.getSizeInBytes(), 78088912); - assertEquals(vm.getNumberOfArchives(), 192); } @Test @@ -183,11 +179,8 @@ public class GlacierClientMockTest { mr.addHeader(HttpHeaders.CONTENT_LENGTH, mr.getBody().length); server.enqueue(mr); - PaginatedVaultCollection vc = client.listVaults(); - Iterator<VaultMetadata> i = vc.iterator(); - assertEquals(i.next().getVaultName(), VAULT_NAME1); - assertEquals(i.next().getVaultName(), VAULT_NAME2); - assertEquals(i.next().getVaultName(), VAULT_NAME3); + assertThat(client.listVaults()).extracting("vaultName").containsExactly(VAULT_NAME1, VAULT_NAME2, VAULT_NAME3); + assertEquals(server.takeRequest().getRequestLine(), "GET /-/vaults " + HTTP); } @@ -210,14 +203,12 @@ public class GlacierClientMockTest { mr.addHeader(HttpHeaders.CONTENT_LENGTH, mr.getBody().length); server.enqueue(mr); - PaginatedVaultCollection vc = client.listVaults(PaginationOptions.Builder.limit(2).marker(VAULT_ARN1)); - Iterator<VaultMetadata> i = vc.iterator(); - assertEquals(i.next().getVaultName(), VAULT_NAME1); - assertEquals(i.next().getVaultName(), VAULT_NAME2); - assertFalse(i.hasNext()); - assertEquals(vc.nextMarker().get(), VAULT_ARN3); + PaginatedVaultCollection vaults = client.listVaults(PaginationOptions.Builder.limit(2).marker(VAULT_ARN1)); + assertThat(vaults).extracting("vaultName").containsExactly(VAULT_NAME1, VAULT_NAME2); + assertThat(vaults.nextMarker().get()).isEqualTo(VAULT_ARN3); + assertEquals(server.takeRequest().getRequestLine(), - "GET /-/vaults?limit=2&marker=" + urlEncode(VAULT_ARN1, '/') + " " + HTTP); + "GET /-/vaults?limit=2&marker=" + urlEncode(VAULT_ARN1, '/') + " " + HTTP); } @Test @@ -228,7 +219,8 @@ public class GlacierClientMockTest { mr.addHeader(GlacierHeaders.ARCHIVE_ID, ARCHIVE_ID); server.enqueue(mr); - assertEquals(client.uploadArchive(VAULT_NAME, buildPayload(10), DESCRIPTION), ARCHIVE_ID); + assertThat(client.uploadArchive(VAULT_NAME, buildPayload(10), DESCRIPTION)).isEqualTo(ARCHIVE_ID); + RecordedRequest request = server.takeRequest(); assertEquals(request.getRequestLine(), "POST /-/vaults/" + VAULT_NAME + "/archives " + HTTP); assertEquals(request.getHeader(GlacierHeaders.ARCHIVE_DESCRIPTION), DESCRIPTION); @@ -241,7 +233,8 @@ public class GlacierClientMockTest { MockResponse mr = buildBaseResponse(204); server.enqueue(mr); - assertTrue(client.deleteArchive(VAULT_NAME, ARCHIVE_ID)); + assertThat(client.deleteArchive(VAULT_NAME, ARCHIVE_ID)).isTrue(); + assertEquals(server.takeRequest().getRequestLine(), "DELETE /-/vaults/" + VAULT_NAME + "/archives/" + ARCHIVE_ID + " " + HTTP); } @@ -252,7 +245,8 @@ public class GlacierClientMockTest { mr.addHeader(GlacierHeaders.MULTIPART_UPLOAD_ID, MULTIPART_UPLOAD_ID); server.enqueue(mr); - assertEquals(client.initiateMultipartUpload(VAULT_NAME, 4, DESCRIPTION), MULTIPART_UPLOAD_ID); + assertThat(client.initiateMultipartUpload(VAULT_NAME, 4, DESCRIPTION)).isEqualTo(MULTIPART_UPLOAD_ID); + RecordedRequest request = server.takeRequest(); assertEquals(request.getRequestLine(), "POST /-/vaults/" + VAULT_NAME + "/multipart-uploads " + HTTP); assertEquals(request.getHeader(GlacierHeaders.PART_SIZE), "4194304"); @@ -265,9 +259,9 @@ public class GlacierClientMockTest { mr.addHeader(GlacierHeaders.TREE_HASH, TREEHASH); server.enqueue(mr); - assertEquals( - client.uploadPart(VAULT_NAME, MULTIPART_UPLOAD_ID, ContentRange.fromPartNumber(0, 4), buildPayload(4 * MiB)), - TREEHASH); + assertThat(client.uploadPart(VAULT_NAME, MULTIPART_UPLOAD_ID, ContentRange.fromPartNumber(0, 4), + buildPayload(4 * MiB))).isEqualTo(TREEHASH); + RecordedRequest request = server.takeRequest(); assertEquals(request.getRequestLine(), "PUT /-/vaults/" + VAULT_NAME + "/multipart-uploads/" + MULTIPART_UPLOAD_ID + " " + HTTP); @@ -296,6 +290,7 @@ public class GlacierClientMockTest { Assert.fail(); } catch (HttpResponseException e) { } + RecordedRequest request = server.takeRequest(); assertEquals(request.getRequestLine(), "PUT /-/vaults/" + VAULT_NAME + "/multipart-uploads/" + MULTIPART_UPLOAD_ID + " " + HTTP); assertEquals(request.getHeader(HttpHeaders.CONTENT_RANGE), range.buildHeader()); @@ -315,7 +310,8 @@ public class GlacierClientMockTest { 2, partHashcode, 3, partHashcode, 4, partHashcode); - assertEquals(client.completeMultipartUpload(VAULT_NAME, MULTIPART_UPLOAD_ID, map, 8L), ARCHIVE_ID); + assertThat(client.completeMultipartUpload(VAULT_NAME, MULTIPART_UPLOAD_ID, map, 8L)).isEqualTo(ARCHIVE_ID); + RecordedRequest request = server.takeRequest(); assertEquals(request.getRequestLine(), "POST /-/vaults/" + VAULT_NAME + "/multipart-uploads/" + MULTIPART_UPLOAD_ID + " " + HTTP); @@ -330,8 +326,9 @@ public class GlacierClientMockTest { server.enqueue(mr); assertTrue(client.abortMultipartUpload(VAULT_NAME, MULTIPART_UPLOAD_ID)); + assertEquals(server.takeRequest().getRequestLine(), - "DELETE /-/vaults/" + VAULT_NAME + "/multipart-uploads/" + MULTIPART_UPLOAD_ID + " " + HTTP); + "DELETE /-/vaults/" + VAULT_NAME + "/multipart-uploads/" + MULTIPART_UPLOAD_ID + " " + HTTP); } @Test @@ -342,16 +339,15 @@ public class GlacierClientMockTest { mr.addHeader(HttpHeaders.CONTENT_LENGTH, mr.getBody().length); server.enqueue(mr); - MultipartUploadMetadata result = client.listParts(VAULT_NAME, MULTIPART_UPLOAD_ID, - PaginationOptions.Builder.limit(1).marker("1001")); - assertEquals(result.getArchiveDescription(), "archive description 1"); - assertEquals(result.getMultipartUploadId(), MULTIPART_UPLOAD_ID); - assertEquals(result.getPartSizeInBytes(), 4194304); - PartMetadata part = result.iterator().next(); - assertEquals(part.getTreeHash(), HashCode.fromString("01d34dabf7be316472c93b1ef80721f5d4")); - assertEquals("4194304-8388607", part.getRange().getFrom() + "-" + part.getRange().getTo()); + MultipartUploadMetadata mpu = client.listParts(VAULT_NAME, MULTIPART_UPLOAD_ID, PaginationOptions.Builder.limit(1).marker("1001")); + assertThat(mpu.getArchiveDescription()).isEqualTo("archive description 1"); + assertThat(mpu.getMultipartUploadId()).isEqualTo(MULTIPART_UPLOAD_ID); + assertThat(mpu.getPartSizeInBytes()).isEqualTo(4194304); + assertThat(mpu).extracting("treeHash").containsExactly(HashCode.fromString("01d34dabf7be316472c93b1ef80721f5d4")); + assertThat(mpu).extracting("range").containsExactly(ContentRange.fromString("4194304-8388607")); + assertEquals(server.takeRequest().getRequestLine(), - "GET /-/vaults/examplevault/multipart-uploads/" + MULTIPART_UPLOAD_ID + "?limit=1&marker=1001 " + HTTP); + "GET /-/vaults/examplevault/multipart-uploads/" + MULTIPART_UPLOAD_ID + "?limit=1&marker=1001 " + HTTP); } @Test @@ -362,17 +358,14 @@ public class GlacierClientMockTest { mr.addHeader(HttpHeaders.CONTENT_LENGTH, mr.getBody().length); server.enqueue(mr); - PaginatedMultipartUploadCollection result = client.listMultipartUploads( - VAULT_NAME, PaginationOptions.Builder.limit(1).marker(MARKER)); - MultipartUploadMetadata mum = result.iterator().next(); - assertEquals(mum.getArchiveDescription(), "archive 2"); - assertEquals(mum.getMultipartUploadId(), - "nPyGOnyFcx67qqX7E-0tSGiRi88hHMOwOxR-_jNyM6RjVMFfV29lFqZ3rNsSaWBugg6OP92pRtufeHdQH7ClIpSF6uJc"); - assertEquals(mum.iterator(), null); - assertEquals(mum.getPartSizeInBytes(), 4194304); - assertEquals(mum.getVaultARN(), VAULT_ARN); + PaginatedMultipartUploadCollection mpus = client.listMultipartUploads(VAULT_NAME, PaginationOptions.Builder.limit(1).marker(MARKER)); + assertThat(mpus).extracting("archiveDescription").containsExactly("archive 2"); + assertThat(mpus).extracting("multipartUploadId").containsExactly("nPyGOnyFcx67qqX7E-0tSGiRi88hHMOwOxR-_jNyM6RjVMFfV29lFqZ3rNsSaWBugg6OP92pRtufeHdQH7ClIpSF6uJc"); + assertThat(mpus).extracting("partSizeInBytes").containsExactly(4194304L); + assertThat(mpus).extracting("vaultARN").containsExactly(VAULT_ARN); + assertEquals(server.takeRequest().getRequestLine(), - "GET /-/vaults/examplevault/multipart-uploads?limit=1&marker=" + MARKER + " " + HTTP); + "GET /-/vaults/examplevault/multipart-uploads?limit=1&marker=" + MARKER + " " + HTTP); } @Test @@ -384,8 +377,9 @@ public class GlacierClientMockTest { server.enqueue(mr); assertThat(client.listMultipartUploads(VAULT_NAME, PaginationOptions.Builder.limit(1).marker(MARKER))).isEmpty(); + assertEquals(server.takeRequest().getRequestLine(), - "GET /-/vaults/examplevault/multipart-uploads?limit=1&marker=" + MARKER + " " + HTTP); + "GET /-/vaults/examplevault/multipart-uploads?limit=1&marker=" + MARKER + " " + HTTP); } @Test @@ -401,15 +395,17 @@ public class GlacierClientMockTest { .description(DESCRIPTION) .range(range) .build(); - assertEquals(client.initiateJob(VAULT_NAME, retrieval), JOB_ID); + assertThat(client.initiateJob(VAULT_NAME, retrieval)).isEqualTo(JOB_ID); + RecordedRequest request = server.takeRequest(); Json json = new GsonWrapper(new Gson()); ArchiveRetrievalJobRequest job = json.fromJson(new String(request.getBody()), ArchiveRetrievalJobRequest.class); + assertThat(job.getDescription()).isEqualTo(DESCRIPTION); + assertThat(job.getRange()).isEqualTo(range); + assertThat(job.getArchiveId()).isEqualTo(ARCHIVE_ID); + assertThat(job.getType()).isEqualTo("archive-retrieval"); + assertEquals(request.getRequestLine(), "POST /-/vaults/" + VAULT_NAME + "/jobs " + HTTP); - assertEquals(job.getDescription(), DESCRIPTION); - assertEquals(job.getRange(), range); - assertEquals(job.getArchiveId(), ARCHIVE_ID); - assertEquals(job.getType(), "archive-retrieval"); } @Test @@ -431,17 +427,19 @@ public class GlacierClientMockTest { .limit(limit) .marker(marker) .build(); - assertEquals(client.initiateJob(VAULT_NAME, job), JOB_ID); + assertThat(client.initiateJob(VAULT_NAME, job)).isEqualTo(JOB_ID); + RecordedRequest request = server.takeRequest(); - assertEquals(request.getRequestLine(), "POST /-/vaults/examplevault/jobs HTTP/1.1"); Json json = new GsonWrapper(new Gson()); job = json.fromJson(new String(request.getBody()), InventoryRetrievalJobRequest.class); - assertEquals(job.getFormat(), format); - assertEquals(job.getParameters().getMarker(), marker); - assertEquals(job.getParameters().getLimit(), new Integer(limit)); - assertEquals(job.getParameters().getStartDate(), startDate); - assertEquals(job.getParameters().getEndDate(), endDate); - assertEquals(job.getType(), "inventory-retrieval"); + assertThat(job.getFormat()).isEqualTo(format); + assertThat(job.getParameters().getMarker()).isEqualTo(marker); + assertThat(job.getParameters().getLimit()).isEqualTo(limit); + assertThat(job.getParameters().getStartDate()).isEqualTo(startDate); + assertThat(job.getParameters().getEndDate()).isEqualTo(endDate); + assertThat(job.getType()).isEqualTo("inventory-retrieval"); + + assertEquals(request.getRequestLine(), "POST /-/vaults/examplevault/jobs HTTP/1.1"); } @Test @@ -453,11 +451,12 @@ public class GlacierClientMockTest { server.enqueue(mr); JobMetadata job = client.describeJob(VAULT_NAME, JOB_ID); + assertThat(job.getAction()).isEqualTo("ArchiveRetrieval"); + assertThat(job.getArchiveId()).isEqualTo(ARCHIVE_ID); + assertThat(ContentRange.fromString("0-16777215")).isEqualTo(job.getRetrievalByteRange()); + assertThat(job.getVaultArn()).isEqualTo("arn:aws:glacier:us-east-1:012345678901:vaults/examplevault"); + assertEquals(server.takeRequest().getRequestLine(), "GET /-/vaults/" + VAULT_NAME + "/jobs/" + JOB_ID + " " + HTTP); - assertEquals(job.getAction(), "ArchiveRetrieval"); - assertEquals(job.getArchiveId(), ARCHIVE_ID); - assertEquals(ContentRange.fromString("0-16777215"), job.getRetrievalByteRange()); - assertEquals(job.getVaultArn(), "arn:aws:glacier:us-east-1:012345678901:vaults/examplevault"); } @Test @@ -468,11 +467,10 @@ public class GlacierClientMockTest { mr.addHeader(HttpHeaders.CONTENT_LENGTH, mr.getBody().length); server.enqueue(mr); - PaginatedJobCollection jb = client.listJobs("examplevault"); - Iterator<JobMetadata> i = jb.iterator(); - assertEquals(i.next().getJobId(), "s4MvaNHIh6mOa1f8iY4ioG2921SDPihXxh3Kv0FBX-JbNPctpRvE4c2_BifuhdGLqEhGBNGeB6Ub-JMunR9JoVa8y1hQ"); - assertEquals(i.next().getJobId(), "CQ_tf6fOR4jrJCL61Mfk6VM03oY8lmnWK93KK4gLig1UPAbZiN3UV4G_5nq4AfmJHQ_dOMLOX5k8ItFv0wCPN0oaz5dG"); - assertFalse(i.hasNext()); + assertThat(client.listJobs(VAULT_NAME)).extracting("jobId").containsExactly( + "s4MvaNHIh6mOa1f8iY4ioG2921SDPihXxh3Kv0FBX-JbNPctpRvE4c2_BifuhdGLqEhGBNGeB6Ub-JMunR9JoVa8y1hQ", + "CQ_tf6fOR4jrJCL61Mfk6VM03oY8lmnWK93KK4gLig1UPAbZiN3UV4G_5nq4AfmJHQ_dOMLOX5k8ItFv0wCPN0oaz5dG"); + assertEquals(server.takeRequest().getRequestLine(), "GET /-/vaults/examplevault/jobs HTTP/1.1"); } @@ -485,11 +483,14 @@ public class GlacierClientMockTest { server.enqueue(mr); Payload payload = client.getJobOutput(VAULT_NAME, JOB_ID); - assertEquals(payload.getContentMetadata().getContentType(), MediaType.JSON_UTF_8.toString()); - assertEquals(payload.getContentMetadata().getContentLength(), new Long(mr.getBody().length)); - assertEquals(ByteSources.asByteSource(payload.openStream()).size(), mr.getBody().length); + assertThat(payload.getContentMetadata().getContentType()).isEqualTo(MediaType.JSON_UTF_8.toString()); + assertThat(payload.getContentMetadata().getContentLength()).isEqualTo(mr.getBody().length); + assertThat(payload.openStream()) + .hasContentEqualTo(Resources.getResource(GlacierClientMockTest.class, + "/json/getJobOutputResponseBody.json").openStream()); + assertEquals(server.takeRequest().getRequestLine(), - "GET /-/vaults/" + VAULT_NAME + "/jobs/" + JOB_ID + "/output " + HTTP); + "GET /-/vaults/" + VAULT_NAME + "/jobs/" + JOB_ID + "/output " + HTTP); } @Test @@ -502,10 +503,11 @@ public class GlacierClientMockTest { ContentRange range = ContentRange.fromString("16-32"); client.getJobOutput(VAULT_NAME, JOB_ID, range); + RecordedRequest request = server.takeRequest(); assertEquals(request.getHeader("Range"), "bytes=" + range.toString()); assertEquals(request.getRequestLine(), - "GET /-/vaults/" + VAULT_NAME + "/jobs/" + JOB_ID + "/output " + HTTP); + "GET /-/vaults/" + VAULT_NAME + "/jobs/" + JOB_ID + "/output " + HTTP); } @Test @@ -517,17 +519,14 @@ public class GlacierClientMockTest { server.enqueue(mr); ArchiveMetadataCollection archives = client.getInventoryRetrievalOutput(VAULT_NAME, JOB_ID); - assertEquals(archives.getVaultARN(), "arn:aws:glacier:us-east-1:012345678901:vaults/examplevault"); - Iterator<ArchiveMetadata> i = archives.iterator(); - ArchiveMetadata archive = i.next(); - assertEquals(archive.getArchiveId(), - "DMTmICA2n5Tdqq5BV2z7og-A20xnpAPKt3UXwWxdWsn_D6auTUrW6kwy5Qyj9xd1MCE1mBYvMQ63LWaT8yTMzMaCxB_9VBWrW4Jw4zsvg5kehAPDVKcppUD1X7b24JukOr4mMAq-oA"); - assertEquals(archive.getDescription(), "my archive1"); - assertEquals(archive.getSize(), 2140123); - assertEquals(archive.getTreeHash(), - HashCode.fromString("6b9d4cf8697bd3af6aa1b590a0b27b337da5b18988dbcc619a3e608a554a1e62")); - assertTrue(i.hasNext()); - i.next(); - assertFalse(i.hasNext()); + assertThat(archives.getVaultARN()).isEqualTo("arn:aws:glacier:us-east-1:012345678901:vaults/examplevault"); + assertThat(archives).extracting("archiveId").containsExactly( + "DMTmICA2n5Tdqq5BV2z7og-A20xnpAPKt3UXwWxdWsn_D6auTUrW6kwy5Qyj9xd1MCE1mBYvMQ63LWaT8yTMzMaCxB_9VBWrW4Jw4zsvg5kehAPDVKcppUD1X7b24JukOr4mMAq-oA", + "2lHzwhKhgF2JHyvCS-ZRuF08IQLuyB4265Hs3AXj9MoAIhz7tbXAvcFeHusgU_hViO1WeCBe0N5lsYYHRyZ7rrmRkNRuYrXUs_sjl2K8ume_7mKO_0i7C-uHE1oHqaW9d37pabXrSA"); + assertThat(archives).extracting("description").containsExactly("my archive1", "my archive2"); + assertThat(archives).extracting("size").containsExactly(2140123L, 2140123L); + assertThat(archives).extracting("treeHash").containsExactly( + HashCode.fromString("6b9d4cf8697bd3af6aa1b590a0b27b337da5b18988dbcc619a3e608a554a1e62"), + HashCode.fromString("7f2fe580edb35154041fa3d4b41dd6d3adaef0c85d2ff6309f1d4b520eeecda3")); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/311de980/glacier/src/test/java/org/jclouds/glacier/util/AWSRequestSignerV4Test.java ---------------------------------------------------------------------- diff --git a/glacier/src/test/java/org/jclouds/glacier/util/AWSRequestSignerV4Test.java b/glacier/src/test/java/org/jclouds/glacier/util/AWSRequestSignerV4Test.java index 24d479a..9ac3b82 100644 --- a/glacier/src/test/java/org/jclouds/glacier/util/AWSRequestSignerV4Test.java +++ b/glacier/src/test/java/org/jclouds/glacier/util/AWSRequestSignerV4Test.java @@ -16,7 +16,7 @@ */ package org.jclouds.glacier.util; -import static org.testng.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import java.security.NoSuchAlgorithmException; import java.security.cert.CertificateException; @@ -40,7 +40,7 @@ public class AWSRequestSignerV4Test { String credential = "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"; AWSRequestSignerV4 signer = new AWSRequestSignerV4(identity, credential, new JCECrypto()); HttpRequest request = signer.sign(createRequest()); - assertEquals(request.getFirstHeaderOrNull("Authorization"), auth); + assertThat(request.getFirstHeaderOrNull("Authorization")).isEqualTo(auth); } private HttpRequest createRequest() { http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/311de980/glacier/src/test/java/org/jclouds/glacier/util/ContentRangeTest.java ---------------------------------------------------------------------- diff --git a/glacier/src/test/java/org/jclouds/glacier/util/ContentRangeTest.java b/glacier/src/test/java/org/jclouds/glacier/util/ContentRangeTest.java index 4963508..a3a4807 100644 --- a/glacier/src/test/java/org/jclouds/glacier/util/ContentRangeTest.java +++ b/glacier/src/test/java/org/jclouds/glacier/util/ContentRangeTest.java @@ -16,7 +16,7 @@ */ package org.jclouds.glacier.util; -import static org.testng.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import org.testng.annotations.Test; @@ -25,11 +25,12 @@ public class ContentRangeTest { @Test public void testContentRangeFromString() { ContentRange range = ContentRange.fromString("0-10"); - assertEquals(range.getFrom(), 0); - assertEquals(range.getTo(), 10); + assertThat(range.getFrom()).isEqualTo(0); + assertThat(range.getTo()).isEqualTo(10); + range = ContentRange.fromString("1000-2000"); - assertEquals(range.getFrom(), 1000); - assertEquals(range.getTo(), 2000); + assertThat(range.getFrom()).isEqualTo(1000); + assertThat(range.getTo()).isEqualTo(2000); } @Test(expectedExceptions = IllegalArgumentException.class) @@ -55,14 +56,16 @@ public class ContentRangeTest { @Test public void testContentRangeFromPartNumber() { ContentRange range = ContentRange.fromPartNumber(0, 4096); - assertEquals(range.getFrom(), 0); - assertEquals(range.getTo(), (4096L << 20) - 1); + assertThat(range.getFrom()).isEqualTo(0); + assertThat(range.getTo()).isEqualTo((4096L << 20) - 1); + range = ContentRange.fromPartNumber(1, 4096); - assertEquals(range.getFrom(), 4096L << 20); - assertEquals(range.getTo(), 2 * (4096L << 20) - 1); + assertThat(range.getFrom()).isEqualTo(4096L << 20); + assertThat(range.getTo()).isEqualTo(2 * (4096L << 20) - 1); + range = ContentRange.fromPartNumber(2, 4096); - assertEquals(range.getFrom(), 2 * (4096L << 20)); - assertEquals(range.getTo(), 3 * (4096L << 20) - 1); + assertThat(range.getFrom()).isEqualTo(2 * (4096L << 20)); + assertThat(range.getTo()).isEqualTo(3 * (4096L << 20) - 1); } @Test(expectedExceptions = IllegalArgumentException.class) @@ -78,8 +81,8 @@ public class ContentRangeTest { @Test public void testBuildContentRange() { ContentRange range = ContentRange.build(0, 4096); - assertEquals(range.getFrom(), 0); - assertEquals(range.getTo(), 4096); + assertThat(range.getFrom()).isEqualTo(0); + assertThat(range.getTo()).isEqualTo(4096); } @Test(expectedExceptions = IllegalArgumentException.class) http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/311de980/glacier/src/test/java/org/jclouds/glacier/util/TreeHashTest.java ---------------------------------------------------------------------- diff --git a/glacier/src/test/java/org/jclouds/glacier/util/TreeHashTest.java b/glacier/src/test/java/org/jclouds/glacier/util/TreeHashTest.java index 7d22ea7..fab41f9 100644 --- a/glacier/src/test/java/org/jclouds/glacier/util/TreeHashTest.java +++ b/glacier/src/test/java/org/jclouds/glacier/util/TreeHashTest.java @@ -16,9 +16,9 @@ */ package org.jclouds.glacier.util; +import static org.assertj.core.api.Assertions.assertThat; import static org.jclouds.glacier.util.TestUtils.MiB; import static org.jclouds.glacier.util.TestUtils.buildData; -import static org.testng.Assert.assertEquals; import java.io.IOException; @@ -35,37 +35,37 @@ public class TreeHashTest { @Test public void testTreeHasherWith1MBPayload() throws IOException { TreeHash th = TreeHash.buildTreeHashFromPayload(new ByteSourcePayload(buildData(1 * MiB))); - assertEquals(th.getLinearHash(), - HashCode.fromString("9bc1b2a288b26af7257a36277ae3816a7d4f16e89c1e7e77d0a5c48bad62b360")); - assertEquals(th.getTreeHash(), - HashCode.fromString("9bc1b2a288b26af7257a36277ae3816a7d4f16e89c1e7e77d0a5c48bad62b360")); + assertThat(th.getLinearHash()) + .isEqualTo(HashCode.fromString("9bc1b2a288b26af7257a36277ae3816a7d4f16e89c1e7e77d0a5c48bad62b360")); + assertThat(th.getTreeHash()) + .isEqualTo(HashCode.fromString("9bc1b2a288b26af7257a36277ae3816a7d4f16e89c1e7e77d0a5c48bad62b360")); } @Test public void testTreeHasherWith2MBPayload() throws IOException { TreeHash th = TreeHash.buildTreeHashFromPayload(new ByteSourcePayload(buildData(2 * MiB))); - assertEquals(th.getLinearHash(), - HashCode.fromString("5256ec18f11624025905d057d6befb03d77b243511ac5f77ed5e0221ce6d84b5")); - assertEquals(th.getTreeHash(), - HashCode.fromString("560c2c9333c719cb00cfdffee3ba293db17f58743cdd1f7e4055373ae6300afa")); + assertThat(th.getLinearHash()) + .isEqualTo(HashCode.fromString("5256ec18f11624025905d057d6befb03d77b243511ac5f77ed5e0221ce6d84b5")); + assertThat(th.getTreeHash()) + .isEqualTo(HashCode.fromString("560c2c9333c719cb00cfdffee3ba293db17f58743cdd1f7e4055373ae6300afa")); } @Test public void testTreeHasherWith3MBPayload() throws IOException { TreeHash th = TreeHash.buildTreeHashFromPayload(new ByteSourcePayload(buildData(3 * MiB))); - assertEquals(th.getLinearHash(), - HashCode.fromString("6f850bc94ae6f7de14297c01616c36d712d22864497b28a63b81d776b035e656")); - assertEquals(th.getTreeHash(), - HashCode.fromString("70239f4f2ead7561f69d48b956b547edef52a1280a93c262c0b582190be7db17")); + assertThat(th.getLinearHash()) + .isEqualTo(HashCode.fromString("6f850bc94ae6f7de14297c01616c36d712d22864497b28a63b81d776b035e656")); + assertThat(th.getTreeHash()) + .isEqualTo(HashCode.fromString("70239f4f2ead7561f69d48b956b547edef52a1280a93c262c0b582190be7db17")); } @Test public void testTreeHasherWithMoreThan3MBPayload() throws IOException { TreeHash th = TreeHash.buildTreeHashFromPayload(new ByteSourcePayload(buildData(3 * MiB + 512 * 1024))); - assertEquals(th.getLinearHash(), - HashCode.fromString("34c8bdd269f89a091cf17d5d23503940e0abf61c4b6544e42854b9af437f31bb")); - assertEquals(th.getTreeHash(), - HashCode.fromString("daede4eb580f914dacd5e0bdf7015c937fd615c1e6c6552d25cb04a8b7219828")); + assertThat(th.getLinearHash()) + .isEqualTo(HashCode.fromString("34c8bdd269f89a091cf17d5d23503940e0abf61c4b6544e42854b9af437f31bb")); + assertThat(th.getTreeHash()) + .isEqualTo(HashCode.fromString("daede4eb580f914dacd5e0bdf7015c937fd615c1e6c6552d25cb04a8b7219828")); } @Test @@ -74,6 +74,6 @@ public class TreeHashTest { map.put(2, HashCode.fromString("9bc1b2a288b26af7257a36277ae3816a7d4f16e89c1e7e77d0a5c48bad62b360")); map.put(1, HashCode.fromString("9bc1b2a288b26af7257a36277ae3816a7d4f16e89c1e7e77d0a5c48bad62b360")); HashCode treehash = TreeHash.buildTreeHashFromMap(map.build()); - assertEquals(treehash, HashCode.fromString("560c2c9333c719cb00cfdffee3ba293db17f58743cdd1f7e4055373ae6300afa")); + assertThat(treehash).isEqualTo(HashCode.fromString("560c2c9333c719cb00cfdffee3ba293db17f58743cdd1f7e4055373ae6300afa")); } }
