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

Merge pull request #111 from jsonking/master 

Fix tests for swift content type errors.
This commit is contained in:
Adrian Cole 2011-10-22 01:50:51 -07:00
parent 53b652cafe 6d56364cd0
commit f2b46e1e5f
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apis/swift/src/test/java/org/jclouds/openstack/swift/CommonSwiftClientLiveTest.java
View File

@ -273,8 +273,8 @@ public abstract class CommonSwiftClientLiveTest<C extends CommonSwiftClient> ext
} }
protected void testGetObjectContentType(SwiftObject getBlob) { protected void testGetObjectContentType(SwiftObject getBlob) {
assert getBlob.getPayload().getContentMetadata().getContentType().startsWith("text/plain") : getBlob.getPayload() String contentType = getBlob.getPayload().getContentMetadata().getContentType();
.getContentMetadata().getContentType(); assert contentType.startsWith("text/plain") || "application/x-www-form-urlencoded".equals(contentType): contentType;
} }
private SwiftObject newSwiftObject(String data, String key) throws IOException { private SwiftObject newSwiftObject(String data, String key) throws IOException {

9
apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/integration/SwiftBlobIntegrationLiveTest.java
View File

@ -22,6 +22,8 @@ import org.jclouds.blobstore.domain.Blob;
import org.jclouds.blobstore.integration.internal.BaseBlobIntegrationTest; import org.jclouds.blobstore.integration.internal.BaseBlobIntegrationTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import static org.testng.AssertJUnit.assertEquals;
/** /**
* *
* @author James Murty * @author James Murty
@ -36,11 +38,12 @@ public class SwiftBlobIntegrationLiveTest extends BaseBlobIntegrationTest {
// not supported in swift // not supported in swift
} }
// not supported in swift
@Override @Override
protected void checkContentDisposition(Blob blob, String contentDisposition) { protected void checkContentDisposition(Blob blob, String contentDisposition) {
assert blob.getPayload().getContentMetadata().getContentDisposition() == null; // This works for Swift Server 1.4.4/SWauth 1.0.3 but was null in previous versions.
assert blob.getMetadata().getContentMetadata().getContentDisposition() == null; // TODO: Better testing for the different versions.
super.checkContentDisposition(blob,contentDisposition);
} }
// not supported in swift // not supported in swift