From 6d56364cd0b0ce7803143301d958ef810013b3bf Mon Sep 17 00:00:00 2001 From: Jason King Date: Fri, 21 Oct 2011 16:15:41 +0100 Subject: [PATCH] call super and added comment --- .../integration/SwiftBlobIntegrationLiveTest.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/integration/SwiftBlobIntegrationLiveTest.java b/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/integration/SwiftBlobIntegrationLiveTest.java index a16b4c6825..186e54df45 100644 --- a/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/integration/SwiftBlobIntegrationLiveTest.java +++ b/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/integration/SwiftBlobIntegrationLiveTest.java @@ -38,16 +38,12 @@ public class SwiftBlobIntegrationLiveTest extends BaseBlobIntegrationTest { // not supported in swift } - // When testing against Swift Server 1.4.4/SWauth 1.0.3 the content dispositions are not null + @Override protected void checkContentDisposition(Blob blob, String contentDisposition) { - String payloadContentDisposition = blob.getPayload().getContentMetadata().getContentDisposition(); - assert payloadContentDisposition != null : "blob payload contentDisposition should not be null"; - assertEquals(contentDisposition, payloadContentDisposition); - - String blobContentDisposition = blob.getMetadata().getContentMetadata().getContentDisposition(); - assert blobContentDisposition != null : "blob metadata contentDisposition should not be null"; - assertEquals(contentDisposition, blobContentDisposition); + // This works for Swift Server 1.4.4/SWauth 1.0.3 but was null in previous versions. + // TODO: Better testing for the different versions. + super.checkContentDisposition(blob,contentDisposition); } // not supported in swift