Expand pagination test and enable for Atmos

Tested against atmos, aws-s3, azureblob, filesystem,
google-cloud-storage, rackspace-cloudfiles-us, and transient.
This commit is contained in:
Andrew Gaul 2015-01-12 17:25:44 -08:00
parent 5cc3b243fc
commit 58612bc473
2 changed files with 15 additions and 7 deletions

View File

@ -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 {

View File

@ -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);
}