Change test to make sure contentDisposition is not null

This commit is contained in:
Jason King 2011-10-20 10:47:54 +01:00
parent 1a3ae0c242
commit b92d55bc05
1 changed files with 5 additions and 7 deletions

View File

@ -38,18 +38,16 @@ public class SwiftBlobIntegrationLiveTest extends BaseBlobIntegrationTest {
// not supported in swift // not supported in swift
} }
// not supported in swift // When testing against Swift Server 1.4.4/SWauth 1.0.3 the content dispositions are not null
@Override @Override
protected void checkContentDisposition(Blob blob, String contentDisposition) { protected void checkContentDisposition(Blob blob, String contentDisposition) {
String payloadContentDisposition = blob.getPayload().getContentMetadata().getContentDisposition(); String payloadContentDisposition = blob.getPayload().getContentMetadata().getContentDisposition();
if (payloadContentDisposition!=null) { assert payloadContentDisposition != null : "blob payload contentDisposition should not be null";
assertEquals(contentDisposition, payloadContentDisposition); assertEquals(contentDisposition, payloadContentDisposition);
}
String blobContentDisposition = blob.getMetadata().getContentMetadata().getContentDisposition(); String blobContentDisposition = blob.getMetadata().getContentMetadata().getContentDisposition();
if (payloadContentDisposition!=null) { assert blobContentDisposition != null : "blob metadata contentDisposition should not be null";
assertEquals(contentDisposition, blobContentDisposition); assertEquals(contentDisposition, blobContentDisposition);
}
} }
// not supported in swift // not supported in swift