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

fixed integration test classes and demoted scaleup-storage to sandbox

This commit is contained in:
Adrian Cole 2011-01-26 23:52:26 -08:00
parent 02fffda058
commit 094ed5c25c
71 changed files with 227 additions and 336 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README.txt
View File

@ -44,14 +44,15 @@ our compute api supports: aws-ec2, gogrid, cloudservers (generic), cloudservers-
our blobstore api supports: aws-s3, cloudfiles (generic), cloudfiles-us, cloudfiles-uk, our blobstore api supports: aws-s3, cloudfiles (generic), cloudfiles-us, cloudfiles-uk,
azureblob, atmos (generic), synaptic-storage, azureblob, atmos (generic), synaptic-storage,
cloudonestorage, s3 (generic), walrus(generic), googlestorage, cloudonestorage, s3 (generic), walrus(generic), googlestorage,
scaleup-storage, eucalyptus-partnercloud-s3, swift (generic), eucalyptus-partnercloud-s3, swift (generic), transient (in-mem),
transient (in-mem), filesystem (on-disk) filesystem (on-disk)
* note * the pom dependency org.jclouds/jclouds-allblobstore gives you access to * note * the pom dependency org.jclouds/jclouds-allblobstore gives you access to
to all of these providers to all of these providers
we also have support for: ibmdev, mezeo, nirvanix, boxdotnet, rimuhosting, openstack nova, we also have support for: ibmdev, mezeo, nirvanix, boxdotnet, rimuhosting, openstack nova,
azurequeue, simpledb as well a number of features the sandbox azurequeue, simpledb, scaleup-storage as well as a async-http-client
driver in the sandbox
If you want access to all jclouds components, include the maven dependency org.jclouds/jclouds-all If you want access to all jclouds components, include the maven dependency org.jclouds/jclouds-all

5
allblobstore/pom.xml
View File

@ -49,11 +49,6 @@
<artifactId>synaptic-storage</artifactId> <artifactId>synaptic-storage</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.jclouds.provider</groupId>
<artifactId>scaleup-storage</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.jclouds.provider</groupId> <groupId>org.jclouds.provider</groupId>
<artifactId>cloudonestorage</artifactId> <artifactId>cloudonestorage</artifactId>

66
apis/s3/src/test/java/org/jclouds/s3/S3ClientLiveTest.java
View File

@ -117,8 +117,7 @@ public class S3ClientLiveTest extends BaseBlobStoreIntegrationTest {
validateContent(destinationContainer, destinationKey); validateContent(destinationContainer, destinationKey);
URL url = new URL(String.format("http://%1$s.s3.amazonaws.com/%2$s", destinationContainer, URL url = new URL(String.format("http://%1$s.s3.amazonaws.com/%2$s", destinationContainer, destinationKey));
destinationKey));
Strings2.toStringAndClose(url.openStream()); Strings2.toStringAndClose(url.openStream());
} finally { } finally {
@ -130,8 +129,7 @@ public class S3ClientLiveTest extends BaseBlobStoreIntegrationTest {
String sourceKey = "apples"; String sourceKey = "apples";
String destinationKey = "pears"; String destinationKey = "pears";
public void testPublicWriteOnObject() throws InterruptedException, ExecutionException, public void testPublicWriteOnObject() throws InterruptedException, ExecutionException, TimeoutException, IOException {
TimeoutException, IOException {
final String publicReadWriteObjectKey = "public-read-write-acl"; final String publicReadWriteObjectKey = "public-read-write-acl";
final String containerName = getContainerName(); final String containerName = getContainerName();
try { try {
@ -139,14 +137,14 @@ public class S3ClientLiveTest extends BaseBlobStoreIntegrationTest {
object.getMetadata().setKey(publicReadWriteObjectKey); object.getMetadata().setKey(publicReadWriteObjectKey);
object.setPayload(""); object.setPayload("");
// Public Read-Write object // Public Read-Write object
getApi().putObject(containerName, object, getApi()
new PutObjectOptions().withAcl(CannedAccessPolicy.PUBLIC_READ_WRITE)); .putObject(containerName, object,
new PutObjectOptions().withAcl(CannedAccessPolicy.PUBLIC_READ_WRITE));
assertConsistencyAware(new Runnable() { assertConsistencyAware(new Runnable() {
public void run() { public void run() {
try { try {
AccessControlList acl = getApi().getObjectACL(containerName, AccessControlList acl = getApi().getObjectACL(containerName, publicReadWriteObjectKey);
publicReadWriteObjectKey);
assertEquals(acl.getGrants().size(), 3); assertEquals(acl.getGrants().size(), 3);
assertEquals(acl.getPermissions(GroupGranteeURI.ALL_USERS).size(), 2); assertEquals(acl.getPermissions(GroupGranteeURI.ALL_USERS).size(), 2);
assertTrue(acl.getOwner() != null); assertTrue(acl.getOwner() != null);
@ -168,8 +166,7 @@ public class S3ClientLiveTest extends BaseBlobStoreIntegrationTest {
} }
public void testUpdateObjectACL() throws InterruptedException, ExecutionException, public void testUpdateObjectACL() throws InterruptedException, ExecutionException, TimeoutException, IOException {
TimeoutException, IOException {
String containerName = getContainerName(); String containerName = getContainerName();
try { try {
String objectKey = "private-acl"; String objectKey = "private-acl";
@ -214,8 +211,8 @@ public class S3ClientLiveTest extends BaseBlobStoreIntegrationTest {
} }
public void testPrivateAclIsDefaultForObject() throws InterruptedException, ExecutionException, public void testPrivateAclIsDefaultForObject() throws InterruptedException, ExecutionException, TimeoutException,
TimeoutException, IOException { IOException {
String privateObjectKey = "private-acl"; String privateObjectKey = "private-acl";
String containerName = getContainerName(); String containerName = getContainerName();
try { try {
@ -233,16 +230,14 @@ public class S3ClientLiveTest extends BaseBlobStoreIntegrationTest {
} }
public void testPublicReadOnObject() throws InterruptedException, ExecutionException, public void testPublicReadOnObject() throws InterruptedException, ExecutionException, TimeoutException, IOException {
TimeoutException, IOException {
final String publicReadObjectKey = "public-read-acl"; final String publicReadObjectKey = "public-read-acl";
final String containerName = getContainerName(); final String containerName = getContainerName();
try { try {
S3Object object = getApi().newS3Object(); S3Object object = getApi().newS3Object();
object.getMetadata().setKey(publicReadObjectKey); object.getMetadata().setKey(publicReadObjectKey);
object.setPayload(""); object.setPayload("");
getApi().putObject(containerName, object, getApi().putObject(containerName, object, new PutObjectOptions().withAcl(CannedAccessPolicy.PUBLIC_READ));
new PutObjectOptions().withAcl(CannedAccessPolicy.PUBLIC_READ));
assertConsistencyAware(new Runnable() { assertConsistencyAware(new Runnable() {
public void run() { public void run() {
@ -275,8 +270,8 @@ public class S3ClientLiveTest extends BaseBlobStoreIntegrationTest {
return getApi().putObject(sourceContainer, sourceObject); return getApi().putObject(sourceContainer, sourceObject);
} }
protected S3Object validateObject(String sourceContainer, String key) protected S3Object validateObject(String sourceContainer, String key) throws InterruptedException,
throws InterruptedException, ExecutionException, TimeoutException, IOException { ExecutionException, TimeoutException, IOException {
assertConsistencyAwareContainerSize(sourceContainer, 1); assertConsistencyAwareContainerSize(sourceContainer, 1);
S3Object newObject = getApi().getObject(sourceContainer, key); S3Object newObject = getApi().getObject(sourceContainer, key);
assert newObject != null; assert newObject != null;
@ -298,7 +293,8 @@ public class S3ClientLiveTest extends BaseBlobStoreIntegrationTest {
S3Object newObject = validateObject(containerName, key); S3Object newObject = validateObject(containerName, key);
assertEquals(newObject.getMetadata().getCacheControl(), "no-cache"); assert (newObject.getMetadata().getCacheControl().indexOf("no-cache") != -1) : newObject.getMetadata()
.getCacheControl();
assertEquals(newObject.getMetadata().getContentMetadata().getContentDisposition(), assertEquals(newObject.getMetadata().getContentMetadata().getContentDisposition(),
"attachment; filename=hello.txt"); "attachment; filename=hello.txt");
} finally { } finally {
@ -342,16 +338,15 @@ public class S3ClientLiveTest extends BaseBlobStoreIntegrationTest {
} }
} }
protected String addToContainerAndValidate(String containerName, String sourceKey) protected String addToContainerAndValidate(String containerName, String sourceKey) throws InterruptedException,
throws InterruptedException, ExecutionException, TimeoutException, IOException { ExecutionException, TimeoutException, IOException {
String etag = addBlobToContainer(containerName, sourceKey); String etag = addBlobToContainer(containerName, sourceKey);
validateContent(containerName, sourceKey); validateContent(containerName, sourceKey);
return etag; return etag;
} }
// TODO: fails on linux and windows // TODO: fails on linux and windows
public void testCopyIfModifiedSince() throws InterruptedException, ExecutionException, public void testCopyIfModifiedSince() throws InterruptedException, ExecutionException, TimeoutException, IOException {
TimeoutException, IOException {
String containerName = getContainerName(); String containerName = getContainerName();
String destinationContainer = getContainerName(); String destinationContainer = getContainerName();
try { try {
@ -359,13 +354,13 @@ public class S3ClientLiveTest extends BaseBlobStoreIntegrationTest {
addToContainerAndValidate(containerName, sourceKey + "mod"); addToContainerAndValidate(containerName, sourceKey + "mod");
Date after = new Date(System.currentTimeMillis() + 1000); Date after = new Date(System.currentTimeMillis() + 1000);
getApi().copyObject(containerName, sourceKey + "mod", destinationContainer, getApi().copyObject(containerName, sourceKey + "mod", destinationContainer, destinationKey,
destinationKey, ifSourceModifiedSince(before)); ifSourceModifiedSince(before));
validateContent(destinationContainer, destinationKey); validateContent(destinationContainer, destinationKey);
try { try {
getApi().copyObject(containerName, sourceKey + "mod", destinationContainer, getApi().copyObject(containerName, sourceKey + "mod", destinationContainer, destinationKey,
destinationKey, ifSourceModifiedSince(after)); ifSourceModifiedSince(after));
} catch (HttpResponseException ex) { } catch (HttpResponseException ex) {
assertEquals(ex.getResponse().getStatusCode(), 412); assertEquals(ex.getResponse().getStatusCode(), 412);
} }
@ -377,8 +372,8 @@ public class S3ClientLiveTest extends BaseBlobStoreIntegrationTest {
} }
// TODO: fails on linux and windows // TODO: fails on linux and windows
public void testCopyIfUnmodifiedSince() throws InterruptedException, ExecutionException, public void testCopyIfUnmodifiedSince() throws InterruptedException, ExecutionException, TimeoutException,
TimeoutException, IOException { IOException {
String containerName = getContainerName(); String containerName = getContainerName();
String destinationContainer = getContainerName(); String destinationContainer = getContainerName();
try { try {
@ -391,8 +386,8 @@ public class S3ClientLiveTest extends BaseBlobStoreIntegrationTest {
validateContent(destinationContainer, destinationKey); validateContent(destinationContainer, destinationKey);
try { try {
getApi().copyObject(containerName, sourceKey + "un", destinationContainer, getApi().copyObject(containerName, sourceKey + "un", destinationContainer, destinationKey,
destinationKey, ifSourceModifiedSince(before)); ifSourceModifiedSince(before));
} catch (HttpResponseException ex) { } catch (HttpResponseException ex) {
assertEquals(ex.getResponse().getStatusCode(), 412); assertEquals(ex.getResponse().getStatusCode(), 412);
} }
@ -402,8 +397,7 @@ public class S3ClientLiveTest extends BaseBlobStoreIntegrationTest {
} }
} }
public void testCopyIfMatch() throws InterruptedException, ExecutionException, TimeoutException, public void testCopyIfMatch() throws InterruptedException, ExecutionException, TimeoutException, IOException {
IOException {
String containerName = getContainerName(); String containerName = getContainerName();
String destinationContainer = getContainerName(); String destinationContainer = getContainerName();
try { try {
@ -425,8 +419,7 @@ public class S3ClientLiveTest extends BaseBlobStoreIntegrationTest {
} }
} }
public void testCopyIfNoneMatch() throws IOException, InterruptedException, ExecutionException, public void testCopyIfNoneMatch() throws IOException, InterruptedException, ExecutionException, TimeoutException {
TimeoutException {
String containerName = getContainerName(); String containerName = getContainerName();
String destinationContainer = getContainerName(); String destinationContainer = getContainerName();
try { try {
@ -448,8 +441,7 @@ public class S3ClientLiveTest extends BaseBlobStoreIntegrationTest {
} }
} }
public void testCopyWithMetadata() throws InterruptedException, ExecutionException, public void testCopyWithMetadata() throws InterruptedException, ExecutionException, TimeoutException, IOException {
TimeoutException, IOException {
String containerName = getContainerName(); String containerName = getContainerName();
String destinationContainer = getContainerName(); String destinationContainer = getContainerName();
try { try {

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

@ -34,17 +34,17 @@ public class SwiftBlobIntegrationLiveTest extends BaseBlobIntegrationTest {
@Override @Override
@Test(enabled = false) @Test(enabled = false)
public void testGetTwoRanges() { public void testGetTwoRanges() {
// not supported in cloud files // not supported in swift
} }
// not supported // 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; assert blob.getPayload().getContentMetadata().getContentDisposition() == null;
assert blob.getMetadata().getContentMetadata().getContentDisposition() == null; assert blob.getMetadata().getContentMetadata().getContentDisposition() == null;
} }
// not supported // not supported in swift
@Override @Override
protected void checkContentLanguage(Blob blob, String contentLanguage) { protected void checkContentLanguage(Blob blob, String contentLanguage) {
assert blob.getPayload().getContentMetadata().getContentLanguage() == null; assert blob.getPayload().getContentMetadata().getContentLanguage() == null;

13
apis/swift/src/test/resources/log4j.xml
View File

@ -106,15 +106,18 @@
<appender-ref ref="ASYNCWIRE" /> <appender-ref ref="ASYNCWIRE" />
</category> </category>
<category name="jclouds.wire"> <!--
<priority value="DEBUG" /> NOTE!! enabling this logger will cause the following test to
<appender-ref ref="ASYNCWIRE" /> fail BaseBlobIntegrationTest.testPutObjectStream <category
</category> name="jclouds.wire"> <priority value="DEBUG" /> <appender-ref
ref="ASYNCWIRE" /> </category>
-->
<category name="jclouds.blobstore"> <category name="jclouds.blobstore">
<priority value="DEBUG" /> <priority value="DEBUG" />
<appender-ref ref="ASYNCBLOBSTORE" /> <appender-ref ref="ASYNCBLOBSTORE" />
</category> </category>
<!-- ======================= --> <!-- ======================= -->
<!-- Setup the Root category --> <!-- Setup the Root category -->
<!-- ======================= --> <!-- ======================= -->

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

@ -513,7 +513,6 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
.getPayload().getContentMetadata().getContentLanguage(); .getPayload().getContentMetadata().getContentLanguage();
assert blob.getMetadata().getContentMetadata().getContentLanguage().startsWith(contentLanguage) : blob assert blob.getMetadata().getContentMetadata().getContentLanguage().startsWith(contentLanguage) : blob
.getMetadata().getContentMetadata().getContentLanguage(); .getMetadata().getContentMetadata().getContentLanguage();
} }
protected volatile static Crypto crypto; protected volatile static Crypto crypto;

23
blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobMapIntegrationTest.java
View File

@ -19,6 +19,7 @@
package org.jclouds.blobstore.integration.internal; package org.jclouds.blobstore.integration.internal;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.jclouds.blobstore.options.ListContainerOptions.Builder.maxResults; import static org.jclouds.blobstore.options.ListContainerOptions.Builder.maxResults;
import static org.jclouds.blobstore.util.BlobStoreUtils.getContentAsStringOrNullAndClose; import static org.jclouds.blobstore.util.BlobStoreUtils.getContentAsStringOrNullAndClose;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
@ -68,8 +69,7 @@ public abstract class BaseBlobMapIntegrationTest extends BaseMapIntegrationTest<
blobsAsString.add(getContentAsStringOrNullAndClose(blob)); blobsAsString.add(getContentAsStringOrNullAndClose(blob));
} }
blobsAsString.removeAll(fiveStrings.values()); blobsAsString.removeAll(fiveStrings.values());
assert blobsAsString.size() == 0 : blobsAsString.size() + ": " + blobs + ": " assert blobsAsString.size() == 0 : blobsAsString.size() + ": " + blobs + ": " + blobsAsString;
+ blobsAsString;
} finally { } finally {
returnContainer(bucketName); returnContainer(bucketName);
} }
@ -91,8 +91,8 @@ public abstract class BaseBlobMapIntegrationTest extends BaseMapIntegrationTest<
} }
} }
private void assertConsistencyAwareContentEquals(final Map<String, Blob> map, final String key, private void assertConsistencyAwareContentEquals(final Map<String, Blob> map, final String key, final String blob)
final String blob) throws InterruptedException { throws InterruptedException {
assertConsistencyAware(new Runnable() { assertConsistencyAware(new Runnable() {
public void run() { public void run() {
Blob old = map.remove(key); Blob old = map.remove(key);
@ -116,8 +116,7 @@ public abstract class BaseBlobMapIntegrationTest extends BaseMapIntegrationTest<
Set<Entry<String, Blob>> entries = map.entrySet(); Set<Entry<String, Blob>> entries = map.entrySet();
assertEquals(entries.size(), 5); assertEquals(entries.size(), 5);
for (Entry<String, Blob> entry : entries) { for (Entry<String, Blob> entry : entries) {
assertEquals(fiveStrings.get(entry.getKey()), getContentAsStringOrNullAndClose(entry assertEquals(fiveStrings.get(entry.getKey()), getContentAsStringOrNullAndClose(entry.getValue()));
.getValue()));
Blob blob = entry.getValue(); Blob blob = entry.getValue();
blob.setPayload(""); blob.setPayload("");
Payloads.calculateMD5(blob); Payloads.calculateMD5(blob);
@ -155,16 +154,15 @@ public abstract class BaseBlobMapIntegrationTest extends BaseMapIntegrationTest<
} }
} }
void getOneReturnsAppleAndOldValueIsNull(Map<String, Blob> map, Blob old) throws IOException, void getOneReturnsAppleAndOldValueIsNull(Map<String, Blob> map, Blob old) throws IOException, InterruptedException {
InterruptedException {
assert old == null; assert old == null;
assertEquals(getContentAsStringOrNullAndClose(map.get("one")), "apple"); assertEquals(getContentAsStringOrNullAndClose(map.get("one")), "apple");
assertConsistencyAwareMapSize(map, 1); assertConsistencyAwareMapSize(map, 1);
} }
void getOneReturnsBearAndOldValueIsApple(Map<String, Blob> map, Blob oldValue) void getOneReturnsBearAndOldValueIsApple(Map<String, Blob> map, Blob oldValue) throws IOException,
throws IOException, InterruptedException { InterruptedException {
assertEquals(getContentAsStringOrNullAndClose(map.get("one")), "bear"); assertEquals(getContentAsStringOrNullAndClose(checkNotNull(map.get("one"), "one")), "bear");
assertEquals(getContentAsStringOrNullAndClose(oldValue), "apple"); assertEquals(getContentAsStringOrNullAndClose(oldValue), "apple");
assertConsistencyAwareMapSize(map, 1); assertConsistencyAwareMapSize(map, 1);
} }
@ -210,8 +208,7 @@ public abstract class BaseBlobMapIntegrationTest extends BaseMapIntegrationTest<
} }
@Test(groups = { "integration", "live" }) @Test(groups = { "integration", "live" })
public void testPutMoreThanSingleListing() throws InterruptedException, ExecutionException, public void testPutMoreThanSingleListing() throws InterruptedException, ExecutionException, TimeoutException {
TimeoutException {
if (maxResultsForTestListings() == 0) if (maxResultsForTestListings() == 0)
return; return;
String bucketName = getContainerName(); String bucketName = getContainerName();

40
blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseInputStreamMapIntegrationTest.java
View File

@ -19,6 +19,7 @@
package org.jclouds.blobstore.integration.internal; package org.jclouds.blobstore.integration.internal;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.jclouds.blobstore.options.ListContainerOptions.Builder.maxResults; import static org.jclouds.blobstore.options.ListContainerOptions.Builder.maxResults;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
@ -65,16 +66,14 @@ public abstract class BaseInputStreamMapIntegrationTest extends BaseMapIntegrati
valuesAsString.add(Strings2.toStringAndClose(stream)); valuesAsString.add(Strings2.toStringAndClose(stream));
} }
valuesAsString.removeAll(fiveStrings.values()); valuesAsString.removeAll(fiveStrings.values());
assert valuesAsString.size() == 0 : valuesAsString.size() + ": " + values + ": " assert valuesAsString.size() == 0 : valuesAsString.size() + ": " + values + ": " + valuesAsString;
+ valuesAsString;
} finally { } finally {
returnContainer(containerName); returnContainer(containerName);
} }
} }
@Test(groups = { "integration", "live" }) @Test(groups = { "integration", "live" })
public void testPutMoreThanSingleListing() throws InterruptedException, ExecutionException, public void testPutMoreThanSingleListing() throws InterruptedException, ExecutionException, TimeoutException {
TimeoutException {
String containerName = getContainerName(); String containerName = getContainerName();
try { try {
InputStreamMap map = createMap(context, containerName); InputStreamMap map = createMap(context, containerName);
@ -134,8 +133,8 @@ public abstract class BaseInputStreamMapIntegrationTest extends BaseMapIntegrati
entry.setValue(Strings2.toInputStream("")); entry.setValue(Strings2.toInputStream(""));
} }
assertConsistencyAwareMapSize(map, 5); assertConsistencyAwareMapSize(map, 5);
for (InputStream value : map.values()) { for (Entry<String, InputStream> entry : map.entrySet()) {
assertEquals(Strings2.toStringAndClose(value), ""); assertEquals(Strings2.toStringAndClose(checkNotNull(entry.getValue(), entry.getKey())), "");
} }
} finally { } finally {
returnContainer(containerName); returnContainer(containerName);
@ -143,8 +142,7 @@ public abstract class BaseInputStreamMapIntegrationTest extends BaseMapIntegrati
} }
@Test(groups = { "integration", "live" }) @Test(groups = { "integration", "live" })
public void testContainsStringValue() throws InterruptedException, ExecutionException, public void testContainsStringValue() throws InterruptedException, ExecutionException, TimeoutException {
TimeoutException {
String containerName = getContainerName(); String containerName = getContainerName();
try { try {
Map<String, InputStream> map = createMap(context, containerName); Map<String, InputStream> map = createMap(context, containerName);
@ -156,8 +154,7 @@ public abstract class BaseInputStreamMapIntegrationTest extends BaseMapIntegrati
} }
@Test(groups = { "integration", "live" }) @Test(groups = { "integration", "live" })
public void testContainsFileValue() throws InterruptedException, ExecutionException, public void testContainsFileValue() throws InterruptedException, ExecutionException, TimeoutException {
TimeoutException {
String containerName = getContainerName(); String containerName = getContainerName();
try { try {
Map<String, InputStream> map = createMap(context, containerName); Map<String, InputStream> map = createMap(context, containerName);
@ -169,8 +166,7 @@ public abstract class BaseInputStreamMapIntegrationTest extends BaseMapIntegrati
} }
@Test(groups = { "integration", "live" }) @Test(groups = { "integration", "live" })
public void testContainsInputStreamValue() throws InterruptedException, ExecutionException, public void testContainsInputStreamValue() throws InterruptedException, ExecutionException, TimeoutException {
TimeoutException {
String containerName = getContainerName(); String containerName = getContainerName();
try { try {
Map<String, InputStream> map = createMap(context, containerName); Map<String, InputStream> map = createMap(context, containerName);
@ -182,8 +178,7 @@ public abstract class BaseInputStreamMapIntegrationTest extends BaseMapIntegrati
} }
@Test(groups = { "integration", "live" }) @Test(groups = { "integration", "live" })
public void testContainsBytesValue() throws InterruptedException, ExecutionException, public void testContainsBytesValue() throws InterruptedException, ExecutionException, TimeoutException {
TimeoutException {
String containerName = getContainerName(); String containerName = getContainerName();
try { try {
Map<String, InputStream> map = createMap(context, containerName); Map<String, InputStream> map = createMap(context, containerName);
@ -269,16 +264,15 @@ public abstract class BaseInputStreamMapIntegrationTest extends BaseMapIntegrati
} }
} }
void getOneReturnsAppleAndOldValueIsNull(Map<String, InputStream> map, InputStream old) void getOneReturnsAppleAndOldValueIsNull(Map<String, InputStream> map, InputStream old) throws IOException,
throws IOException, InterruptedException { InterruptedException {
assert old == null; assert old == null;
assertEquals(Strings2.toStringAndClose(map.get("one")), String assertEquals(Strings2.toStringAndClose(map.get("one")), String.format(XML_STRING_FORMAT, "apple"));
.format(XML_STRING_FORMAT, "apple"));
assertConsistencyAwareMapSize(map, 1); assertConsistencyAwareMapSize(map, 1);
} }
void getOneReturnsBearAndOldValueIsApple(Map<String, InputStream> map, InputStream oldValue) void getOneReturnsBearAndOldValueIsApple(Map<String, InputStream> map, InputStream oldValue) throws IOException,
throws IOException, InterruptedException { InterruptedException {
assertEquals(Strings2.toStringAndClose(map.get("one")), String.format(XML_STRING_FORMAT, "bear")); assertEquals(Strings2.toStringAndClose(map.get("one")), String.format(XML_STRING_FORMAT, "bear"));
assertEquals(Strings2.toStringAndClose(oldValue), String.format(XML_STRING_FORMAT, "apple")); assertEquals(Strings2.toStringAndClose(oldValue), String.format(XML_STRING_FORMAT, "apple"));
assertConsistencyAwareMapSize(map, 1); assertConsistencyAwareMapSize(map, 1);
@ -330,8 +324,7 @@ public abstract class BaseInputStreamMapIntegrationTest extends BaseMapIntegrati
} }
@Override @Override
protected void putStringWithMD5(Map<String, InputStream> map, String key, String value) protected void putStringWithMD5(Map<String, InputStream> map, String key, String value) throws InterruptedException {
throws InterruptedException {
((InputStreamMap) map).putString(key, value); ((InputStreamMap) map).putString(key, value);
} }
@ -343,8 +336,7 @@ public abstract class BaseInputStreamMapIntegrationTest extends BaseMapIntegrati
return createMap(context, bucket, maxResults(maxResultsForTestListings())); return createMap(context, bucket, maxResults(maxResultsForTestListings()));
} }
protected InputStreamMap createMap(BlobStoreContext context, String bucket, protected InputStreamMap createMap(BlobStoreContext context, String bucket, ListContainerOptions options) {
ListContainerOptions options) {
return context.createInputStreamMap(bucket, options); return context.createInputStreamMap(bucket, options);
} }
} }

10
providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesUKClientLiveTest.java
View File

@ -19,7 +19,8 @@
package org.jclouds.rackspace.cloudfiles; package org.jclouds.rackspace.cloudfiles;
import org.jclouds.cloudfiles.CloudFilesClientLiveTest; import org.jclouds.cloudfiles.CloudFilesClient;
import org.jclouds.openstack.swift.CommonSwiftClientLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
@ -28,6 +29,11 @@ import org.testng.annotations.Test;
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", sequential = true, testName = "CloudFilesUKClientLiveTest") @Test(groups = "live", sequential = true, testName = "CloudFilesUKClientLiveTest")
public class CloudFilesUKClientLiveTest extends CloudFilesClientLiveTest { public class CloudFilesUKClientLiveTest extends CommonSwiftClientLiveTest<CloudFilesClient> {
// NOTE cloudfilesuk doesn't have cdn
@Override
public CloudFilesClient getApi() {
return (CloudFilesClient) context.getProviderSpecificContext().getApi();
}
} }

4
providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKBlobIntegrationLiveTest.java
View File

@ -19,14 +19,14 @@
package org.jclouds.rackspace.cloudfiles.blobstore.integration; package org.jclouds.rackspace.cloudfiles.blobstore.integration;
import org.jclouds.openstack.swift.blobstore.integration.SwiftBlobIntegrationLiveTest; import org.jclouds.cloudfiles.blobstore.integration.CloudFilesBlobIntegrationLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "CloudFilesUKBlobIntegrationLiveTest") @Test(groups = "live", testName = "CloudFilesUKBlobIntegrationLiveTest")
public class CloudFilesUKBlobIntegrationLiveTest extends SwiftBlobIntegrationLiveTest { public class CloudFilesUKBlobIntegrationLiveTest extends CloudFilesBlobIntegrationLiveTest {
} }

4
providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKBlobLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.rackspace.cloudfiles.blobstore.integration; package org.jclouds.rackspace.cloudfiles.blobstore.integration;
import org.jclouds.openstack.swift.blobstore.integration.SwiftBlobLiveTest; import org.jclouds.cloudfiles.blobstore.integration.CloudFilesBlobLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "CloudFilesUKBlobLiveTest") @Test(groups = "live", testName = "CloudFilesUKBlobLiveTest")
public class CloudFilesUKBlobLiveTest extends SwiftBlobLiveTest { public class CloudFilesUKBlobLiveTest extends CloudFilesBlobLiveTest {
} }

4
providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKBlobMapIntegrationLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.rackspace.cloudfiles.blobstore.integration; package org.jclouds.rackspace.cloudfiles.blobstore.integration;
import org.jclouds.openstack.swift.blobstore.integration.SwiftBlobMapIntegrationLiveTest; import org.jclouds.cloudfiles.blobstore.integration.CloudFilesBlobMapIntegrationLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "CloudFilesUKBlobMapIntegrationLiveTest") @Test(groups = "live", testName = "CloudFilesUKBlobMapIntegrationLiveTest")
public class CloudFilesUKBlobMapIntegrationLiveTest extends SwiftBlobMapIntegrationLiveTest { public class CloudFilesUKBlobMapIntegrationLiveTest extends CloudFilesBlobMapIntegrationLiveTest {
} }

4
providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKBlobSignerLiveTest.java
View File

@ -19,7 +19,7 @@
package org.jclouds.rackspace.cloudfiles.blobstore.integration; package org.jclouds.rackspace.cloudfiles.blobstore.integration;
import org.jclouds.openstack.swift.blobstore.integration.SwiftBlobSignerLiveTest; import org.jclouds.cloudfiles.blobstore.integration.CloudFilesBlobSignerLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
@ -27,6 +27,6 @@ import org.testng.annotations.Test;
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "CloudFilesUKBlobSignerLiveTest") @Test(groups = "live", testName = "CloudFilesUKBlobSignerLiveTest")
public class CloudFilesUKBlobSignerLiveTest extends SwiftBlobSignerLiveTest { public class CloudFilesUKBlobSignerLiveTest extends CloudFilesBlobSignerLiveTest {
} }

4
providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKContainerIntegrationLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.rackspace.cloudfiles.blobstore.integration; package org.jclouds.rackspace.cloudfiles.blobstore.integration;
import org.jclouds.openstack.swift.blobstore.integration.SwiftContainerIntegrationLiveTest; import org.jclouds.cloudfiles.blobstore.integration.CloudFilesContainerIntegrationLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "CloudFilesUKContainerIntegrationLiveTest") @Test(groups = "live", testName = "CloudFilesUKContainerIntegrationLiveTest")
public class CloudFilesUKContainerIntegrationLiveTest extends SwiftContainerIntegrationLiveTest { public class CloudFilesUKContainerIntegrationLiveTest extends CloudFilesContainerIntegrationLiveTest {
} }

4
providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKContainerLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.rackspace.cloudfiles.blobstore.integration; package org.jclouds.rackspace.cloudfiles.blobstore.integration;
import org.jclouds.openstack.swift.blobstore.integration.SwiftContainerLiveTest; import org.jclouds.cloudfiles.blobstore.integration.CloudFilesContainerLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "CloudFilesUKContainerLiveTest") @Test(groups = "live", testName = "CloudFilesUKContainerLiveTest")
public class CloudFilesUKContainerLiveTest extends SwiftContainerLiveTest { public class CloudFilesUKContainerLiveTest extends CloudFilesContainerLiveTest {
} }

4
providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKInputStreamMapIntegrationLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.rackspace.cloudfiles.blobstore.integration; package org.jclouds.rackspace.cloudfiles.blobstore.integration;
import org.jclouds.openstack.swift.blobstore.integration.SwiftInputStreamMapIntegrationLiveTest; import org.jclouds.cloudfiles.blobstore.integration.CloudFilesInputStreamMapIntegrationLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "CloudFilesUKInputStreamMapIntegrationLiveTest") @Test(groups = "live", testName = "CloudFilesUKInputStreamMapIntegrationLiveTest")
public class CloudFilesUKInputStreamMapIntegrationLiveTest extends SwiftInputStreamMapIntegrationLiveTest { public class CloudFilesUKInputStreamMapIntegrationLiveTest extends CloudFilesInputStreamMapIntegrationLiveTest {
} }

4
providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKServiceIntegrationLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.rackspace.cloudfiles.blobstore.integration; package org.jclouds.rackspace.cloudfiles.blobstore.integration;
import org.jclouds.openstack.swift.blobstore.integration.SwiftServiceIntegrationLiveTest; import org.jclouds.cloudfiles.blobstore.integration.CloudFilesServiceIntegrationLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "CloudFilesUKServiceIntegrationLiveTest") @Test(groups = "live", testName = "CloudFilesUKServiceIntegrationLiveTest")
public class CloudFilesUKServiceIntegrationLiveTest extends SwiftServiceIntegrationLiveTest { public class CloudFilesUKServiceIntegrationLiveTest extends CloudFilesServiceIntegrationLiveTest {
} }

4
providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKTestInitializer.java
View File

@ -19,13 +19,13 @@
package org.jclouds.rackspace.cloudfiles.blobstore.integration; package org.jclouds.rackspace.cloudfiles.blobstore.integration;
import org.jclouds.openstack.swift.blobstore.integration.SwiftTestInitializer; import org.jclouds.cloudfiles.blobstore.integration.CloudFilesTestInitializer;
/** /**
* *
* @author Adrian Cole * @author Adrian Cole
*/ */
public class CloudFilesUKTestInitializer extends SwiftTestInitializer { public class CloudFilesUKTestInitializer extends CloudFilesTestInitializer {
public CloudFilesUKTestInitializer() { public CloudFilesUKTestInitializer() {
provider = "cloudfiles-uk"; provider = "cloudfiles-uk";

4
providers/cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUSBlobIntegrationLiveTest.java
View File

@ -19,14 +19,14 @@
package org.jclouds.rackspace.cloudfiles.blobstore.integration; package org.jclouds.rackspace.cloudfiles.blobstore.integration;
import org.jclouds.openstack.swift.blobstore.integration.SwiftBlobIntegrationLiveTest; import org.jclouds.cloudfiles.blobstore.integration.CloudFilesBlobIntegrationLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "CloudFilesUSBlobIntegrationLiveTest") @Test(groups = "live", testName = "CloudFilesUSBlobIntegrationLiveTest")
public class CloudFilesUSBlobIntegrationLiveTest extends SwiftBlobIntegrationLiveTest { public class CloudFilesUSBlobIntegrationLiveTest extends CloudFilesBlobIntegrationLiveTest {
} }

4
providers/cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUSBlobLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.rackspace.cloudfiles.blobstore.integration; package org.jclouds.rackspace.cloudfiles.blobstore.integration;
import org.jclouds.openstack.swift.blobstore.integration.SwiftBlobLiveTest; import org.jclouds.cloudfiles.blobstore.integration.CloudFilesBlobLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "CloudFilesUSBlobLiveTest") @Test(groups = "live", testName = "CloudFilesUSBlobLiveTest")
public class CloudFilesUSBlobLiveTest extends SwiftBlobLiveTest { public class CloudFilesUSBlobLiveTest extends CloudFilesBlobLiveTest {
} }

4
providers/cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUSBlobMapIntegrationLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.rackspace.cloudfiles.blobstore.integration; package org.jclouds.rackspace.cloudfiles.blobstore.integration;
import org.jclouds.openstack.swift.blobstore.integration.SwiftBlobMapIntegrationLiveTest; import org.jclouds.cloudfiles.blobstore.integration.CloudFilesBlobMapIntegrationLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "CloudFilesUSBlobMapIntegrationLiveTest") @Test(groups = "live", testName = "CloudFilesUSBlobMapIntegrationLiveTest")
public class CloudFilesUSBlobMapIntegrationLiveTest extends SwiftBlobMapIntegrationLiveTest { public class CloudFilesUSBlobMapIntegrationLiveTest extends CloudFilesBlobMapIntegrationLiveTest {
} }

4
providers/cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUSBlobSignerLiveTest.java
View File

@ -19,7 +19,7 @@
package org.jclouds.rackspace.cloudfiles.blobstore.integration; package org.jclouds.rackspace.cloudfiles.blobstore.integration;
import org.jclouds.openstack.swift.blobstore.integration.SwiftBlobSignerLiveTest; import org.jclouds.cloudfiles.blobstore.integration.CloudFilesBlobSignerLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
@ -27,6 +27,6 @@ import org.testng.annotations.Test;
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "CloudFilesUSBlobSignerLiveTest") @Test(groups = "live", testName = "CloudFilesUSBlobSignerLiveTest")
public class CloudFilesUSBlobSignerLiveTest extends SwiftBlobSignerLiveTest { public class CloudFilesUSBlobSignerLiveTest extends CloudFilesBlobSignerLiveTest {
} }

4
providers/cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUSContainerIntegrationLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.rackspace.cloudfiles.blobstore.integration; package org.jclouds.rackspace.cloudfiles.blobstore.integration;
import org.jclouds.openstack.swift.blobstore.integration.SwiftContainerIntegrationLiveTest; import org.jclouds.cloudfiles.blobstore.integration.CloudFilesContainerIntegrationLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "CloudFilesUSContainerIntegrationLiveTest") @Test(groups = "live", testName = "CloudFilesUSContainerIntegrationLiveTest")
public class CloudFilesUSContainerIntegrationLiveTest extends SwiftContainerIntegrationLiveTest { public class CloudFilesUSContainerIntegrationLiveTest extends CloudFilesContainerIntegrationLiveTest {
} }

4
providers/cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUSContainerLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.rackspace.cloudfiles.blobstore.integration; package org.jclouds.rackspace.cloudfiles.blobstore.integration;
import org.jclouds.openstack.swift.blobstore.integration.SwiftContainerLiveTest; import org.jclouds.cloudfiles.blobstore.integration.CloudFilesContainerLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "CloudFilesUSContainerLiveTest") @Test(groups = "live", testName = "CloudFilesUSContainerLiveTest")
public class CloudFilesUSContainerLiveTest extends SwiftContainerLiveTest { public class CloudFilesUSContainerLiveTest extends CloudFilesContainerLiveTest {
} }

4
providers/cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUSInputStreamMapIntegrationLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.rackspace.cloudfiles.blobstore.integration; package org.jclouds.rackspace.cloudfiles.blobstore.integration;
import org.jclouds.openstack.swift.blobstore.integration.SwiftInputStreamMapIntegrationLiveTest; import org.jclouds.cloudfiles.blobstore.integration.CloudFilesInputStreamMapIntegrationLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "CloudFilesUSInputStreamMapIntegrationLiveTest") @Test(groups = "live", testName = "CloudFilesUSInputStreamMapIntegrationLiveTest")
public class CloudFilesUSInputStreamMapIntegrationLiveTest extends SwiftInputStreamMapIntegrationLiveTest { public class CloudFilesUSInputStreamMapIntegrationLiveTest extends CloudFilesInputStreamMapIntegrationLiveTest {
} }

4
providers/cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUSServiceIntegrationLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.rackspace.cloudfiles.blobstore.integration; package org.jclouds.rackspace.cloudfiles.blobstore.integration;
import org.jclouds.openstack.swift.blobstore.integration.SwiftServiceIntegrationLiveTest; import org.jclouds.cloudfiles.blobstore.integration.CloudFilesServiceIntegrationLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "CloudFilesUSServiceIntegrationLiveTest") @Test(groups = "live", testName = "CloudFilesUSServiceIntegrationLiveTest")
public class CloudFilesUSServiceIntegrationLiveTest extends SwiftServiceIntegrationLiveTest { public class CloudFilesUSServiceIntegrationLiveTest extends CloudFilesServiceIntegrationLiveTest {
} }

4
providers/cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUSTestInitializer.java
View File

@ -19,13 +19,13 @@
package org.jclouds.rackspace.cloudfiles.blobstore.integration; package org.jclouds.rackspace.cloudfiles.blobstore.integration;
import org.jclouds.openstack.swift.blobstore.integration.SwiftTestInitializer; import org.jclouds.cloudfiles.blobstore.integration.CloudFilesTestInitializer;
/** /**
* *
* @author Adrian Cole * @author Adrian Cole
*/ */
public class CloudFilesUSTestInitializer extends SwiftTestInitializer { public class CloudFilesUSTestInitializer extends CloudFilesTestInitializer {
public CloudFilesUSTestInitializer() { public CloudFilesUSTestInitializer() {
provider = "cloudfiles-us"; provider = "cloudfiles-us";

13
providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/blobstore/integration/CloudOneStorageBlobIntegrationLiveTest.java
View File

@ -19,22 +19,13 @@
package org.jclouds.cloudonestorage.blobstore.integration; package org.jclouds.cloudonestorage.blobstore.integration;
import java.io.IOException; import org.jclouds.atmos.blobstore.integration.AtmosIntegrationLiveTest;
import java.util.concurrent.ExecutionException;
import org.jclouds.blobstore.integration.internal.BaseBlobIntegrationTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "CloudOneStorageBlobIntegrationLiveTest") @Test(groups = "live", testName = "CloudOneStorageBlobIntegrationLiveTest")
public class CloudOneStorageBlobIntegrationLiveTest extends BaseBlobIntegrationTest { public class CloudOneStorageBlobIntegrationLiveTest extends AtmosIntegrationLiveTest {
@Override
@Test(expectedExceptions = IllegalArgumentException.class)
public void testPutObjectStream() throws InterruptedException, IOException, ExecutionException {
super.testPutObjectStream();
}
} }

4
providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/blobstore/integration/CloudOneStorageBlobLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.cloudonestorage.blobstore.integration; package org.jclouds.cloudonestorage.blobstore.integration;
import org.jclouds.blobstore.integration.internal.BaseBlobLiveTest; import org.jclouds.atmos.blobstore.integration.AtmosLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "CloudOneStorageBlobLiveTest") @Test(groups = "live", testName = "CloudOneStorageBlobLiveTest")
public class CloudOneStorageBlobLiveTest extends BaseBlobLiveTest { public class CloudOneStorageBlobLiveTest extends AtmosLiveTest {
} }

4
providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/blobstore/integration/CloudOneStorageBlobMapIntegrationLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.cloudonestorage.blobstore.integration; package org.jclouds.cloudonestorage.blobstore.integration;
import org.jclouds.blobstore.integration.internal.BaseBlobMapIntegrationTest; import org.jclouds.atmos.blobstore.integration.AtmosMapIntegrationLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "CloudOneStorageBlobMapIntegrationLiveTest") @Test(groups = "live", testName = "CloudOneStorageBlobMapIntegrationLiveTest")
public class CloudOneStorageBlobMapIntegrationLiveTest extends BaseBlobMapIntegrationTest { public class CloudOneStorageBlobMapIntegrationLiveTest extends AtmosMapIntegrationLiveTest {
} }

4
providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/blobstore/integration/CloudOneStorageBlobSignerLiveTest.java
View File

@ -19,7 +19,7 @@
package org.jclouds.cloudonestorage.blobstore.integration; package org.jclouds.cloudonestorage.blobstore.integration;
import org.jclouds.blobstore.integration.internal.BaseBlobSignerLiveTest; import org.jclouds.atmos.blobstore.integration.AtmosBlobSignerLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
@ -27,6 +27,6 @@ import org.testng.annotations.Test;
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "CloudOneStorageBlobSignerLiveTest") @Test(groups = "live", testName = "CloudOneStorageBlobSignerLiveTest")
public class CloudOneStorageBlobSignerLiveTest extends BaseBlobSignerLiveTest { public class CloudOneStorageBlobSignerLiveTest extends AtmosBlobSignerLiveTest {
} }

4
providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/blobstore/integration/CloudOneStorageContainerIntegrationLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.cloudonestorage.blobstore.integration; package org.jclouds.cloudonestorage.blobstore.integration;
import org.jclouds.blobstore.integration.internal.BaseContainerIntegrationTest; import org.jclouds.atmos.blobstore.integration.AtmosContainerIntegrationLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "CloudOneStorageContainerIntegrationLiveTest") @Test(groups = "live", testName = "CloudOneStorageContainerIntegrationLiveTest")
public class CloudOneStorageContainerIntegrationLiveTest extends BaseContainerIntegrationTest { public class CloudOneStorageContainerIntegrationLiveTest extends AtmosContainerIntegrationLiveTest {
} }

4
providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/blobstore/integration/CloudOneStorageContainerLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.cloudonestorage.blobstore.integration; package org.jclouds.cloudonestorage.blobstore.integration;
import org.jclouds.blobstore.integration.internal.BaseContainerLiveTest; import org.jclouds.atmos.blobstore.integration.AtmosContainerLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "CloudOneStorageContainerLiveTest") @Test(groups = "live", testName = "CloudOneStorageContainerLiveTest")
public class CloudOneStorageContainerLiveTest extends BaseContainerLiveTest { public class CloudOneStorageContainerLiveTest extends AtmosContainerLiveTest {
} }

4
providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/blobstore/integration/CloudOneStorageInputStreamMapIntegrationLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.cloudonestorage.blobstore.integration; package org.jclouds.cloudonestorage.blobstore.integration;
import org.jclouds.blobstore.integration.internal.BaseInputStreamMapIntegrationTest; import org.jclouds.atmos.blobstore.integration.AtmosInputStreamMapIntegrationLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "CloudOneStorageInputStreamMapIntegrationLiveTest") @Test(groups = "live", testName = "CloudOneStorageInputStreamMapIntegrationLiveTest")
public class CloudOneStorageInputStreamMapIntegrationLiveTest extends BaseInputStreamMapIntegrationTest { public class CloudOneStorageInputStreamMapIntegrationLiveTest extends AtmosInputStreamMapIntegrationLiveTest {
} }

4
providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/blobstore/integration/CloudOneStorageServiceIntegrationLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.cloudonestorage.blobstore.integration; package org.jclouds.cloudonestorage.blobstore.integration;
import org.jclouds.blobstore.integration.internal.BaseServiceIntegrationTest; import org.jclouds.atmos.blobstore.integration.AtmosServiceIntegrationLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "CloudOneStorageServiceIntegrationLiveTest") @Test(groups = "live", testName = "CloudOneStorageServiceIntegrationLiveTest")
public class CloudOneStorageServiceIntegrationLiveTest extends BaseServiceIntegrationTest { public class CloudOneStorageServiceIntegrationLiveTest extends AtmosServiceIntegrationLiveTest {
} }

19
providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/blobstore/integration/CloudOneStorageTestInitializer.java
View File

@ -19,33 +19,18 @@
package org.jclouds.cloudonestorage.blobstore.integration; package org.jclouds.cloudonestorage.blobstore.integration;
import java.io.IOException; import org.jclouds.atmos.blobstore.integration.AtmosTestInitializer;
import org.jclouds.blobstore.BlobStoreContext;
import org.jclouds.blobstore.BlobStoreContextFactory;
import org.jclouds.blobstore.integration.TransientBlobStoreTestInitializer;
import org.jclouds.blobstore.integration.internal.BaseBlobStoreIntegrationTest;
import org.jclouds.logging.log4j.config.Log4JLoggingModule;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
/** /**
* *
* @author Adrian Cole * @author Adrian Cole
*/ */
public class CloudOneStorageTestInitializer extends TransientBlobStoreTestInitializer { public class CloudOneStorageTestInitializer extends AtmosTestInitializer {
public CloudOneStorageTestInitializer() { public CloudOneStorageTestInitializer() {
provider = "cloudonestorage"; provider = "cloudonestorage";
BaseBlobStoreIntegrationTest.SANITY_CHECK_RETURNED_BUCKET_NAME = true;
} }
@Override
protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiversion,
String app, String identity, String credential) throws IOException {
return new BlobStoreContextFactory().createContext(provider, ImmutableSet.of(configurationModule,
new Log4JLoggingModule()), setupProperties(endpoint, apiversion, identity, credential));
}
} }

16
providers/googlestorage/src/test/java/org/jclouds/googlestorage/blobstore/GoogleStorageBlobIntegrationLiveTest.java
View File

@ -19,22 +19,20 @@
package org.jclouds.googlestorage.blobstore; package org.jclouds.googlestorage.blobstore;
import java.io.IOException; import org.jclouds.blobstore.domain.Blob;
import java.util.concurrent.ExecutionException;
import org.jclouds.blobstore.integration.internal.BaseBlobIntegrationTest; import org.jclouds.blobstore.integration.internal.BaseBlobIntegrationTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "GoogleStorageBlobIntegrationLiveTest") @Test(groups = "live", testName = "GoogleStorageBlobIntegrationLiveTest")
public class GoogleStorageBlobIntegrationLiveTest extends BaseBlobIntegrationTest { public class GoogleStorageBlobIntegrationLiveTest extends BaseBlobIntegrationTest {
// NOTE google supports streaming
// no support for content language
@Override @Override
@Test(expectedExceptions = IllegalArgumentException.class) protected void checkContentLanguage(Blob blob, String contentLanguage) {
public void testPutObjectStream() throws InterruptedException, IOException, ExecutionException { assert blob.getPayload().getContentMetadata().getContentLanguage() == null;
super.testPutObjectStream(); assert blob.getMetadata().getContentMetadata().getContentLanguage() == null;
} }
} }

4
providers/googlestorage/src/test/java/org/jclouds/googlestorage/blobstore/GoogleStorageBlobLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.googlestorage.blobstore; package org.jclouds.googlestorage.blobstore;
import org.jclouds.blobstore.integration.internal.BaseBlobLiveTest; import org.jclouds.s3.blobstore.integration.S3BlobLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "GoogleStorageBlobLiveTest") @Test(groups = "live", testName = "GoogleStorageBlobLiveTest")
public class GoogleStorageBlobLiveTest extends BaseBlobLiveTest { public class GoogleStorageBlobLiveTest extends S3BlobLiveTest {
} }

4
providers/googlestorage/src/test/java/org/jclouds/googlestorage/blobstore/GoogleStorageBlobMapIntegrationLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.googlestorage.blobstore; package org.jclouds.googlestorage.blobstore;
import org.jclouds.blobstore.integration.internal.BaseBlobMapIntegrationTest; import org.jclouds.s3.blobstore.integration.S3BlobMapIntegrationLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "GoogleStorageBlobMapIntegrationLiveTest") @Test(groups = "live", testName = "GoogleStorageBlobMapIntegrationLiveTest")
public class GoogleStorageBlobMapIntegrationLiveTest extends BaseBlobMapIntegrationTest { public class GoogleStorageBlobMapIntegrationLiveTest extends S3BlobMapIntegrationLiveTest {
} }

4
providers/googlestorage/src/test/java/org/jclouds/googlestorage/blobstore/GoogleStorageBlobSignerLiveTest.java
View File

@ -19,7 +19,7 @@
package org.jclouds.googlestorage.blobstore; package org.jclouds.googlestorage.blobstore;
import org.jclouds.blobstore.integration.internal.BaseBlobSignerLiveTest; import org.jclouds.s3.blobstore.integration.S3BlobSignerLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
@ -27,6 +27,6 @@ import org.testng.annotations.Test;
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "GoogleStorageBlobSignerLiveTest") @Test(groups = "live", testName = "GoogleStorageBlobSignerLiveTest")
public class GoogleStorageBlobSignerLiveTest extends BaseBlobSignerLiveTest { public class GoogleStorageBlobSignerLiveTest extends S3BlobSignerLiveTest {
} }

4
providers/googlestorage/src/test/java/org/jclouds/googlestorage/blobstore/GoogleStorageContainerIntegrationLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.googlestorage.blobstore; package org.jclouds.googlestorage.blobstore;
import org.jclouds.blobstore.integration.internal.BaseContainerIntegrationTest; import org.jclouds.s3.blobstore.integration.S3ContainerIntegrationLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "GoogleStorageContainerIntegrationLiveTest") @Test(groups = "live", testName = "GoogleStorageContainerIntegrationLiveTest")
public class GoogleStorageContainerIntegrationLiveTest extends BaseContainerIntegrationTest { public class GoogleStorageContainerIntegrationLiveTest extends S3ContainerIntegrationLiveTest {
} }

4
providers/googlestorage/src/test/java/org/jclouds/googlestorage/blobstore/GoogleStorageContainerLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.googlestorage.blobstore; package org.jclouds.googlestorage.blobstore;
import org.jclouds.blobstore.integration.internal.BaseContainerLiveTest; import org.jclouds.s3.blobstore.integration.S3ContainerLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "GoogleStorageContainerLiveTest") @Test(groups = "live", testName = "GoogleStorageContainerLiveTest")
public class GoogleStorageContainerLiveTest extends BaseContainerLiveTest { public class GoogleStorageContainerLiveTest extends S3ContainerLiveTest {
} }

4
providers/googlestorage/src/test/java/org/jclouds/googlestorage/blobstore/GoogleStorageInputStreamMapIntegrationLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.googlestorage.blobstore; package org.jclouds.googlestorage.blobstore;
import org.jclouds.blobstore.integration.internal.BaseInputStreamMapIntegrationTest; import org.jclouds.s3.blobstore.integration.S3InputStreamMapIntegrationLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "GoogleStorageInputStreamMapIntegrationLiveTest") @Test(groups = "live", testName = "GoogleStorageInputStreamMapIntegrationLiveTest")
public class GoogleStorageInputStreamMapIntegrationLiveTest extends BaseInputStreamMapIntegrationTest { public class GoogleStorageInputStreamMapIntegrationLiveTest extends S3InputStreamMapIntegrationLiveTest {
} }

4
providers/googlestorage/src/test/java/org/jclouds/googlestorage/blobstore/GoogleStorageServiceIntegrationLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.googlestorage.blobstore; package org.jclouds.googlestorage.blobstore;
import org.jclouds.blobstore.integration.internal.BaseServiceIntegrationTest; import org.jclouds.s3.blobstore.integration.S3ServiceIntegrationLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "GoogleStorageServiceIntegrationLiveTest") @Test(groups = "live", testName = "GoogleStorageServiceIntegrationLiveTest")
public class GoogleStorageServiceIntegrationLiveTest extends BaseServiceIntegrationTest { public class GoogleStorageServiceIntegrationLiveTest extends S3ServiceIntegrationLiveTest {
} }

21
providers/googlestorage/src/test/java/org/jclouds/googlestorage/blobstore/GoogleStorageTestInitializer.java
View File

@ -19,33 +19,16 @@
package org.jclouds.googlestorage.blobstore; package org.jclouds.googlestorage.blobstore;
import java.io.IOException; import org.jclouds.s3.blobstore.integration.S3TestInitializer;
import org.jclouds.blobstore.BlobStoreContext;
import org.jclouds.blobstore.BlobStoreContextFactory;
import org.jclouds.blobstore.integration.TransientBlobStoreTestInitializer;
import org.jclouds.blobstore.integration.internal.BaseBlobStoreIntegrationTest;
import org.jclouds.logging.log4j.config.Log4JLoggingModule;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
/** /**
* *
* @author Adrian Cole * @author Adrian Cole
*/ */
public class GoogleStorageTestInitializer extends TransientBlobStoreTestInitializer { public class GoogleStorageTestInitializer extends S3TestInitializer {
public GoogleStorageTestInitializer() { public GoogleStorageTestInitializer() {
provider = "googlestorage"; provider = "googlestorage";
BaseBlobStoreIntegrationTest.SANITY_CHECK_RETURNED_BUCKET_NAME = true;
}
@Override
protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiversion,
String app, String identity, String credential) throws IOException {
return new BlobStoreContextFactory().createContext(provider, ImmutableSet.of(configurationModule,
new Log4JLoggingModule()), setupProperties(endpoint, apiversion, identity, credential));
} }
} }

1
providers/pom.xml
View File

@ -41,7 +41,6 @@
<module>aws-s3</module> <module>aws-s3</module>
<module>aws-ec2</module> <module>aws-ec2</module>
<module>googlestorage</module> <module>googlestorage</module>
<module>scaleup-storage</module>
<module>synaptic-storage</module> <module>synaptic-storage</module>
<module>cloudonestorage</module> <module>cloudonestorage</module>
<module>eucalyptus-partnercloud-s3</module> <module>eucalyptus-partnercloud-s3</module>

51
providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageTestInitializer.java
View File

@ -1,51 +0,0 @@
/**
*
* Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
*
* ====================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ====================================================================
*/
package org.jclouds.scaleup.storage.blobstore;
import java.io.IOException;
import org.jclouds.blobstore.BlobStoreContext;
import org.jclouds.blobstore.BlobStoreContextFactory;
import org.jclouds.blobstore.integration.TransientBlobStoreTestInitializer;
import org.jclouds.blobstore.integration.internal.BaseBlobStoreIntegrationTest;
import org.jclouds.logging.log4j.config.Log4JLoggingModule;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
/**
*
* @author Adrian Cole
*/
public class ScaleUpStorageTestInitializer extends TransientBlobStoreTestInitializer {
public ScaleUpStorageTestInitializer() {
provider = "scaleup-storage";
BaseBlobStoreIntegrationTest.SANITY_CHECK_RETURNED_BUCKET_NAME = true;
}
@Override
protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiversion,
String app, String identity, String credential) throws IOException {
return new BlobStoreContextFactory().createContext(provider, ImmutableSet.of(configurationModule,
new Log4JLoggingModule()), setupProperties(endpoint, apiversion, identity, credential));
}
}

15
providers/synaptic-storage/src/test/java/org/jclouds/synaptic/storage/blobstore/integration/SynapticStorageBlobIntegrationLiveTest.java
View File

@ -19,22 +19,13 @@
package org.jclouds.synaptic.storage.blobstore.integration; package org.jclouds.synaptic.storage.blobstore.integration;
import java.io.IOException; import org.jclouds.atmos.blobstore.integration.AtmosIntegrationLiveTest;
import java.util.concurrent.ExecutionException;
import org.jclouds.blobstore.integration.internal.BaseBlobIntegrationTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "SynapticStorageBlobIntegrationLiveTest") @Test(groups = "live", testName = "SynapticStorageBlobIntegrationLiveTest")
public class SynapticStorageBlobIntegrationLiveTest extends BaseBlobIntegrationTest { public class SynapticStorageBlobIntegrationLiveTest extends AtmosIntegrationLiveTest {
@Override
@Test(expectedExceptions = IllegalArgumentException.class)
public void testPutObjectStream() throws InterruptedException, IOException, ExecutionException {
super.testPutObjectStream();
}
} }

4
providers/synaptic-storage/src/test/java/org/jclouds/synaptic/storage/blobstore/integration/SynapticStorageBlobLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.synaptic.storage.blobstore.integration; package org.jclouds.synaptic.storage.blobstore.integration;
import org.jclouds.blobstore.integration.internal.BaseBlobLiveTest; import org.jclouds.atmos.blobstore.integration.AtmosLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "SynapticStorageBlobLiveTest") @Test(groups = "live", testName = "SynapticStorageBlobLiveTest")
public class SynapticStorageBlobLiveTest extends BaseBlobLiveTest { public class SynapticStorageBlobLiveTest extends AtmosLiveTest {
} }

4
providers/synaptic-storage/src/test/java/org/jclouds/synaptic/storage/blobstore/integration/SynapticStorageBlobMapIntegrationLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.synaptic.storage.blobstore.integration; package org.jclouds.synaptic.storage.blobstore.integration;
import org.jclouds.blobstore.integration.internal.BaseBlobMapIntegrationTest; import org.jclouds.atmos.blobstore.integration.AtmosMapIntegrationLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "SynapticStorageBlobMapIntegrationLiveTest") @Test(groups = "live", testName = "SynapticStorageBlobMapIntegrationLiveTest")
public class SynapticStorageBlobMapIntegrationLiveTest extends BaseBlobMapIntegrationTest { public class SynapticStorageBlobMapIntegrationLiveTest extends AtmosMapIntegrationLiveTest {
} }

4
providers/synaptic-storage/src/test/java/org/jclouds/synaptic/storage/blobstore/integration/SynapticStorageBlobSignerLiveTest.java
View File

@ -19,7 +19,7 @@
package org.jclouds.synaptic.storage.blobstore.integration; package org.jclouds.synaptic.storage.blobstore.integration;
import org.jclouds.blobstore.integration.internal.BaseBlobSignerLiveTest; import org.jclouds.atmos.blobstore.integration.AtmosBlobSignerLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
@ -27,6 +27,6 @@ import org.testng.annotations.Test;
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "SynapticStorageBlobSignerLiveTest") @Test(groups = "live", testName = "SynapticStorageBlobSignerLiveTest")
public class SynapticStorageBlobSignerLiveTest extends BaseBlobSignerLiveTest { public class SynapticStorageBlobSignerLiveTest extends AtmosBlobSignerLiveTest {
} }

4
providers/synaptic-storage/src/test/java/org/jclouds/synaptic/storage/blobstore/integration/SynapticStorageContainerIntegrationLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.synaptic.storage.blobstore.integration; package org.jclouds.synaptic.storage.blobstore.integration;
import org.jclouds.blobstore.integration.internal.BaseContainerIntegrationTest; import org.jclouds.atmos.blobstore.integration.AtmosContainerIntegrationLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "SynapticStorageContainerIntegrationLiveTest") @Test(groups = "live", testName = "SynapticStorageContainerIntegrationLiveTest")
public class SynapticStorageContainerIntegrationLiveTest extends BaseContainerIntegrationTest { public class SynapticStorageContainerIntegrationLiveTest extends AtmosContainerIntegrationLiveTest {
} }

6
providers/synaptic-storage/src/test/java/org/jclouds/synaptic/storage/blobstore/integration/SynapticStorageContainerLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.synaptic.storage.blobstore.integration; package org.jclouds.synaptic.storage.blobstore.integration;
import org.jclouds.blobstore.integration.internal.BaseContainerLiveTest; import org.jclouds.atmos.blobstore.integration.AtmosContainerLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "SynapticStorageContainerLiveTest") @Test(groups = "live", testName = "SynapticStorageContainerLiveTest")
public class SynapticStorageContainerLiveTest extends BaseContainerLiveTest { public class SynapticStorageContainerLiveTest extends AtmosContainerLiveTest {
} }

4
providers/synaptic-storage/src/test/java/org/jclouds/synaptic/storage/blobstore/integration/SynapticStorageInputStreamMapIntegrationLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.synaptic.storage.blobstore.integration; package org.jclouds.synaptic.storage.blobstore.integration;
import org.jclouds.blobstore.integration.internal.BaseInputStreamMapIntegrationTest; import org.jclouds.atmos.blobstore.integration.AtmosInputStreamMapIntegrationLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "SynapticStorageInputStreamMapIntegrationLiveTest") @Test(groups = "live", testName = "SynapticStorageInputStreamMapIntegrationLiveTest")
public class SynapticStorageInputStreamMapIntegrationLiveTest extends BaseInputStreamMapIntegrationTest { public class SynapticStorageInputStreamMapIntegrationLiveTest extends AtmosInputStreamMapIntegrationLiveTest {
} }

4
providers/synaptic-storage/src/test/java/org/jclouds/synaptic/storage/blobstore/integration/SynapticStorageServiceIntegrationLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.synaptic.storage.blobstore.integration; package org.jclouds.synaptic.storage.blobstore.integration;
import org.jclouds.blobstore.integration.internal.BaseServiceIntegrationTest; import org.jclouds.atmos.blobstore.integration.AtmosServiceIntegrationLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "SynapticStorageServiceIntegrationLiveTest") @Test(groups = "live", testName = "SynapticStorageServiceIntegrationLiveTest")
public class SynapticStorageServiceIntegrationLiveTest extends BaseServiceIntegrationTest { public class SynapticStorageServiceIntegrationLiveTest extends AtmosServiceIntegrationLiveTest {
} }

21
providers/synaptic-storage/src/test/java/org/jclouds/synaptic/storage/blobstore/integration/SynapticStorageTestInitializer.java
View File

@ -19,33 +19,16 @@
package org.jclouds.synaptic.storage.blobstore.integration; package org.jclouds.synaptic.storage.blobstore.integration;
import java.io.IOException; import org.jclouds.atmos.blobstore.integration.AtmosTestInitializer;
import org.jclouds.blobstore.BlobStoreContext;
import org.jclouds.blobstore.BlobStoreContextFactory;
import org.jclouds.blobstore.integration.TransientBlobStoreTestInitializer;
import org.jclouds.blobstore.integration.internal.BaseBlobStoreIntegrationTest;
import org.jclouds.logging.log4j.config.Log4JLoggingModule;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
/** /**
* *
* @author Adrian Cole * @author Adrian Cole
*/ */
public class SynapticStorageTestInitializer extends TransientBlobStoreTestInitializer { public class SynapticStorageTestInitializer extends AtmosTestInitializer {
public SynapticStorageTestInitializer() { public SynapticStorageTestInitializer() {
provider = "synaptic-storage"; provider = "synaptic-storage";
BaseBlobStoreIntegrationTest.SANITY_CHECK_RETURNED_BUCKET_NAME = true;
}
@Override
protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiversion,
String app, String identity, String credential) throws IOException {
return new BlobStoreContextFactory().createContext(provider, ImmutableSet.of(configurationModule,
new Log4JLoggingModule()), setupProperties(endpoint, apiversion, identity, credential));
} }
} }

0
providers/scaleup-storage/pom.xml → sandbox-providers/scaleup-storage/pom.xml
View File

0
providers/scaleup-storage/src/main/java/org/jclouds/scaleup/storage/ScaleUpStorageContextBuilder.java → sandbox-providers/scaleup-storage/src/main/java/org/jclouds/scaleup/storage/ScaleUpStorageContextBuilder.java
View File

0
providers/scaleup-storage/src/main/java/org/jclouds/scaleup/storage/ScaleUpStoragePropertiesBuilder.java → sandbox-providers/scaleup-storage/src/main/java/org/jclouds/scaleup/storage/ScaleUpStoragePropertiesBuilder.java
View File

0
providers/scaleup-storage/src/main/java/org/jclouds/scaleup/storage/blobstore/config/ScaleUpStorageBlobStoreContextModule.java → sandbox-providers/scaleup-storage/src/main/java/org/jclouds/scaleup/storage/blobstore/config/ScaleUpStorageBlobStoreContextModule.java
View File

0
providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/ScaleUpStorageAsyncClientTestDisabled.java → sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/ScaleUpStorageAsyncClientTestDisabled.java
View File

0
providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/ScaleUpStorageClientLiveTest.java → sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/ScaleUpStorageClientLiveTest.java
View File

13
providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobIntegrationLiveTest.java → sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobIntegrationLiveTest.java
View File

@ -19,22 +19,13 @@
package org.jclouds.scaleup.storage.blobstore; package org.jclouds.scaleup.storage.blobstore;
import java.io.IOException; import org.jclouds.s3.blobstore.integration.S3BlobIntegrationLiveTest;
import java.util.concurrent.ExecutionException;
import org.jclouds.blobstore.integration.internal.BaseBlobIntegrationTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "ScaleUpStorageBlobIntegrationLiveTest") @Test(groups = "live", testName = "ScaleUpStorageBlobIntegrationLiveTest")
public class ScaleUpStorageBlobIntegrationLiveTest extends BaseBlobIntegrationTest { public class ScaleUpStorageBlobIntegrationLiveTest extends S3BlobIntegrationLiveTest {
@Override
@Test(expectedExceptions = IllegalArgumentException.class)
public void testPutObjectStream() throws InterruptedException, IOException, ExecutionException {
super.testPutObjectStream();
}
} }

4
providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobLiveTest.java → sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.scaleup.storage.blobstore; package org.jclouds.scaleup.storage.blobstore;
import org.jclouds.blobstore.integration.internal.BaseBlobLiveTest; import org.jclouds.s3.blobstore.integration.S3BlobLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "ScaleUpStorageBlobLiveTest") @Test(groups = "live", testName = "ScaleUpStorageBlobLiveTest")
public class ScaleUpStorageBlobLiveTest extends BaseBlobLiveTest { public class ScaleUpStorageBlobLiveTest extends S3BlobLiveTest {
} }

4
providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobMapIntegrationLiveTest.java → sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobMapIntegrationLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.scaleup.storage.blobstore; package org.jclouds.scaleup.storage.blobstore;
import org.jclouds.blobstore.integration.internal.BaseBlobMapIntegrationTest; import org.jclouds.s3.blobstore.integration.S3BlobMapIntegrationLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "ScaleUpStorageBlobMapIntegrationLiveTest") @Test(groups = "live", testName = "ScaleUpStorageBlobMapIntegrationLiveTest")
public class ScaleUpStorageBlobMapIntegrationLiveTest extends BaseBlobMapIntegrationTest { public class ScaleUpStorageBlobMapIntegrationLiveTest extends S3BlobMapIntegrationLiveTest {
} }

4
providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobSignerLiveTest.java → sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobSignerLiveTest.java
View File

@ -19,7 +19,7 @@
package org.jclouds.scaleup.storage.blobstore; package org.jclouds.scaleup.storage.blobstore;
import org.jclouds.blobstore.integration.internal.BaseBlobSignerLiveTest; import org.jclouds.s3.blobstore.integration.S3BlobSignerLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
@ -27,6 +27,6 @@ import org.testng.annotations.Test;
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "ScaleUpStorageBlobSignerLiveTest") @Test(groups = "live", testName = "ScaleUpStorageBlobSignerLiveTest")
public class ScaleUpStorageBlobSignerLiveTest extends BaseBlobSignerLiveTest { public class ScaleUpStorageBlobSignerLiveTest extends S3BlobSignerLiveTest {
} }

4
providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageContainerIntegrationLiveTest.java → sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageContainerIntegrationLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.scaleup.storage.blobstore; package org.jclouds.scaleup.storage.blobstore;
import org.jclouds.blobstore.integration.internal.BaseContainerIntegrationTest; import org.jclouds.s3.blobstore.integration.S3ContainerIntegrationLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "ScaleUpStorageContainerIntegrationLiveTest") @Test(groups = "live", testName = "ScaleUpStorageContainerIntegrationLiveTest")
public class ScaleUpStorageContainerIntegrationLiveTest extends BaseContainerIntegrationTest { public class ScaleUpStorageContainerIntegrationLiveTest extends S3ContainerIntegrationLiveTest {
} }

4
providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageContainerLiveTest.java → sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageContainerLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.scaleup.storage.blobstore; package org.jclouds.scaleup.storage.blobstore;
import org.jclouds.blobstore.integration.internal.BaseContainerLiveTest; import org.jclouds.s3.blobstore.integration.S3ContainerLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "ScaleUpStorageContainerLiveTest") @Test(groups = "live", testName = "ScaleUpStorageContainerLiveTest")
public class ScaleUpStorageContainerLiveTest extends BaseContainerLiveTest { public class ScaleUpStorageContainerLiveTest extends S3ContainerLiveTest {
} }

4
providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageInputStreamMapIntegrationLiveTest.java → sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageInputStreamMapIntegrationLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.scaleup.storage.blobstore; package org.jclouds.scaleup.storage.blobstore;
import org.jclouds.blobstore.integration.internal.BaseInputStreamMapIntegrationTest; import org.jclouds.s3.blobstore.integration.S3InputStreamMapIntegrationLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "ScaleUpStorageInputStreamMapIntegrationLiveTest") @Test(groups = "live", testName = "ScaleUpStorageInputStreamMapIntegrationLiveTest")
public class ScaleUpStorageInputStreamMapIntegrationLiveTest extends BaseInputStreamMapIntegrationTest { public class ScaleUpStorageInputStreamMapIntegrationLiveTest extends S3InputStreamMapIntegrationLiveTest {
} }

4
providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageServiceIntegrationLiveTest.java → sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageServiceIntegrationLiveTest.java
View File

@ -19,13 +19,13 @@
package org.jclouds.scaleup.storage.blobstore; package org.jclouds.scaleup.storage.blobstore;
import org.jclouds.blobstore.integration.internal.BaseServiceIntegrationTest; import org.jclouds.s3.blobstore.integration.S3ServiceIntegrationLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "ScaleUpStorageServiceIntegrationLiveTest") @Test(groups = "live", testName = "ScaleUpStorageServiceIntegrationLiveTest")
public class ScaleUpStorageServiceIntegrationLiveTest extends BaseServiceIntegrationTest { public class ScaleUpStorageServiceIntegrationLiveTest extends S3ServiceIntegrationLiveTest {
} }

36
sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageTestInitializer.java Normal file
View File

@ -0,0 +1,36 @@
/**
*
* Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
*
* ====================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ====================================================================
*/
package org.jclouds.scaleup.storage.blobstore;
import org.jclouds.s3.blobstore.integration.S3TestInitializer;
/**
*
* @author Adrian Cole
*/
public class ScaleUpStorageTestInitializer extends S3TestInitializer {
public ScaleUpStorageTestInitializer() {
provider = "scaleup-storage";
}
}