Repository: jclouds Updated Branches: refs/heads/master 1b2cee070 -> 99e217b72
Move off confusing test names. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/99e217b7 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/99e217b7 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/99e217b7 Branch: refs/heads/master Commit: 99e217b720248e26b081ff379aa2cf4d15281965 Parents: 1b2cee0 Author: Adrian Cole <[email protected]> Authored: Sun Oct 5 16:13:39 2014 -0700 Committer: Adrian Cole <[email protected]> Committed: Sun Oct 5 17:22:18 2014 -0700 ---------------------------------------------------------------------- .../java/org/jclouds/atmos/AtmosClientTest.java | 4 +- .../blobstore/AtmosBlobRequestSignerTest.java | 4 +- .../cloudservers/CloudServersClientTest.java | 4 +- .../internal/BaseCloudStackApiTest.java | 4 +- .../internal/BaseCloudStackExpectTest.java | 4 +- .../jclouds/ec2/features/BaseEC2ApiTest.java | 4 +- .../jclouds/ec2/internal/BaseEC2ExpectTest.java | 4 +- .../elasticstack/ElasticStackApiTest.java | 4 +- .../BaseKeystoneRestClientExpectTest.java | 4 +- .../s3/internal/BaseS3ClientExpectTest.java | 4 +- .../jclouds/s3/internal/BaseS3ClientTest.java | 4 +- .../openstack/swift/CommonSwiftClientTest.java | 4 +- .../swift/internal/BaseSwiftExpectTest.java | 4 +- .../internal/BaseSwiftKeystoneExpectTest.java | 4 +- .../jclouds/vcloud/VCloudVersionsApiTest.java | 5 +- .../BaseVCloudComputeServiceExpectTest.java | 4 +- .../vcloud/internal/BaseVCloudApiTest.java | 4 +- .../vcloud/internal/VCloudLoginApiTest.java | 4 +- .../TransientBlobRequestSignerTest.java | 4 +- .../internal/BaseBlobSignerExpectTest.java | 4 +- .../internal/OpenStackAuthClientTest.java | 4 +- .../BaseKeystoneRestClientExpectTest.java | 4 +- .../http/IntegrationTestClientExpectTest.java | 4 +- .../DelegateAnnotationExpectTest.java | 4 +- .../JAXBResponseParserAnnotationExpectTest.java | 4 +- .../PATCHAnnotationExpectTest.java | 4 +- .../ProvidesAnnotationExpectTest.java | 4 +- .../jclouds/rest/internal/BaseAsyncApiTest.java | 98 -------------------- .../rest/internal/BaseAsyncClientTest.java | 3 +- .../BaseRestAnnotationProcessingTest.java | 98 ++++++++++++++++++++ .../rest/internal/BaseRestClientExpectTest.java | 25 ----- .../aws/ec2/features/BaseAWSEC2ApiTest.java | 4 +- .../s3/internal/BaseAWSS3ClientExpectTest.java | 4 +- .../jclouds/azureblob/AzureBlobClientTest.java | 4 +- .../BindAzureBlobMetadataToRequestTest.java | 4 +- .../blobstore/AzureBlobRequestSignerTest.java | 4 +- .../java/org/jclouds/glesys/GleSYSApiTest.java | 4 +- .../gogrid/features/BaseGoGridApiTest.java | 6 +- .../features/BaseGoGridHttpApiExpectTest.java | 6 +- ...HPCloudObjectStorageBlobStoreExpectTest.java | 4 +- 40 files changed, 175 insertions(+), 198 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/apis/atmos/src/test/java/org/jclouds/atmos/AtmosClientTest.java ---------------------------------------------------------------------- diff --git a/apis/atmos/src/test/java/org/jclouds/atmos/AtmosClientTest.java b/apis/atmos/src/test/java/org/jclouds/atmos/AtmosClientTest.java index 7fa5d4f..8a32b37 100644 --- a/apis/atmos/src/test/java/org/jclouds/atmos/AtmosClientTest.java +++ b/apis/atmos/src/test/java/org/jclouds/atmos/AtmosClientTest.java @@ -47,7 +47,7 @@ import org.jclouds.http.functions.ReleasePayloadAndReturn; import org.jclouds.http.functions.ReturnTrueIf2xx; import org.jclouds.http.options.GetOptions; import org.jclouds.rest.ConfiguresHttpApi; -import org.jclouds.rest.internal.BaseAsyncClientTest; +import org.jclouds.rest.internal.BaseRestAnnotationProcessingTest; import org.jclouds.rest.internal.GeneratedHttpRequest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -59,7 +59,7 @@ import com.google.common.reflect.Invokable; import com.google.inject.Module; @Test(groups = "unit", testName = "AtmosClientTest") -public class AtmosClientTest extends BaseAsyncClientTest<AtmosClient> { +public class AtmosClientTest extends BaseRestAnnotationProcessingTest<AtmosClient> { private BlobToObject blobToObject; http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSignerTest.java ---------------------------------------------------------------------- diff --git a/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSignerTest.java b/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSignerTest.java index 39720ab..46348fb 100644 --- a/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSignerTest.java +++ b/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSignerTest.java @@ -32,7 +32,7 @@ import org.jclouds.blobstore.domain.Blob.Factory; import org.jclouds.date.TimeStamp; import org.jclouds.http.HttpRequest; import org.jclouds.rest.ConfiguresHttpApi; -import org.jclouds.rest.internal.BaseAsyncClientTest; +import org.jclouds.rest.internal.BaseRestAnnotationProcessingTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -45,7 +45,7 @@ import com.google.inject.Module; */ // NOTE:without testName, this will not call @Before* and fail w/NPE during surefire @Test(groups = "unit", testName = "AtmosBlobRequestSignerTest") -public class AtmosBlobRequestSignerTest extends BaseAsyncClientTest<AtmosClient> { +public class AtmosBlobRequestSignerTest extends BaseRestAnnotationProcessingTest<AtmosClient> { public AtmosBlobRequestSignerTest() { // this is base64 decoded in the signer; http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/apis/cloudservers/src/test/java/org/jclouds/cloudservers/CloudServersClientTest.java ---------------------------------------------------------------------- diff --git a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/CloudServersClientTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/CloudServersClientTest.java index 67ecd33..28f9ca6 100644 --- a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/CloudServersClientTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/CloudServersClientTest.java @@ -62,7 +62,7 @@ import org.jclouds.openstack.keystone.v1_1.config.AuthenticationServiceModule.Ge import org.jclouds.openstack.keystone.v1_1.domain.Auth; import org.jclouds.openstack.keystone.v1_1.parse.ParseAuthTest; import org.jclouds.rest.ConfiguresHttpApi; -import org.jclouds.rest.internal.BaseAsyncClientTest; +import org.jclouds.rest.internal.BaseRestAnnotationProcessingTest; import org.jclouds.rest.internal.GeneratedHttpRequest; import org.testng.annotations.Test; @@ -73,7 +73,7 @@ import com.google.inject.Module; import com.google.inject.Provides; @Test(groups = "unit", singleThreaded = true, testName = "CloudServersClientTest") -public class CloudServersClientTest extends BaseAsyncClientTest<CloudServersClient> { +public class CloudServersClientTest extends BaseRestAnnotationProcessingTest<CloudServersClient> { public void testCreateServer() throws IOException, SecurityException, NoSuchMethodException { Invokable<?, ?> method = method(CloudServersClient.class, "createServer", String.class, int.class, int.class, http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/apis/cloudstack/src/test/java/org/jclouds/cloudstack/internal/BaseCloudStackApiTest.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/internal/BaseCloudStackApiTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/internal/BaseCloudStackApiTest.java index 664758d..5683bdc 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/internal/BaseCloudStackApiTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/internal/BaseCloudStackApiTest.java @@ -25,11 +25,11 @@ import org.jclouds.http.HttpRequest; import org.jclouds.providers.AnonymousProviderMetadata; import org.jclouds.providers.ProviderMetadata; import org.jclouds.rest.ConfiguresHttpApi; -import org.jclouds.rest.internal.BaseAsyncApiTest; +import org.jclouds.rest.internal.BaseRestAnnotationProcessingTest; import com.google.inject.Module; -public abstract class BaseCloudStackApiTest<T> extends BaseAsyncApiTest<T> { +public abstract class BaseCloudStackApiTest<T> extends BaseRestAnnotationProcessingTest<T> { @ConfiguresHttpApi public static class CloudStackHttpApiModuleExtension extends CloudStackHttpApiModule { http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/apis/cloudstack/src/test/java/org/jclouds/cloudstack/internal/BaseCloudStackExpectTest.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/internal/BaseCloudStackExpectTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/internal/BaseCloudStackExpectTest.java index 5237efc..275bc6f 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/internal/BaseCloudStackExpectTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/internal/BaseCloudStackExpectTest.java @@ -28,7 +28,7 @@ import org.jclouds.cloudstack.CloudStackApiMetadata; import org.jclouds.cloudstack.CloudStackContext; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; -import org.jclouds.rest.internal.BaseRestClientExpectTest; +import org.jclouds.rest.internal.BaseRestApiExpectTest; import com.google.common.base.Function; import com.google.inject.Module; @@ -36,7 +36,7 @@ import com.google.inject.Module; /** * Base class for writing CloudStack Rest Client Expect tests */ -public abstract class BaseCloudStackExpectTest<S> extends BaseRestClientExpectTest<S> { +public abstract class BaseCloudStackExpectTest<S> extends BaseRestApiExpectTest<S> { public BaseCloudStackExpectTest() { provider = "cloudstack"; http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/apis/ec2/src/test/java/org/jclouds/ec2/features/BaseEC2ApiTest.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/features/BaseEC2ApiTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/features/BaseEC2ApiTest.java index 3a2e645..e70f760 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/features/BaseEC2ApiTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/features/BaseEC2ApiTest.java @@ -40,7 +40,7 @@ import org.jclouds.location.config.LocationModule; import org.jclouds.location.suppliers.RegionIdToURISupplier; import org.jclouds.location.suppliers.RegionIdToZoneIdsSupplier; import org.jclouds.rest.ConfiguresHttpApi; -import org.jclouds.rest.internal.BaseAsyncApiTest; +import org.jclouds.rest.internal.BaseRestAnnotationProcessingTest; import org.jclouds.util.Suppliers2; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; @@ -55,7 +55,7 @@ import com.google.inject.Module; import com.google.inject.Provides; @Test(groups = "unit") -public abstract class BaseEC2ApiTest<T> extends BaseAsyncApiTest<T> { +public abstract class BaseEC2ApiTest<T> extends BaseRestAnnotationProcessingTest<T> { @ConfiguresHttpApi protected static class StubEC2HttpApiModule extends BaseEC2HttpApiModule<EC2Api> { http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ExpectTest.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ExpectTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ExpectTest.java index 29808b7..d4cb9ec 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ExpectTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ExpectTest.java @@ -26,7 +26,7 @@ import org.jclouds.date.DateService; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; -import org.jclouds.rest.internal.BaseRestClientExpectTest; +import org.jclouds.rest.internal.BaseRestApiExpectTest; import org.testng.annotations.BeforeClass; import com.google.common.base.Functions; @@ -35,7 +35,7 @@ import com.google.common.collect.ImmutableMap.Builder; import com.google.common.collect.ImmutableSet; import com.google.inject.Injector; -public abstract class BaseEC2ExpectTest<T> extends BaseRestClientExpectTest<T> { +public abstract class BaseEC2ExpectTest<T> extends BaseRestApiExpectTest<T> { protected static final String CONSTANT_DATE = "2012-04-16T15:54:08.897Z"; protected DateService dateService = new SimpleDateFormatDateService(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackApiTest.java ---------------------------------------------------------------------- diff --git a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackApiTest.java b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackApiTest.java index b4a77a6..83e0ecd 100644 --- a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackApiTest.java +++ b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackApiTest.java @@ -46,7 +46,7 @@ import org.jclouds.http.filters.BasicAuthentication; import org.jclouds.http.functions.ReleasePayloadAndReturn; import org.jclouds.io.Payload; import org.jclouds.io.Payloads; -import org.jclouds.rest.internal.BaseAsyncClientTest; +import org.jclouds.rest.internal.BaseRestAnnotationProcessingTest; import org.jclouds.rest.internal.GeneratedHttpRequest; import org.testng.annotations.Test; @@ -61,7 +61,7 @@ import com.google.inject.Scopes; */ // NOTE:without testName, this will not call @Before* and fail w/NPE during surefire @Test(groups = "unit", testName = "ElasticStackApiTest") -public class ElasticStackApiTest extends BaseAsyncClientTest<ElasticStackApi> { +public class ElasticStackApiTest extends BaseRestAnnotationProcessingTest<ElasticStackApi> { public void testListServers() throws SecurityException, NoSuchMethodException, IOException { Invokable<?, ?> method = method(ElasticStackApi.class, "listServers"); GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of()); http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/apis/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v1_1/internal/BaseKeystoneRestClientExpectTest.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v1_1/internal/BaseKeystoneRestClientExpectTest.java b/apis/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v1_1/internal/BaseKeystoneRestClientExpectTest.java index 4638c3e..51bc63b 100644 --- a/apis/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v1_1/internal/BaseKeystoneRestClientExpectTest.java +++ b/apis/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v1_1/internal/BaseKeystoneRestClientExpectTest.java @@ -19,14 +19,14 @@ package org.jclouds.rackspace.cloudidentity.v1_1.internal; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.jclouds.rackspace.cloudidentity.v1_1.config.AuthenticationServiceModule; -import org.jclouds.rest.internal.BaseRestClientExpectTest; +import org.jclouds.rest.internal.BaseRestApiExpectTest; import com.google.common.net.HttpHeaders; /** * Base class for writing KeyStone Rest Client Expect tests */ -public class BaseKeystoneRestClientExpectTest<S> extends BaseRestClientExpectTest<S> { +public class BaseKeystoneRestClientExpectTest<S> extends BaseRestApiExpectTest<S> { protected String endpoint = "http://localhost:5000";; http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/apis/s3/src/test/java/org/jclouds/s3/internal/BaseS3ClientExpectTest.java ---------------------------------------------------------------------- diff --git a/apis/s3/src/test/java/org/jclouds/s3/internal/BaseS3ClientExpectTest.java b/apis/s3/src/test/java/org/jclouds/s3/internal/BaseS3ClientExpectTest.java index 260a242..b8b64c6 100644 --- a/apis/s3/src/test/java/org/jclouds/s3/internal/BaseS3ClientExpectTest.java +++ b/apis/s3/src/test/java/org/jclouds/s3/internal/BaseS3ClientExpectTest.java @@ -18,7 +18,7 @@ package org.jclouds.s3.internal; import org.jclouds.date.TimeStamp; import org.jclouds.rest.ConfiguresHttpApi; -import org.jclouds.rest.internal.BaseRestClientExpectTest; +import org.jclouds.rest.internal.BaseRestApiExpectTest; import org.jclouds.s3.S3ApiMetadata; import org.jclouds.s3.S3Client; import org.jclouds.s3.config.S3HttpApiModule; @@ -26,7 +26,7 @@ import org.jclouds.s3.config.S3HttpApiModule; import com.google.common.base.Supplier; import com.google.inject.Module; -public abstract class BaseS3ClientExpectTest extends BaseRestClientExpectTest<S3Client> { +public abstract class BaseS3ClientExpectTest extends BaseRestApiExpectTest<S3Client> { protected static final String CONSTANT_DATE = "2009-11-08T15:54:08.897Z"; http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/apis/s3/src/test/java/org/jclouds/s3/internal/BaseS3ClientTest.java ---------------------------------------------------------------------- diff --git a/apis/s3/src/test/java/org/jclouds/s3/internal/BaseS3ClientTest.java b/apis/s3/src/test/java/org/jclouds/s3/internal/BaseS3ClientTest.java index 2b418ae..63d4481 100644 --- a/apis/s3/src/test/java/org/jclouds/s3/internal/BaseS3ClientTest.java +++ b/apis/s3/src/test/java/org/jclouds/s3/internal/BaseS3ClientTest.java @@ -21,7 +21,7 @@ import static org.testng.Assert.assertEquals; import java.io.IOException; import org.jclouds.http.HttpRequest; -import org.jclouds.rest.internal.BaseAsyncClientTest; +import org.jclouds.rest.internal.BaseRestAnnotationProcessingTest; import org.jclouds.s3.S3ApiMetadata; import org.jclouds.s3.S3Client; import org.jclouds.s3.blobstore.functions.BlobToObject; @@ -30,7 +30,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @Test(groups = "unit") -public abstract class BaseS3ClientTest<T extends S3Client> extends BaseAsyncClientTest<T> { +public abstract class BaseS3ClientTest<T extends S3Client> extends BaseRestAnnotationProcessingTest<T> { protected BlobToObject blobToS3Object; protected RequestAuthorizeSignature filter; http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/apis/swift/src/test/java/org/jclouds/openstack/swift/CommonSwiftClientTest.java ---------------------------------------------------------------------- diff --git a/apis/swift/src/test/java/org/jclouds/openstack/swift/CommonSwiftClientTest.java b/apis/swift/src/test/java/org/jclouds/openstack/swift/CommonSwiftClientTest.java index d021eb5..ec5280b 100644 --- a/apis/swift/src/test/java/org/jclouds/openstack/swift/CommonSwiftClientTest.java +++ b/apis/swift/src/test/java/org/jclouds/openstack/swift/CommonSwiftClientTest.java @@ -35,7 +35,7 @@ import org.jclouds.openstack.swift.blobstore.SwiftBlobSigner; import org.jclouds.openstack.swift.blobstore.config.SwiftBlobStoreContextModule; import org.jclouds.openstack.swift.blobstore.config.TemporaryUrlExtensionModule; import org.jclouds.openstack.swift.config.SwiftHttpApiModule; -import org.jclouds.rest.internal.BaseAsyncClientTest; +import org.jclouds.rest.internal.BaseRestAnnotationProcessingTest; import org.testng.annotations.Test; import com.google.common.base.Supplier; @@ -50,7 +50,7 @@ import com.google.inject.TypeLiteral; */ // NOTE:without testName, this will not call @Before* and fail w/NPE during surefire @Test(groups = "unit", testName = "CommonSwiftClientTest") -public abstract class CommonSwiftClientTest extends BaseAsyncClientTest<SwiftClient> { +public abstract class CommonSwiftClientTest extends BaseRestAnnotationProcessingTest<SwiftClient> { public static final long UNIX_EPOCH_TIMESTAMP = 123456789L; public static final String TEMPORARY_URL_KEY = "get-or-set-X-Account-Meta-Temp-Url-Key"; http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/apis/swift/src/test/java/org/jclouds/openstack/swift/internal/BaseSwiftExpectTest.java ---------------------------------------------------------------------- diff --git a/apis/swift/src/test/java/org/jclouds/openstack/swift/internal/BaseSwiftExpectTest.java b/apis/swift/src/test/java/org/jclouds/openstack/swift/internal/BaseSwiftExpectTest.java index c28fcaf..96438a1 100644 --- a/apis/swift/src/test/java/org/jclouds/openstack/swift/internal/BaseSwiftExpectTest.java +++ b/apis/swift/src/test/java/org/jclouds/openstack/swift/internal/BaseSwiftExpectTest.java @@ -20,12 +20,12 @@ import java.util.Properties; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; -import org.jclouds.rest.internal.BaseRestClientExpectTest; +import org.jclouds.rest.internal.BaseRestApiExpectTest; /** * Base class for writing Swift Expect tests */ -public class BaseSwiftExpectTest<T> extends BaseRestClientExpectTest<T> { +public class BaseSwiftExpectTest<T> extends BaseRestApiExpectTest<T> { protected String endpoint = "http://myhost:8080/auth";; protected HttpRequest authRequest; http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/apis/swift/src/test/java/org/jclouds/openstack/swift/internal/BaseSwiftKeystoneExpectTest.java ---------------------------------------------------------------------- diff --git a/apis/swift/src/test/java/org/jclouds/openstack/swift/internal/BaseSwiftKeystoneExpectTest.java b/apis/swift/src/test/java/org/jclouds/openstack/swift/internal/BaseSwiftKeystoneExpectTest.java index 71c0a10..844b5a8 100644 --- a/apis/swift/src/test/java/org/jclouds/openstack/swift/internal/BaseSwiftKeystoneExpectTest.java +++ b/apis/swift/src/test/java/org/jclouds/openstack/swift/internal/BaseSwiftKeystoneExpectTest.java @@ -23,12 +23,12 @@ import javax.ws.rs.core.MediaType; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.jclouds.openstack.keystone.v2_0.internal.KeystoneFixture; -import org.jclouds.rest.internal.BaseRestClientExpectTest; +import org.jclouds.rest.internal.BaseRestApiExpectTest; /** * Base class for writing Swift Keystone Expect tests */ -public class BaseSwiftKeystoneExpectTest<T> extends BaseRestClientExpectTest<T> { +public class BaseSwiftKeystoneExpectTest<T> extends BaseRestApiExpectTest<T> { protected HttpRequest keystoneAuthWithUsernameAndPassword; protected HttpRequest keystoneAuthWithUsernameAndPasswordAndTenantName; protected HttpRequest keystoneAuthWithAccessKeyAndSecretKeyAndTenantName; http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/apis/vcloud/src/test/java/org/jclouds/vcloud/VCloudVersionsApiTest.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/test/java/org/jclouds/vcloud/VCloudVersionsApiTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/VCloudVersionsApiTest.java index ac872f5..6095e1d 100644 --- a/apis/vcloud/src/test/java/org/jclouds/vcloud/VCloudVersionsApiTest.java +++ b/apis/vcloud/src/test/java/org/jclouds/vcloud/VCloudVersionsApiTest.java @@ -15,6 +15,7 @@ * limitations under the License. */ package org.jclouds.vcloud; + import static org.jclouds.reflect.Reflection2.method; import static org.testng.Assert.assertEquals; @@ -24,7 +25,7 @@ import org.jclouds.http.HttpRequest; import org.jclouds.http.functions.ParseSax; import org.jclouds.providers.AnonymousProviderMetadata; import org.jclouds.providers.ProviderMetadata; -import org.jclouds.rest.internal.BaseAsyncClientTest; +import org.jclouds.rest.internal.BaseRestAnnotationProcessingTest; import org.jclouds.rest.internal.GeneratedHttpRequest; import org.jclouds.vcloud.xml.SupportedVersionsHandler; import org.testng.annotations.Test; @@ -37,7 +38,7 @@ import com.google.common.reflect.Invokable; */ // NOTE:without testName, this will not call @Before* and fail w/NPE during surefire @Test(groups = "unit", testName = "VCloudVersionsApiTest") -public class VCloudVersionsApiTest extends BaseAsyncClientTest<VCloudVersionsApi> { +public class VCloudVersionsApiTest extends BaseRestAnnotationProcessingTest<VCloudVersionsApi> { public void testVersions() throws SecurityException, NoSuchMethodException, IOException { Invokable<?, ?> method = method(VCloudVersionsApi.class, "getSupportedVersions"); http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/apis/vcloud/src/test/java/org/jclouds/vcloud/compute/BaseVCloudComputeServiceExpectTest.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/test/java/org/jclouds/vcloud/compute/BaseVCloudComputeServiceExpectTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/compute/BaseVCloudComputeServiceExpectTest.java index 4fbec0c..f343d6e 100644 --- a/apis/vcloud/src/test/java/org/jclouds/vcloud/compute/BaseVCloudComputeServiceExpectTest.java +++ b/apis/vcloud/src/test/java/org/jclouds/vcloud/compute/BaseVCloudComputeServiceExpectTest.java @@ -25,7 +25,7 @@ import org.jclouds.apis.ApiMetadata; import org.jclouds.compute.ComputeService; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; -import org.jclouds.rest.internal.BaseRestClientExpectTest; +import org.jclouds.rest.internal.BaseRestApiExpectTest; import org.jclouds.vcloud.VCloudApiMetadata; import org.jclouds.vcloud.VCloudMediaType; @@ -36,7 +36,7 @@ import com.google.inject.Module; /** * Base class for writing VCloud Expect tests for ComputeService operations */ -public abstract class BaseVCloudComputeServiceExpectTest extends BaseRestClientExpectTest<ComputeService> { +public abstract class BaseVCloudComputeServiceExpectTest extends BaseRestApiExpectTest<ComputeService> { protected static final String ENDPOINT = "https://zone.myvcloud.com/api";; protected HttpRequest versionsRequest = HttpRequest.builder().method("GET").endpoint( http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/apis/vcloud/src/test/java/org/jclouds/vcloud/internal/BaseVCloudApiTest.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/test/java/org/jclouds/vcloud/internal/BaseVCloudApiTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/internal/BaseVCloudApiTest.java index 0f97e26..feeec7c 100644 --- a/apis/vcloud/src/test/java/org/jclouds/vcloud/internal/BaseVCloudApiTest.java +++ b/apis/vcloud/src/test/java/org/jclouds/vcloud/internal/BaseVCloudApiTest.java @@ -34,7 +34,7 @@ import org.jclouds.providers.AnonymousProviderMetadata; import org.jclouds.providers.ProviderMetadata; import org.jclouds.rest.AuthorizationException; import org.jclouds.rest.ConfiguresHttpApi; -import org.jclouds.rest.internal.BaseAsyncClientTest; +import org.jclouds.rest.internal.BaseRestAnnotationProcessingTest; import org.jclouds.vcloud.VCloudApiMetadata; import org.jclouds.vcloud.VCloudMediaType; import org.jclouds.vcloud.VCloudVersionsApi; @@ -73,7 +73,7 @@ import com.google.inject.TypeLiteral; */ // NOTE:without testName, this will not call @Before* and fail w/NPE during surefire @Test(groups = "unit", testName = "BaseVCloudApiTest") -public abstract class BaseVCloudApiTest<T> extends BaseAsyncClientTest<T> { +public abstract class BaseVCloudApiTest<T> extends BaseRestAnnotationProcessingTest<T> { @Override protected void checkFilters(HttpRequest request) { http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/apis/vcloud/src/test/java/org/jclouds/vcloud/internal/VCloudLoginApiTest.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/test/java/org/jclouds/vcloud/internal/VCloudLoginApiTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/internal/VCloudLoginApiTest.java index 9971e74..c2896dc 100644 --- a/apis/vcloud/src/test/java/org/jclouds/vcloud/internal/VCloudLoginApiTest.java +++ b/apis/vcloud/src/test/java/org/jclouds/vcloud/internal/VCloudLoginApiTest.java @@ -27,7 +27,7 @@ import org.jclouds.http.filters.BasicAuthentication; import org.jclouds.location.Provider; import org.jclouds.providers.AnonymousProviderMetadata; import org.jclouds.providers.ProviderMetadata; -import org.jclouds.rest.internal.BaseAsyncClientTest; +import org.jclouds.rest.internal.BaseRestAnnotationProcessingTest; import org.jclouds.rest.internal.GeneratedHttpRequest; import org.jclouds.vcloud.endpoints.VCloudLogin; import org.jclouds.vcloud.functions.ParseLoginResponseFromHeaders; @@ -45,7 +45,7 @@ import com.google.inject.Provides; */ // NOTE:without testName, this will not call @Before* and fail w/NPE during surefire @Test(groups = "unit", testName = "VCloudLoginApiTest") -public class VCloudLoginApiTest extends BaseAsyncClientTest<VCloudLoginApi> { +public class VCloudLoginApiTest extends BaseRestAnnotationProcessingTest<VCloudLoginApi> { public void testLogin() throws SecurityException, NoSuchMethodException, IOException { Invokable<?, ?> method = method(VCloudLoginApi.class, "login"); http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/blobstore/src/test/java/org/jclouds/blobstore/TransientBlobRequestSignerTest.java ---------------------------------------------------------------------- diff --git a/blobstore/src/test/java/org/jclouds/blobstore/TransientBlobRequestSignerTest.java b/blobstore/src/test/java/org/jclouds/blobstore/TransientBlobRequestSignerTest.java index fb1e89b..fab598f 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/TransientBlobRequestSignerTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/TransientBlobRequestSignerTest.java @@ -27,7 +27,7 @@ import org.jclouds.blobstore.config.LocalBlobStore; import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.domain.BlobBuilder; import org.jclouds.http.HttpRequest; -import org.jclouds.rest.internal.BaseAsyncClientTest; +import org.jclouds.rest.internal.BaseRestAnnotationProcessingTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -41,7 +41,7 @@ import com.google.common.io.ByteSource; */ // NOTE:without testName, this will not call @Before* and fail w/NPE during surefire @Test(groups = "unit", testName = "TransientBlobRequestSignerTest") -public class TransientBlobRequestSignerTest extends BaseAsyncClientTest<LocalBlobStore> { +public class TransientBlobRequestSignerTest extends BaseRestAnnotationProcessingTest<LocalBlobStore> { private BlobRequestSigner signer; private Provider<BlobBuilder> blobFactory; http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/blobstore/src/test/java/org/jclouds/blobstore/internal/BaseBlobSignerExpectTest.java ---------------------------------------------------------------------- diff --git a/blobstore/src/test/java/org/jclouds/blobstore/internal/BaseBlobSignerExpectTest.java b/blobstore/src/test/java/org/jclouds/blobstore/internal/BaseBlobSignerExpectTest.java index 02de7f1..7b3aad0 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/internal/BaseBlobSignerExpectTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/internal/BaseBlobSignerExpectTest.java @@ -28,7 +28,7 @@ import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.options.GetOptions; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; -import org.jclouds.rest.internal.BaseRestClientExpectTest; +import org.jclouds.rest.internal.BaseRestApiExpectTest; import org.testng.annotations.Test; import com.google.common.base.Function; @@ -36,7 +36,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.hash.HashCode; import com.google.inject.Module; -public abstract class BaseBlobSignerExpectTest extends BaseRestClientExpectTest<BlobStore> { +public abstract class BaseBlobSignerExpectTest extends BaseRestApiExpectTest<BlobStore> { /** * define the requests and responses needed to initialize the blobstore. For http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/common/openstack/src/test/java/org/jclouds/openstack/internal/OpenStackAuthClientTest.java ---------------------------------------------------------------------- diff --git a/common/openstack/src/test/java/org/jclouds/openstack/internal/OpenStackAuthClientTest.java b/common/openstack/src/test/java/org/jclouds/openstack/internal/OpenStackAuthClientTest.java index 9e14ba7..5829fa8 100644 --- a/common/openstack/src/test/java/org/jclouds/openstack/internal/OpenStackAuthClientTest.java +++ b/common/openstack/src/test/java/org/jclouds/openstack/internal/OpenStackAuthClientTest.java @@ -27,7 +27,7 @@ import org.jclouds.http.IntegrationTestAsyncClient; import org.jclouds.http.IntegrationTestClient; import org.jclouds.openstack.functions.ParseAuthenticationResponseFromHeaders; import org.jclouds.rest.AnonymousRestApiMetadata; -import org.jclouds.rest.internal.BaseAsyncClientTest; +import org.jclouds.rest.internal.BaseRestAnnotationProcessingTest; import org.jclouds.rest.internal.GeneratedHttpRequest; import org.testng.annotations.Test; @@ -35,7 +35,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.reflect.Invokable; @Test(groups = "unit", testName = "OpenStackAuthClientTest") -public class OpenStackAuthClientTest extends BaseAsyncClientTest<OpenStackAuthClient> { +public class OpenStackAuthClientTest extends BaseRestAnnotationProcessingTest<OpenStackAuthClient> { public void testAuthenticate() throws SecurityException, NoSuchMethodException, IOException { Invokable<?, ?> method = method(OpenStackAuthClient.class, "authenticate", String.class, String.class); http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/common/openstack/src/test/java/org/jclouds/openstack/keystone/v1_1/internal/BaseKeystoneRestClientExpectTest.java ---------------------------------------------------------------------- diff --git a/common/openstack/src/test/java/org/jclouds/openstack/keystone/v1_1/internal/BaseKeystoneRestClientExpectTest.java b/common/openstack/src/test/java/org/jclouds/openstack/keystone/v1_1/internal/BaseKeystoneRestClientExpectTest.java index beada2b..1a764aa 100644 --- a/common/openstack/src/test/java/org/jclouds/openstack/keystone/v1_1/internal/BaseKeystoneRestClientExpectTest.java +++ b/common/openstack/src/test/java/org/jclouds/openstack/keystone/v1_1/internal/BaseKeystoneRestClientExpectTest.java @@ -19,14 +19,14 @@ package org.jclouds.openstack.keystone.v1_1.internal; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.jclouds.openstack.keystone.v1_1.config.AuthenticationServiceModule; -import org.jclouds.rest.internal.BaseRestClientExpectTest; +import org.jclouds.rest.internal.BaseRestApiExpectTest; import com.google.common.net.HttpHeaders; /** * Base class for writing KeyStone Rest Client Expect tests */ -public class BaseKeystoneRestClientExpectTest<S> extends BaseRestClientExpectTest<S> { +public class BaseKeystoneRestClientExpectTest<S> extends BaseRestApiExpectTest<S> { protected String endpoint = "http://localhost:5000";; http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/core/src/test/java/org/jclouds/http/IntegrationTestClientExpectTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/jclouds/http/IntegrationTestClientExpectTest.java b/core/src/test/java/org/jclouds/http/IntegrationTestClientExpectTest.java index abb64ea..33cb3a3 100644 --- a/core/src/test/java/org/jclouds/http/IntegrationTestClientExpectTest.java +++ b/core/src/test/java/org/jclouds/http/IntegrationTestClientExpectTest.java @@ -26,7 +26,7 @@ import javax.net.ssl.SSLException; import org.jclouds.providers.JcloudsTestBlobStoreProviderMetadata; import org.jclouds.providers.ProviderMetadata; -import org.jclouds.rest.internal.BaseRestClientExpectTest; +import org.jclouds.rest.internal.BaseRestApiExpectTest; import org.testng.annotations.Test; import com.google.common.base.Function; @@ -37,7 +37,7 @@ import com.google.common.base.Function; */ @Test(groups = "unit", testName = "IntegrationTestClientExpectTest") // only needed as IntegrationTestClient is not registered in rest.properties -public class IntegrationTestClientExpectTest extends BaseRestClientExpectTest<IntegrationTestClient> { +public class IntegrationTestClientExpectTest extends BaseRestApiExpectTest<IntegrationTestClient> { public void testRetryOnSSLExceptionClose() { // keeps track of request count http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/core/src/test/java/org/jclouds/rest/annotationparsing/DelegateAnnotationExpectTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/jclouds/rest/annotationparsing/DelegateAnnotationExpectTest.java b/core/src/test/java/org/jclouds/rest/annotationparsing/DelegateAnnotationExpectTest.java index 5c0e4e5..22061c5 100644 --- a/core/src/test/java/org/jclouds/rest/annotationparsing/DelegateAnnotationExpectTest.java +++ b/core/src/test/java/org/jclouds/rest/annotationparsing/DelegateAnnotationExpectTest.java @@ -35,7 +35,7 @@ import org.jclouds.rest.annotations.Fallback; import org.jclouds.rest.annotations.Payload; import org.jclouds.rest.annotations.PayloadParam; import org.jclouds.rest.config.RestClientModule; -import org.jclouds.rest.internal.BaseRestClientExpectTest; +import org.jclouds.rest.internal.BaseRestApiExpectTest; import org.testng.annotations.Test; import com.google.common.collect.ImmutableMap; @@ -46,7 +46,7 @@ import com.google.inject.Module; * Tests the ways that {@link Delegate} */ @Test(groups = "unit", testName = "DelegateAnnotationExpectTest") -public class DelegateAnnotationExpectTest extends BaseRestClientExpectTest<DelegateAnnotationExpectTest.DelegatingApi> { +public class DelegateAnnotationExpectTest extends BaseRestApiExpectTest<DelegateAnnotationExpectTest.DelegatingApi> { interface DelegatingApi { @Delegate http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/core/src/test/java/org/jclouds/rest/annotationparsing/JAXBResponseParserAnnotationExpectTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/jclouds/rest/annotationparsing/JAXBResponseParserAnnotationExpectTest.java b/core/src/test/java/org/jclouds/rest/annotationparsing/JAXBResponseParserAnnotationExpectTest.java index 676583a..337490a 100644 --- a/core/src/test/java/org/jclouds/rest/annotationparsing/JAXBResponseParserAnnotationExpectTest.java +++ b/core/src/test/java/org/jclouds/rest/annotationparsing/JAXBResponseParserAnnotationExpectTest.java @@ -33,7 +33,7 @@ import org.jclouds.http.HttpResponse; import org.jclouds.providers.ProviderMetadata; import org.jclouds.rest.annotations.JAXBResponseParser; import org.jclouds.rest.annotations.Transform; -import org.jclouds.rest.internal.BaseRestClientExpectTest; +import org.jclouds.rest.internal.BaseRestApiExpectTest; import org.testng.annotations.Test; import com.google.common.base.Function; @@ -45,7 +45,7 @@ import com.google.common.util.concurrent.ListenableFuture; */ @Test(groups = "unit", testName = "JAXBResponseParserAnnotationExpectTest") public class JAXBResponseParserAnnotationExpectTest extends - BaseRestClientExpectTest<JAXBResponseParserAnnotationExpectTest.TestJAXBApi> { + BaseRestApiExpectTest<JAXBResponseParserAnnotationExpectTest.TestJAXBApi> { @XmlRootElement(name = "test") public static class TestJAXBDomain { http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/core/src/test/java/org/jclouds/rest/annotationparsing/PATCHAnnotationExpectTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/jclouds/rest/annotationparsing/PATCHAnnotationExpectTest.java b/core/src/test/java/org/jclouds/rest/annotationparsing/PATCHAnnotationExpectTest.java index befce6d..eaec4cf 100644 --- a/core/src/test/java/org/jclouds/rest/annotationparsing/PATCHAnnotationExpectTest.java +++ b/core/src/test/java/org/jclouds/rest/annotationparsing/PATCHAnnotationExpectTest.java @@ -27,7 +27,7 @@ import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.jclouds.providers.ProviderMetadata; import org.jclouds.rest.annotations.PATCH; -import org.jclouds.rest.internal.BaseRestClientExpectTest; +import org.jclouds.rest.internal.BaseRestApiExpectTest; import org.testng.annotations.Test; /** @@ -35,7 +35,7 @@ import org.testng.annotations.Test; */ @Test(groups = "unit", testName = "PATCHAnnotationExpectTest") public class PATCHAnnotationExpectTest extends - BaseRestClientExpectTest<PATCHAnnotationExpectTest.TestPATCHAnnotationApi> { + BaseRestApiExpectTest<PATCHAnnotationExpectTest.TestPATCHAnnotationApi> { interface TestPATCHAnnotationApi extends Closeable { @PATCH http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/core/src/test/java/org/jclouds/rest/annotationparsing/ProvidesAnnotationExpectTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/jclouds/rest/annotationparsing/ProvidesAnnotationExpectTest.java b/core/src/test/java/org/jclouds/rest/annotationparsing/ProvidesAnnotationExpectTest.java index ca48213..19260d8 100644 --- a/core/src/test/java/org/jclouds/rest/annotationparsing/ProvidesAnnotationExpectTest.java +++ b/core/src/test/java/org/jclouds/rest/annotationparsing/ProvidesAnnotationExpectTest.java @@ -31,7 +31,7 @@ import org.jclouds.providers.ProviderMetadata; import org.jclouds.rest.AuthorizationException; import org.jclouds.rest.ConfiguresRestClient; import org.jclouds.rest.config.RestClientModule; -import org.jclouds.rest.internal.BaseRestClientExpectTest; +import org.jclouds.rest.internal.BaseRestApiExpectTest; import org.testng.annotations.Test; import com.google.common.collect.ImmutableMap; @@ -45,7 +45,7 @@ import com.google.inject.name.Names; * Tests that we can add {@link Provides} methods on interfaces */ @Test(groups = "unit", testName = "ProvidesAnnotationExpectTest") -public class ProvidesAnnotationExpectTest extends BaseRestClientExpectTest<ProvidesAnnotationExpectTest.ProvidingApi> { +public class ProvidesAnnotationExpectTest extends BaseRestApiExpectTest<ProvidesAnnotationExpectTest.ProvidingApi> { interface ProvidingApi extends Closeable { @Provides http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/core/src/test/java/org/jclouds/rest/internal/BaseAsyncApiTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/jclouds/rest/internal/BaseAsyncApiTest.java b/core/src/test/java/org/jclouds/rest/internal/BaseAsyncApiTest.java deleted file mode 100644 index 57d4df5..0000000 --- a/core/src/test/java/org/jclouds/rest/internal/BaseAsyncApiTest.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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.rest.internal; - -import static com.google.common.base.Preconditions.checkNotNull; - -import java.io.IOException; -import java.util.Properties; - -import org.jclouds.ContextBuilder; -import org.jclouds.apis.ApiMetadata; -import org.jclouds.http.HttpRequest; -import org.jclouds.http.functions.ParseSax; -import org.jclouds.logging.config.NullLoggingModule; -import org.jclouds.providers.ProviderMetadata; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; - -import com.google.common.collect.ImmutableSet; -import com.google.inject.Binder; -import com.google.inject.Injector; -import com.google.inject.Module; - -@Test(groups = "unit") -public abstract class BaseAsyncApiTest<T> extends BaseRestApiTest { - - protected RestAnnotationProcessor processor; - - protected abstract void checkFilters(HttpRequest request); - - protected Module createModule() { - return new Module() { - - @Override - public void configure(Binder binder) { - - } - - }; - } - - @BeforeClass - protected void setupFactory() throws IOException { - injector = createInjector(); - parserFactory = injector.getInstance(ParseSax.Factory.class); - processor = injector.getInstance(RestAnnotationProcessor.class); - } - - protected String identity = "identity"; - protected String credential = "credential"; - - /** - * @see org.jclouds.providers.Providers#withId - */ - protected ProviderMetadata createProviderMetadata() { - return null; - } - - /** - * @see org.jclouds.apis.Apis#withId - */ - protected ApiMetadata createApiMetadata() { - return null; - } - - protected Injector createInjector() { - ProviderMetadata pm = createProviderMetadata(); - - ContextBuilder builder = pm != null ? ContextBuilder.newBuilder(pm) : ContextBuilder.newBuilder(ApiMetadata.class - .cast(checkNotNull(createApiMetadata(), - "either createApiMetadata or createProviderMetadata must be overridden"))); - - return builder.credentials(identity, credential) - .modules(ImmutableSet.of(new MockModule(), new NullLoggingModule(), createModule())) - .overrides(setupProperties()).buildInjector(); - } - - /** - * override this to supply context-specific parameters during tests. - */ - protected Properties setupProperties() { - return new Properties(); - } -} http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/core/src/test/java/org/jclouds/rest/internal/BaseAsyncClientTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/jclouds/rest/internal/BaseAsyncClientTest.java b/core/src/test/java/org/jclouds/rest/internal/BaseAsyncClientTest.java index be3cab5..26c4de5 100644 --- a/core/src/test/java/org/jclouds/rest/internal/BaseAsyncClientTest.java +++ b/core/src/test/java/org/jclouds/rest/internal/BaseAsyncClientTest.java @@ -19,6 +19,7 @@ package org.jclouds.rest.internal; import org.testng.annotations.Test; @Test(groups = "unit") -public abstract class BaseAsyncClientTest<T> extends BaseAsyncApiTest<T> { +// TODO: remove once abiquo no longer uses this. +public abstract class BaseAsyncClientTest<T> extends BaseRestAnnotationProcessingTest<T> { } http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/core/src/test/java/org/jclouds/rest/internal/BaseRestAnnotationProcessingTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/jclouds/rest/internal/BaseRestAnnotationProcessingTest.java b/core/src/test/java/org/jclouds/rest/internal/BaseRestAnnotationProcessingTest.java new file mode 100644 index 0000000..6a4c5d7 --- /dev/null +++ b/core/src/test/java/org/jclouds/rest/internal/BaseRestAnnotationProcessingTest.java @@ -0,0 +1,98 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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.rest.internal; + +import static com.google.common.base.Preconditions.checkNotNull; + +import java.io.IOException; +import java.util.Properties; + +import org.jclouds.ContextBuilder; +import org.jclouds.apis.ApiMetadata; +import org.jclouds.http.HttpRequest; +import org.jclouds.http.functions.ParseSax; +import org.jclouds.logging.config.NullLoggingModule; +import org.jclouds.providers.ProviderMetadata; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + +import com.google.common.collect.ImmutableSet; +import com.google.inject.Binder; +import com.google.inject.Injector; +import com.google.inject.Module; + +@Test(groups = "unit") +public abstract class BaseRestAnnotationProcessingTest<T> extends BaseRestApiTest { + + protected RestAnnotationProcessor processor; + + protected abstract void checkFilters(HttpRequest request); + + protected Module createModule() { + return new Module() { + + @Override + public void configure(Binder binder) { + + } + + }; + } + + @BeforeClass + protected void setupFactory() throws IOException { + injector = createInjector(); + parserFactory = injector.getInstance(ParseSax.Factory.class); + processor = injector.getInstance(RestAnnotationProcessor.class); + } + + protected String identity = "identity"; + protected String credential = "credential"; + + /** + * @see org.jclouds.providers.Providers#withId + */ + protected ProviderMetadata createProviderMetadata() { + return null; + } + + /** + * @see org.jclouds.apis.Apis#withId + */ + protected ApiMetadata createApiMetadata() { + return null; + } + + protected Injector createInjector() { + ProviderMetadata pm = createProviderMetadata(); + + ContextBuilder builder = pm != null ? ContextBuilder.newBuilder(pm) : ContextBuilder.newBuilder(ApiMetadata.class + .cast(checkNotNull(createApiMetadata(), + "either createApiMetadata or createProviderMetadata must be overridden"))); + + return builder.credentials(identity, credential) + .modules(ImmutableSet.of(new MockModule(), new NullLoggingModule(), createModule())) + .overrides(setupProperties()).buildInjector(); + } + + /** + * override this to supply context-specific parameters during tests. + */ + protected Properties setupProperties() { + return new Properties(); + } +} http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/core/src/test/java/org/jclouds/rest/internal/BaseRestClientExpectTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/jclouds/rest/internal/BaseRestClientExpectTest.java b/core/src/test/java/org/jclouds/rest/internal/BaseRestClientExpectTest.java deleted file mode 100644 index cf89bc0..0000000 --- a/core/src/test/java/org/jclouds/rest/internal/BaseRestClientExpectTest.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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.rest.internal; - - -/** - * Please use {@link BaseRestApiExpectTest} - */ -public abstract class BaseRestClientExpectTest<S> extends BaseRestApiExpectTest<S> { - -} http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/BaseAWSEC2ApiTest.java ---------------------------------------------------------------------- diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/BaseAWSEC2ApiTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/BaseAWSEC2ApiTest.java index 30ac6f4..caf6e48 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/BaseAWSEC2ApiTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/BaseAWSEC2ApiTest.java @@ -38,7 +38,7 @@ import org.jclouds.location.config.LocationModule; import org.jclouds.location.suppliers.RegionIdToURISupplier; import org.jclouds.location.suppliers.RegionIdToZoneIdsSupplier; import org.jclouds.rest.ConfiguresHttpApi; -import org.jclouds.rest.internal.BaseAsyncApiTest; +import org.jclouds.rest.internal.BaseRestAnnotationProcessingTest; import org.jclouds.util.Suppliers2; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; @@ -53,7 +53,7 @@ import com.google.inject.Module; import com.google.inject.Provides; @Test(groups = "unit") -public abstract class BaseAWSEC2ApiTest<T> extends BaseAsyncApiTest<T> { +public abstract class BaseAWSEC2ApiTest<T> extends BaseRestAnnotationProcessingTest<T> { @ConfiguresHttpApi protected static class StubAWSEC2HttpApiModule extends AWSEC2HttpApiModule { http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/providers/aws-s3/src/test/java/org/jclouds/aws/s3/internal/BaseAWSS3ClientExpectTest.java ---------------------------------------------------------------------- diff --git a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/internal/BaseAWSS3ClientExpectTest.java b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/internal/BaseAWSS3ClientExpectTest.java index 9613b86..ce0b1a5 100644 --- a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/internal/BaseAWSS3ClientExpectTest.java +++ b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/internal/BaseAWSS3ClientExpectTest.java @@ -22,7 +22,7 @@ import org.jclouds.aws.s3.config.AWSS3HttpApiModule; import org.jclouds.date.TimeStamp; import org.jclouds.providers.ProviderMetadata; import org.jclouds.rest.ConfiguresHttpApi; -import org.jclouds.rest.internal.BaseRestClientExpectTest; +import org.jclouds.rest.internal.BaseRestApiExpectTest; import com.google.common.base.Supplier; import com.google.inject.Module; @@ -30,7 +30,7 @@ import com.google.inject.Module; /** * Base class for writing Expect tests for AWS-S3 */ -public class BaseAWSS3ClientExpectTest extends BaseRestClientExpectTest<AWSS3Client> { +public class BaseAWSS3ClientExpectTest extends BaseRestApiExpectTest<AWSS3Client> { protected static final String CONSTANT_DATE = "2009-11-08T15:54:08.897Z"; http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/providers/azureblob/src/test/java/org/jclouds/azureblob/AzureBlobClientTest.java ---------------------------------------------------------------------- diff --git a/providers/azureblob/src/test/java/org/jclouds/azureblob/AzureBlobClientTest.java b/providers/azureblob/src/test/java/org/jclouds/azureblob/AzureBlobClientTest.java index 34f0c5c..c738e45 100644 --- a/providers/azureblob/src/test/java/org/jclouds/azureblob/AzureBlobClientTest.java +++ b/providers/azureblob/src/test/java/org/jclouds/azureblob/AzureBlobClientTest.java @@ -44,7 +44,7 @@ import org.jclouds.http.functions.ParseSax; import org.jclouds.http.functions.ReleasePayloadAndReturn; import org.jclouds.http.functions.ReturnTrueIf2xx; import org.jclouds.http.options.GetOptions; -import org.jclouds.rest.internal.BaseAsyncClientTest; +import org.jclouds.rest.internal.BaseRestAnnotationProcessingTest; import org.jclouds.rest.internal.GeneratedHttpRequest; import org.testng.annotations.Test; @@ -54,7 +54,7 @@ import com.google.common.collect.ImmutableMultimap; import com.google.common.reflect.Invokable; @Test(groups = "unit", testName = "AzureBlobClientTest") -public class AzureBlobClientTest extends BaseAsyncClientTest<AzureBlobClient> { +public class AzureBlobClientTest extends BaseRestAnnotationProcessingTest<AzureBlobClient> { public void testListContainers() throws SecurityException, NoSuchMethodException, IOException { Invokable<?, ?> method = method(AzureBlobClient.class, "listContainers", ListOptions[].class); http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/providers/azureblob/src/test/java/org/jclouds/azureblob/binders/BindAzureBlobMetadataToRequestTest.java ---------------------------------------------------------------------- diff --git a/providers/azureblob/src/test/java/org/jclouds/azureblob/binders/BindAzureBlobMetadataToRequestTest.java b/providers/azureblob/src/test/java/org/jclouds/azureblob/binders/BindAzureBlobMetadataToRequestTest.java index faec9bb..8fc1030 100644 --- a/providers/azureblob/src/test/java/org/jclouds/azureblob/binders/BindAzureBlobMetadataToRequestTest.java +++ b/providers/azureblob/src/test/java/org/jclouds/azureblob/binders/BindAzureBlobMetadataToRequestTest.java @@ -26,13 +26,13 @@ import org.jclouds.azureblob.domain.AzureBlob; import org.jclouds.http.HttpRequest; import org.jclouds.io.Payload; import org.jclouds.io.Payloads; -import org.jclouds.rest.internal.BaseAsyncClientTest; +import org.jclouds.rest.internal.BaseRestAnnotationProcessingTest; import org.testng.annotations.Test; import com.google.common.collect.ImmutableMap; @Test(groups = "unit", testName = "BindAzureBlobMetadataToRequestTest") -public class BindAzureBlobMetadataToRequestTest extends BaseAsyncClientTest<AzureBlobClient> { +public class BindAzureBlobMetadataToRequestTest extends BaseRestAnnotationProcessingTest<AzureBlobClient> { @Test public void testPassWithMinimumDetailsAndPayload64MB() { http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/AzureBlobRequestSignerTest.java ---------------------------------------------------------------------- diff --git a/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/AzureBlobRequestSignerTest.java b/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/AzureBlobRequestSignerTest.java index 024611c..586e361 100644 --- a/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/AzureBlobRequestSignerTest.java +++ b/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/AzureBlobRequestSignerTest.java @@ -30,7 +30,7 @@ import org.jclouds.blobstore.domain.Blob.Factory; import org.jclouds.date.TimeStamp; import org.jclouds.http.HttpRequest; import org.jclouds.rest.ConfiguresHttpApi; -import org.jclouds.rest.internal.BaseAsyncClientTest; +import org.jclouds.rest.internal.BaseRestAnnotationProcessingTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -43,7 +43,7 @@ import com.google.inject.Module; */ // NOTE:without testName, this will not call @Before* and fail w/NPE during surefire @Test(groups = "unit", testName = "AzureBlobRequestSignerTest") -public class AzureBlobRequestSignerTest extends BaseAsyncClientTest<AzureBlobClient> { +public class AzureBlobRequestSignerTest extends BaseRestAnnotationProcessingTest<AzureBlobClient> { public AzureBlobRequestSignerTest() { // this is base64 decoded in the signer; http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/providers/glesys/src/test/java/org/jclouds/glesys/GleSYSApiTest.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/test/java/org/jclouds/glesys/GleSYSApiTest.java b/providers/glesys/src/test/java/org/jclouds/glesys/GleSYSApiTest.java index 2feb7ac..0419594 100644 --- a/providers/glesys/src/test/java/org/jclouds/glesys/GleSYSApiTest.java +++ b/providers/glesys/src/test/java/org/jclouds/glesys/GleSYSApiTest.java @@ -21,7 +21,7 @@ import java.util.concurrent.ExecutionException; import org.jclouds.http.HttpRequest; import org.jclouds.providers.ProviderMetadata; -import org.jclouds.rest.internal.BaseAsyncApiTest; +import org.jclouds.rest.internal.BaseRestAnnotationProcessingTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -31,7 +31,7 @@ import org.testng.annotations.Test; // NOTE:without testName, this will not call @Before* and fail w/NPE during // surefire @Test(groups = "unit", testName = "GleSYSApiTest") -public class GleSYSApiTest extends BaseAsyncApiTest<GleSYSApi> { +public class GleSYSApiTest extends BaseRestAnnotationProcessingTest<GleSYSApi> { private GleSYSApi syncApi; @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/providers/gogrid/src/test/java/org/jclouds/gogrid/features/BaseGoGridApiTest.java ---------------------------------------------------------------------- diff --git a/providers/gogrid/src/test/java/org/jclouds/gogrid/features/BaseGoGridApiTest.java b/providers/gogrid/src/test/java/org/jclouds/gogrid/features/BaseGoGridApiTest.java index 4a90875..ebe5f0b 100644 --- a/providers/gogrid/src/test/java/org/jclouds/gogrid/features/BaseGoGridApiTest.java +++ b/providers/gogrid/src/test/java/org/jclouds/gogrid/features/BaseGoGridApiTest.java @@ -25,21 +25,21 @@ import org.jclouds.gogrid.filters.SharedKeyLiteAuthentication; import org.jclouds.http.HttpRequest; import org.jclouds.providers.ProviderMetadata; import org.jclouds.rest.ConfiguresHttpApi; -import org.jclouds.rest.internal.BaseAsyncClientTest; +import org.jclouds.rest.internal.BaseRestAnnotationProcessingTest; import org.testng.annotations.Test; import com.google.common.base.Supplier; import com.google.inject.Module; @Test(groups = "unit") -public abstract class BaseGoGridApiTest<T> extends BaseAsyncClientTest<T> { +public abstract class BaseGoGridApiTest<T> extends BaseRestAnnotationProcessingTest<T> { @Override protected void checkFilters(HttpRequest request) { assertEquals(request.getFilters().size(), 1); assertEquals(request.getFilters().get(0).getClass(), SharedKeyLiteAuthentication.class); } - @ConfiguresHttpApi + @ConfiguresHttpApi protected static final class TestGoGridHttpApiModule extends GoGridHttpApiModule { @Override protected void configure() { http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/providers/gogrid/src/test/java/org/jclouds/gogrid/features/BaseGoGridHttpApiExpectTest.java ---------------------------------------------------------------------- diff --git a/providers/gogrid/src/test/java/org/jclouds/gogrid/features/BaseGoGridHttpApiExpectTest.java b/providers/gogrid/src/test/java/org/jclouds/gogrid/features/BaseGoGridHttpApiExpectTest.java index 4b6fd2d..db529bd 100644 --- a/providers/gogrid/src/test/java/org/jclouds/gogrid/features/BaseGoGridHttpApiExpectTest.java +++ b/providers/gogrid/src/test/java/org/jclouds/gogrid/features/BaseGoGridHttpApiExpectTest.java @@ -20,18 +20,18 @@ import org.jclouds.date.TimeStamp; import org.jclouds.gogrid.GoGridApi; import org.jclouds.gogrid.config.GoGridHttpApiModule; import org.jclouds.rest.ConfiguresHttpApi; -import org.jclouds.rest.internal.BaseRestClientExpectTest; +import org.jclouds.rest.internal.BaseRestApiExpectTest; import com.google.common.base.Supplier; import com.google.inject.Module; -public class BaseGoGridHttpApiExpectTest extends BaseRestClientExpectTest<GoGridApi> { +public class BaseGoGridHttpApiExpectTest extends BaseRestApiExpectTest<GoGridApi> { public BaseGoGridHttpApiExpectTest() { provider = "gogrid"; } - @ConfiguresHttpApi + @ConfiguresHttpApi protected static final class TestGoGridHttpApiModule extends GoGridHttpApiModule { @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/99e217b7/providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/internal/BaseHPCloudObjectStorageBlobStoreExpectTest.java ---------------------------------------------------------------------- diff --git a/providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/internal/BaseHPCloudObjectStorageBlobStoreExpectTest.java b/providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/internal/BaseHPCloudObjectStorageBlobStoreExpectTest.java index 73ce6da..18181f8 100644 --- a/providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/internal/BaseHPCloudObjectStorageBlobStoreExpectTest.java +++ b/providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/internal/BaseHPCloudObjectStorageBlobStoreExpectTest.java @@ -23,14 +23,14 @@ import org.jclouds.hpcloud.objectstorage.HPCloudObjectStorageProviderMetadata; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.jclouds.providers.ProviderMetadata; -import org.jclouds.rest.internal.BaseRestClientExpectTest; +import org.jclouds.rest.internal.BaseRestApiExpectTest; import org.testng.annotations.Test; import com.google.common.base.Function; import com.google.inject.Module; @Test(groups = "unit", testName = "HPCloudObjectStorageExpectTest") -public class BaseHPCloudObjectStorageBlobStoreExpectTest extends BaseRestClientExpectTest<BlobStore> { +public class BaseHPCloudObjectStorageBlobStoreExpectTest extends BaseRestApiExpectTest<BlobStore> { protected HttpRequest keystoneAuthWithUsernameAndPassword;
