Repository: jclouds-labs-aws Updated Branches: refs/heads/master 17249cf73 -> 405a6d566
Use assertj fluent assertions where appropriate This commit demonstrates a few instances where assertj yields more informative error messages than testng assertEquals and assertTrue. Note that we could replace all testng asserts with assertj. 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/405a6d56 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/tree/405a6d56 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/diff/405a6d56 Branch: refs/heads/master Commit: 405a6d56687a955bcf0a95e41d7052d994b2c38c Parents: 17249cf Author: Andrew Gaul <[email protected]> Authored: Sun Jun 29 12:33:40 2014 -0700 Committer: Andrew Gaul <[email protected]> Committed: Mon Jun 30 19:07:50 2014 -0700 ---------------------------------------------------------------------- glacier/pom.xml | 6 ++++++ .../jclouds/glacier/GlacierClientLiveTest.java | 18 ++++++++++-------- .../jclouds/glacier/GlacierClientMockTest.java | 5 +++-- 3 files changed, 19 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/405a6d56/glacier/pom.xml ---------------------------------------------------------------------- diff --git a/glacier/pom.xml b/glacier/pom.xml index 6c532b6..84a5250 100644 --- a/glacier/pom.xml +++ b/glacier/pom.xml @@ -89,6 +89,12 @@ <artifactId>mockwebserver</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <version>1.6.1</version> + <scope>test</scope> + </dependency> </dependencies> <profiles> http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/405a6d56/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 a5142b1..970470e 100644 --- a/glacier/src/test/java/org/jclouds/glacier/GlacierClientLiveTest.java +++ b/glacier/src/test/java/org/jclouds/glacier/GlacierClientLiveTest.java @@ -16,9 +16,9 @@ */ 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.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; @@ -65,21 +65,23 @@ public class GlacierClientLiveTest extends BaseApiLiveTest<GlacierClient>{ String path = api.createVault(VAULT_NAME1).toString(); api.createVault(VAULT_NAME2); api.createVault(VAULT_NAME3); - assertTrue(path.contains("https://glacier.us-east-1.amazonaws.com/";)); - assertTrue(path.contains("/vaults/" + VAULT_NAME1)); + assertThat(path) + .contains("https://glacier.us-east-1.amazonaws.com/";) + .contains("/vaults/" + VAULT_NAME1); } @Test(groups = { "integration", "live" }, dependsOnMethods = { "testCreateVault" }) public void testListAndDescribeVaults() throws Exception { PaginatedVaultCollection vaults = api.listVaults(); - assertTrue(vaults.contains(api.describeVault(VAULT_NAME1))); - assertTrue(vaults.contains(api.describeVault(VAULT_NAME2))); - assertTrue(vaults.contains(api.describeVault(VAULT_NAME3))); + assertThat(vaults).containsAll(ImmutableList.of( + api.describeVault(VAULT_NAME1), + api.describeVault(VAULT_NAME2), + api.describeVault(VAULT_NAME3))); } @Test(groups = { "integration", "live" }, dependsOnMethods = { "testCreateVault" }) public void testListMultipartUploadsWithEmptyList() throws Exception { - assertEquals(api.listMultipartUploads(VAULT_NAME1).size(), 0); + assertThat(api.listMultipartUploads(VAULT_NAME1)).hasSize(0); } @Test(groups = { "integration", "live" }, dependsOnMethods = { "testListMultipartUploadsWithEmptyList" }) @@ -104,7 +106,7 @@ public class GlacierClientLiveTest extends BaseApiLiveTest<GlacierClient>{ for (MultipartUploadMetadata upload : uploads) { list.add(upload.getMultipartUploadId()); } - assertTrue(list.build().contains(uploadId)); + assertThat(list.build()).contains(uploadId); assertTrue(api.abortMultipartUpload(VAULT_NAME1, uploadId)); } finally { api.abortMultipartUpload(VAULT_NAME1, uploadId); http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/405a6d56/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 c23818a..b679b44 100644 --- a/glacier/src/test/java/org/jclouds/glacier/GlacierClientMockTest.java +++ b/glacier/src/test/java/org/jclouds/glacier/GlacierClientMockTest.java @@ -18,6 +18,7 @@ package org.jclouds.glacier; import static com.google.common.base.Charsets.UTF_8; import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor; +import static org.assertj.core.api.Assertions.assertThat; import static org.jclouds.Constants.PROPERTY_MAX_RETRIES; import static org.jclouds.Constants.PROPERTY_SO_TIMEOUT; import static org.jclouds.glacier.util.TestUtils.MiB; @@ -198,7 +199,7 @@ public class GlacierClientMockTest { mr.addHeader(HttpHeaders.CONTENT_LENGTH, mr.getBody().length); server.enqueue(mr); - assertTrue(client.listVaults().isEmpty()); + assertThat(client.listVaults()).isEmpty(); } @Test @@ -382,7 +383,7 @@ public class GlacierClientMockTest { mr.addHeader(HttpHeaders.CONTENT_LENGTH, mr.getBody().length); server.enqueue(mr); - assertEquals(client.listMultipartUploads(VAULT_NAME, PaginationOptions.Builder.limit(1).marker(MARKER)).size(), 0); + 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); }
