Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove disposition checks from testFileGetParallel 

Some providers like B2 do not support Content-Disposition and other
tests exercise this functionality.
This commit is contained in:
Andrew Gaul 2016-06-01 16:15:47 -07:00
parent 5a85f5b5f9
commit 421764dfd1
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
View File

@ -167,12 +167,11 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
@Test(groups = { "integration", "live" }) @Test(groups = { "integration", "live" })
public void testFileGetParallel() throws Exception { public void testFileGetParallel() throws Exception {
final ByteSource supplier = createTestInput(32 * 1024); final ByteSource supplier = createTestInput(32 * 1024);
final String expectedContentDisposition = "attachment; filename=constit.txt";
final String container = getContainerName(); final String container = getContainerName();
try { try {
final String name = "constitution.txt"; final String name = "constitution.txt";
uploadByteSource(container, name, expectedContentDisposition, supplier); uploadByteSource(container, name, supplier);
Map<Integer, ListenableFuture<?>> responses = Maps.newHashMap(); Map<Integer, ListenableFuture<?>> responses = Maps.newHashMap();
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
responses.put(i, this.exec.submit(new Callable<Void>() { responses.put(i, this.exec.submit(new Callable<Void>() {
@ -181,7 +180,6 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
Blob blob = view.getBlobStore().getBlob(container, name); Blob blob = view.getBlobStore().getBlob(container, name);
validateMetadata(blob.getMetadata(), container, name); validateMetadata(blob.getMetadata(), container, name);
assertEquals(hashAndClose(blob.getPayload().openStream(), md5()), supplier.hash(md5())); assertEquals(hashAndClose(blob.getPayload().openStream(), md5()), supplier.hash(md5()));
checkContentDisposition(blob, expectedContentDisposition);
} catch (IOException e) { } catch (IOException e) {
Throwables.propagate(e); Throwables.propagate(e);
} }
@ -201,15 +199,13 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
} }
private void uploadByteSource(String container, String name, String contentDisposition, private void uploadByteSource(String container, String name, ByteSource byteSource) throws IOException {
ByteSource byteSource) throws IOException {
BlobStore blobStore = view.getBlobStore(); BlobStore blobStore = view.getBlobStore();
blobStore.putBlob(container, blobStore.blobBuilder(name) blobStore.putBlob(container, blobStore.blobBuilder(name)
.payload(new ByteSourcePayload(byteSource)) .payload(new ByteSourcePayload(byteSource))
.contentType("text/plain") .contentType("text/plain")
.contentMD5(byteSource.hash(md5())) .contentMD5(byteSource.hash(md5()))
.contentLength(byteSource.size()) .contentLength(byteSource.size())
.contentDisposition(contentDisposition)
.build()); .build());
} }