From 99e217b720248e26b081ff379aa2cf4d15281965 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Sun, 5 Oct 2014 16:13:39 -0700 Subject: [PATCH] Move off confusing test names. --- .../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 +-- .../ec2/internal/BaseEC2ExpectTest.java | 4 +-- .../elasticstack/ElasticStackApiTest.java | 4 +-- .../BaseKeystoneRestClientExpectTest.java | 4 +-- .../s3/internal/BaseS3ClientExpectTest.java | 4 +-- .../jclouds/s3/internal/BaseS3ClientTest.java | 4 +-- .../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 +-- ...AXBResponseParserAnnotationExpectTest.java | 4 +-- .../PATCHAnnotationExpectTest.java | 4 +-- .../ProvidesAnnotationExpectTest.java | 4 +-- .../rest/internal/BaseAsyncClientTest.java | 3 ++- ... => BaseRestAnnotationProcessingTest.java} | 2 +- .../internal/BaseRestClientExpectTest.java | 25 ------------------- .../aws/ec2/features/BaseAWSEC2ApiTest.java | 4 +-- .../internal/BaseAWSS3ClientExpectTest.java | 4 +-- .../azureblob/AzureBlobClientTest.java | 4 +-- .../BindAzureBlobMetadataToRequestTest.java | 4 +-- .../blobstore/AzureBlobRequestSignerTest.java | 4 +-- .../org/jclouds/glesys/GleSYSApiTest.java | 4 +-- .../gogrid/features/BaseGoGridApiTest.java | 6 ++--- .../features/BaseGoGridHttpApiExpectTest.java | 6 ++--- ...CloudObjectStorageBlobStoreExpectTest.java | 4 +-- 39 files changed, 78 insertions(+), 101 deletions(-) rename core/src/test/java/org/jclouds/rest/internal/{BaseAsyncApiTest.java => BaseRestAnnotationProcessingTest.java} (97%) delete mode 100644 core/src/test/java/org/jclouds/rest/internal/BaseRestClientExpectTest.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 7fa5d4f543..8a32b37499 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 { +public class AtmosClientTest extends BaseRestAnnotationProcessingTest { private BlobToObject blobToObject; 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 39720ab40f..46348fb0f8 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 { +public class AtmosBlobRequestSignerTest extends BaseRestAnnotationProcessingTest { public AtmosBlobRequestSignerTest() { // this is base64 decoded in the signer; 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 67ecd33161..28f9ca60d1 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 { +public class CloudServersClientTest extends BaseRestAnnotationProcessingTest { public void testCreateServer() throws IOException, SecurityException, NoSuchMethodException { Invokable method = method(CloudServersClient.class, "createServer", String.class, int.class, int.class, 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 664758d820..5683bdcb76 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 extends BaseAsyncApiTest { +public abstract class BaseCloudStackApiTest extends BaseRestAnnotationProcessingTest { @ConfiguresHttpApi public static class CloudStackHttpApiModuleExtension extends CloudStackHttpApiModule { 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 5237efc0f9..275bc6f7c8 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 extends BaseRestClientExpectTest { +public abstract class BaseCloudStackExpectTest extends BaseRestApiExpectTest { public BaseCloudStackExpectTest() { provider = "cloudstack"; 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 3a2e64597c..e70f760e10 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 extends BaseAsyncApiTest { +public abstract class BaseEC2ApiTest extends BaseRestAnnotationProcessingTest { @ConfiguresHttpApi protected static class StubEC2HttpApiModule extends BaseEC2HttpApiModule { 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 29808b7b39..d4cb9ecec7 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 extends BaseRestClientExpectTest { +public abstract class BaseEC2ExpectTest extends BaseRestApiExpectTest { protected static final String CONSTANT_DATE = "2012-04-16T15:54:08.897Z"; protected DateService dateService = new SimpleDateFormatDateService(); 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 b4a77a65dd..83e0ecd714 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 { +public class ElasticStackApiTest extends BaseRestAnnotationProcessingTest { public void testListServers() throws SecurityException, NoSuchMethodException, IOException { Invokable method = method(ElasticStackApi.class, "listServers"); GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of()); 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 4638c3e438..51bc63b9a9 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 extends BaseRestClientExpectTest { +public class BaseKeystoneRestClientExpectTest extends BaseRestApiExpectTest { protected String endpoint = "http://localhost:5000"; 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 260a242492..b8b64c6e28 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 { +public abstract class BaseS3ClientExpectTest extends BaseRestApiExpectTest { protected static final String CONSTANT_DATE = "2009-11-08T15:54:08.897Z"; 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 2b418ae0cd..63d4481463 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 extends BaseAsyncClientTest { +public abstract class BaseS3ClientTest extends BaseRestAnnotationProcessingTest { protected BlobToObject blobToS3Object; protected RequestAuthorizeSignature filter; 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 d021eb5be1..ec5280b416 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 { +public abstract class CommonSwiftClientTest extends BaseRestAnnotationProcessingTest { public static final long UNIX_EPOCH_TIMESTAMP = 123456789L; public static final String TEMPORARY_URL_KEY = "get-or-set-X-Account-Meta-Temp-Url-Key"; 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 c28fcaf93c..96438a1aab 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 extends BaseRestClientExpectTest { +public class BaseSwiftExpectTest extends BaseRestApiExpectTest { protected String endpoint = "http://myhost:8080/auth"; protected HttpRequest authRequest; 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 71c0a1089f..844b5a8eaf 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 extends BaseRestClientExpectTest { +public class BaseSwiftKeystoneExpectTest extends BaseRestApiExpectTest { protected HttpRequest keystoneAuthWithUsernameAndPassword; protected HttpRequest keystoneAuthWithUsernameAndPasswordAndTenantName; protected HttpRequest keystoneAuthWithAccessKeyAndSecretKeyAndTenantName; 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 ac872f50c7..6095e1de9a 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 { +public class VCloudVersionsApiTest extends BaseRestAnnotationProcessingTest { public void testVersions() throws SecurityException, NoSuchMethodException, IOException { Invokable method = method(VCloudVersionsApi.class, "getSupportedVersions"); 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 4fbec0c154..f343d6e5df 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 { +public abstract class BaseVCloudComputeServiceExpectTest extends BaseRestApiExpectTest { protected static final String ENDPOINT = "https://zone.myvcloud.com/api"; protected HttpRequest versionsRequest = HttpRequest.builder().method("GET").endpoint( 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 0f97e263b4..feeec7c828 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 extends BaseAsyncClientTest { +public abstract class BaseVCloudApiTest extends BaseRestAnnotationProcessingTest { @Override protected void checkFilters(HttpRequest request) { 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 9971e74c92..c2896dc367 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 { +public class VCloudLoginApiTest extends BaseRestAnnotationProcessingTest { public void testLogin() throws SecurityException, NoSuchMethodException, IOException { Invokable method = method(VCloudLoginApi.class, "login"); diff --git a/blobstore/src/test/java/org/jclouds/blobstore/TransientBlobRequestSignerTest.java b/blobstore/src/test/java/org/jclouds/blobstore/TransientBlobRequestSignerTest.java index fb1e89bf23..fab598f575 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 { +public class TransientBlobRequestSignerTest extends BaseRestAnnotationProcessingTest { private BlobRequestSigner signer; private Provider blobFactory; 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 02de7f1af0..7b3aad0829 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 { +public abstract class BaseBlobSignerExpectTest extends BaseRestApiExpectTest { /** * define the requests and responses needed to initialize the blobstore. For 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 9e14ba7235..5829fa87bf 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 { +public class OpenStackAuthClientTest extends BaseRestAnnotationProcessingTest { public void testAuthenticate() throws SecurityException, NoSuchMethodException, IOException { Invokable method = method(OpenStackAuthClient.class, "authenticate", String.class, String.class); 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 beada2b215..1a764aa329 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 extends BaseRestClientExpectTest { +public class BaseKeystoneRestClientExpectTest extends BaseRestApiExpectTest { protected String endpoint = "http://localhost:5000"; diff --git a/core/src/test/java/org/jclouds/http/IntegrationTestClientExpectTest.java b/core/src/test/java/org/jclouds/http/IntegrationTestClientExpectTest.java index abb64eaff0..33cb3a3ade 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 { +public class IntegrationTestClientExpectTest extends BaseRestApiExpectTest { public void testRetryOnSSLExceptionClose() { // keeps track of request count 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 5c0e4e5544..22061c5f77 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 { +public class DelegateAnnotationExpectTest extends BaseRestApiExpectTest { interface DelegatingApi { @Delegate 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 676583a2cd..337490afb6 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 { + BaseRestApiExpectTest { @XmlRootElement(name = "test") public static class TestJAXBDomain { 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 befce6dd33..eaec4cfdf0 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 { + BaseRestApiExpectTest { interface TestPATCHAnnotationApi extends Closeable { @PATCH 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 ca482138a5..19260d85f5 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 { +public class ProvidesAnnotationExpectTest extends BaseRestApiExpectTest { interface ProvidingApi extends Closeable { @Provides 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 be3cab5065..26c4de56d3 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 extends BaseAsyncApiTest { +// TODO: remove once abiquo no longer uses this. +public abstract class BaseAsyncClientTest extends BaseRestAnnotationProcessingTest { } diff --git a/core/src/test/java/org/jclouds/rest/internal/BaseAsyncApiTest.java b/core/src/test/java/org/jclouds/rest/internal/BaseRestAnnotationProcessingTest.java similarity index 97% rename from core/src/test/java/org/jclouds/rest/internal/BaseAsyncApiTest.java rename to core/src/test/java/org/jclouds/rest/internal/BaseRestAnnotationProcessingTest.java index 57d4df528c..6a4c5d7f7c 100644 --- a/core/src/test/java/org/jclouds/rest/internal/BaseAsyncApiTest.java +++ b/core/src/test/java/org/jclouds/rest/internal/BaseRestAnnotationProcessingTest.java @@ -36,7 +36,7 @@ import com.google.inject.Injector; import com.google.inject.Module; @Test(groups = "unit") -public abstract class BaseAsyncApiTest extends BaseRestApiTest { +public abstract class BaseRestAnnotationProcessingTest extends BaseRestApiTest { protected RestAnnotationProcessor processor; 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 cf89bc0798..0000000000 --- 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 extends BaseRestApiExpectTest { - -} 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 30ac6f44de..caf6e480a2 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 extends BaseAsyncApiTest { +public abstract class BaseAWSEC2ApiTest extends BaseRestAnnotationProcessingTest { @ConfiguresHttpApi protected static class StubAWSEC2HttpApiModule extends AWSEC2HttpApiModule { 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 9613b861eb..ce0b1a519e 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 { +public class BaseAWSS3ClientExpectTest extends BaseRestApiExpectTest { protected static final String CONSTANT_DATE = "2009-11-08T15:54:08.897Z"; 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 34f0c5c890..c738e45e4b 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 { +public class AzureBlobClientTest extends BaseRestAnnotationProcessingTest { public void testListContainers() throws SecurityException, NoSuchMethodException, IOException { Invokable method = method(AzureBlobClient.class, "listContainers", ListOptions[].class); 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 faec9bb4b7..8fc10302a4 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 { +public class BindAzureBlobMetadataToRequestTest extends BaseRestAnnotationProcessingTest { @Test public void testPassWithMinimumDetailsAndPayload64MB() { 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 024611ce13..586e361f2e 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 { +public class AzureBlobRequestSignerTest extends BaseRestAnnotationProcessingTest { public AzureBlobRequestSignerTest() { // this is base64 decoded in the signer; 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 2feb7ac891..04195947f2 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 { +public class GleSYSApiTest extends BaseRestAnnotationProcessingTest { private GleSYSApi syncApi; @Override 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 4a90875189..ebe5f0bf4e 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 extends BaseAsyncClientTest { +public abstract class BaseGoGridApiTest extends BaseRestAnnotationProcessingTest { @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() { 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 4b6fd2dd58..db529bd3fc 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 { +public class BaseGoGridHttpApiExpectTest extends BaseRestApiExpectTest { public BaseGoGridHttpApiExpectTest() { provider = "gogrid"; } - @ConfiguresHttpApi + @ConfiguresHttpApi protected static final class TestGoGridHttpApiModule extends GoGridHttpApiModule { @Override 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 73ce6da2d5..18181f8b50 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 { +public class BaseHPCloudObjectStorageBlobStoreExpectTest extends BaseRestApiExpectTest { protected HttpRequest keystoneAuthWithUsernameAndPassword;