Repository: jclouds Updated Branches: refs/heads/master 5cc3b243f -> 58612bc47
Expand pagination test and enable for Atmos Tested against atmos, aws-s3, azureblob, filesystem, google-cloud-storage, rackspace-cloudfiles-us, and transient. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/58612bc4 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/58612bc4 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/58612bc4 Branch: refs/heads/master Commit: 58612bc473dece150ec74e0116270f2d09b2b322 Parents: 5cc3b24 Author: Andrew Gaul <[email protected]> Authored: Mon Jan 12 17:25:44 2015 -0800 Committer: Andrew Gaul <[email protected]> Committed: Mon Jan 12 17:43:42 2015 -0800 ---------------------------------------------------------------------- .../AtmosContainerIntegrationLiveTest.java | 4 ---- .../internal/BaseContainerIntegrationTest.java | 18 +++++++++++++++--- 2 files changed, 15 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/58612bc4/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/integration/AtmosContainerIntegrationLiveTest.java ---------------------------------------------------------------------- diff --git a/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/integration/AtmosContainerIntegrationLiveTest.java b/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/integration/AtmosContainerIntegrationLiveTest.java index ed7d2d6..29e5e76 100644 --- a/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/integration/AtmosContainerIntegrationLiveTest.java +++ b/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/integration/AtmosContainerIntegrationLiveTest.java @@ -29,10 +29,6 @@ public class AtmosContainerIntegrationLiveTest extends BaseContainerIntegrationT public AtmosContainerIntegrationLiveTest() { provider = "atmos"; } - @Override - public void testListContainerMaxResults() throws InterruptedException { - // Not currently working - } @Override public void testListContainerMarker() throws InterruptedException { http://git-wip-us.apache.org/repos/asf/jclouds/blob/58612bc4/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java index f963ffc..6e3332e 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java @@ -41,6 +41,7 @@ import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.domain.BlobMetadata; import org.jclouds.blobstore.domain.PageSet; import org.jclouds.blobstore.domain.StorageMetadata; +import org.jclouds.blobstore.options.ListContainerOptions; import org.testng.annotations.Test; import com.google.common.collect.ImmutableMap; @@ -296,9 +297,20 @@ public class BaseContainerIntegrationTest extends BaseBlobStoreIntegrationTest { try { addAlphabetUnderRoot(containerName); - PageSet<? extends StorageMetadata> container = view.getBlobStore().list(containerName, maxResults(5)); - assertEquals(container.size(), 5); - assert container.getNextMarker() != null; + PageSet<? extends StorageMetadata> container; + ListContainerOptions options = maxResults(10); + + container = view.getBlobStore().list(containerName, options); + assertThat(container).hasSize(10); + assertThat(container.getNextMarker()).isNotNull(); + + container = view.getBlobStore().list(containerName, options.afterMarker(container.getNextMarker())); + assertThat(container).hasSize(10); + assertThat(container.getNextMarker()).isNotNull(); + + container = view.getBlobStore().list(containerName, options.afterMarker(container.getNextMarker())); + assertThat(container).hasSize(6); + assertThat(container.getNextMarker()).isNull(); } finally { returnContainer(containerName); }
