Issue 1022: naming conventions

apis/atmos/src/test/java/org/jclouds/atmos/blobstore/config/AtmosBlobStoreModuleTest.java

@@ -27,7 +27,7 @@ import org.jclouds.blobstore.BlobStoreContext;
 import org.jclouds.blobstore.internal.BlobStoreContextImpl;
 import org.jclouds.blobstore.strategy.ContainsValueInListStrategy;
 import org.jclouds.logging.config.NullLoggingModule;
-import org.jclouds.rest.internal.BaseRestClientTest.MockModule;
+import org.jclouds.rest.internal.BaseRestApiTest.MockModule;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableSet;

apis/atmos/src/test/java/org/jclouds/atmos/filters/SignRequestTest.java

@@ -34,7 +34,7 @@ import org.jclouds.date.TimeStamp;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.logging.config.NullLoggingModule;
 import org.jclouds.rest.ConfiguresRestClient;
-import org.jclouds.rest.internal.BaseRestClientTest.MockModule;
+import org.jclouds.rest.internal.BaseRestApiTest.MockModule;
 import org.jclouds.util.Strings2;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;

apis/cloudstack/src/test/java/org/jclouds/cloudstack/filters/QuerySignerTest.java

@@ -26,7 +26,7 @@ import org.jclouds.http.IntegrationTestAsyncClient;
 import org.jclouds.http.IntegrationTestClient;
 import org.jclouds.logging.config.NullLoggingModule;
 import org.jclouds.providers.AnonymousProviderMetadata;
-import org.jclouds.rest.internal.BaseRestClientTest.MockModule;
+import org.jclouds.rest.internal.BaseRestApiTest.MockModule;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableList;

common/aws/src/test/java/org/jclouds/aws/filters/FormSignerTest.java

@@ -30,7 +30,7 @@ import org.jclouds.http.IntegrationTestClient;
 import org.jclouds.logging.config.NullLoggingModule;
 import org.jclouds.providers.AnonymousProviderMetadata;
 import org.jclouds.rest.RequestSigner;
-import org.jclouds.rest.internal.BaseRestClientTest.MockModule;
+import org.jclouds.rest.internal.BaseRestApiTest.MockModule;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableList;

common/azure/src/test/java/org/jclouds/azure/storage/filters/SharedKeyLiteAuthenticationTest.java

@@ -33,7 +33,7 @@ import org.jclouds.http.IntegrationTestAsyncClient;
 import org.jclouds.http.IntegrationTestClient;
 import org.jclouds.logging.config.NullLoggingModule;
 import org.jclouds.rest.AnonymousRestApiMetadata;
-import org.jclouds.rest.internal.BaseRestClientTest.MockModule;
+import org.jclouds.rest.internal.BaseRestApiTest.MockModule;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;

core/src/test/java/org/jclouds/config/BindRestContextWithWildcardExtendsExplicitAndRawTypeTest.java

@@ -32,7 +32,7 @@ import org.jclouds.providers.config.BindProviderMetadataContextAndCredentials;
 import org.jclouds.rest.RestApiMetadata;
 import org.jclouds.rest.RestContext;
 import org.jclouds.rest.Utils;
-import org.jclouds.rest.internal.BaseRestClientTest.MockModule;
+import org.jclouds.rest.internal.BaseRestApiTest.MockModule;
 import org.testng.annotations.Test;
 
 import com.google.common.reflect.TypeToken;

core/src/test/java/org/jclouds/http/handlers/RedirectionRetryHandlerTest.java

@@ -32,7 +32,7 @@ import org.jclouds.http.HttpResponse;
 import org.jclouds.http.IntegrationTestAsyncClient;
 import org.jclouds.http.IntegrationTestClient;
 import org.jclouds.providers.AnonymousProviderMetadata;
-import org.jclouds.rest.internal.BaseRestClientTest.MockModule;
+import org.jclouds.rest.internal.BaseRestApiTest.MockModule;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableSet;

core/src/test/java/org/jclouds/rest/internal/BaseAsyncApiTest.java

@@ -0,0 +1,108 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds 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.Key;
+import com.google.inject.Module;
+import com.google.inject.TypeLiteral;
+
+/**
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups = "unit")
+public abstract class BaseAsyncApiTest<T> extends BaseRestApiTest {
+
+   protected RestAnnotationProcessor<T> processor;
+
+   protected abstract TypeLiteral<RestAnnotationProcessor<T>> createTypeLiteral();
+
+   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(Key.get(createTypeLiteral()));
+   }
+   
+   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();
+   }
+}

core/src/test/java/org/jclouds/rest/internal/BaseAsyncClientTest.java

@@ -18,91 +18,13 @@
  */
 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.Key;
-import com.google.inject.Module;
-import com.google.inject.TypeLiteral;
-
 /**
  * 
  * @author Adrian Cole
  */
 @Test(groups = "unit")
-public abstract class BaseAsyncClientTest<T> extends BaseRestClientTest {
-
-   protected RestAnnotationProcessor<T> processor;
-
-   protected abstract TypeLiteral<RestAnnotationProcessor<T>> createTypeLiteral();
-
-   protected abstract void checkFilters(HttpRequest request);
-
-   protected Module createModule() {
-      return new Module() {
-
-         @Override
-         public void configure(Binder binder) {
+public abstract class BaseAsyncClientTest<T> extends BaseAsyncApiTest<T> {
 
 }
-
-      };
-   }
-
-   @BeforeClass
-   protected void setupFactory() throws IOException {
-      injector = createInjector();
-      parserFactory = injector.getInstance(ParseSax.Factory.class);
-      processor = injector.getInstance(Key.get(createTypeLiteral()));
-   }
-   
-   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();
-   }
-}

core/src/test/java/org/jclouds/rest/internal/BaseRestApiTest.java

@@ -0,0 +1,179 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds 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.Throwables.propagate;
+import static com.google.inject.util.Types.newParameterizedType;
+import static org.easymock.EasyMock.createMock;
+import static org.eclipse.jetty.http.HttpHeaders.TRANSFER_ENCODING;
+import static org.jclouds.http.HttpUtils.sortAndConcatHeadersIntoString;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.Date;
+import java.util.concurrent.ExecutorService;
+
+import org.jclouds.Constants;
+import org.jclouds.concurrent.MoreExecutors;
+import org.jclouds.concurrent.config.ConfiguresExecutorService;
+import org.jclouds.crypto.Crypto;
+import org.jclouds.crypto.CryptoStreams;
+import org.jclouds.http.HttpCommandExecutorService;
+import org.jclouds.http.HttpRequest;
+import org.jclouds.http.config.ConfiguresHttpCommandExecutorService;
+import org.jclouds.http.functions.ParseSax;
+import org.jclouds.io.MutableContentMetadata;
+import org.jclouds.javax.annotation.Nullable;
+import org.jclouds.rest.functions.MapHttp4xxCodesToExceptions;
+import org.jclouds.util.Strings2;
+import org.testng.annotations.Test;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Injector;
+import com.google.inject.Key;
+import com.google.inject.name.Names;
+
+/**
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups = "unit")
+public abstract class BaseRestApiTest {
+
+   protected Injector injector;
+   protected ParseSax.Factory parserFactory;
+   protected Crypto crypto;
+
+   @ConfiguresHttpCommandExecutorService
+   @ConfiguresExecutorService
+   public static class MockModule extends AbstractModule {
+      private final HttpCommandExecutorService mock;
+
+      public MockModule() {
+         this(createMock(HttpCommandExecutorService.class));
+      }
+
+      public MockModule(HttpCommandExecutorService mock) {
+         this.mock = mock;
+      }
+
+      @Override
+      protected void configure() {
+         bind(ExecutorService.class).annotatedWith(Names.named(Constants.PROPERTY_USER_THREADS)).toInstance(
+               MoreExecutors.sameThreadExecutor());
+         bind(ExecutorService.class).annotatedWith(Names.named(Constants.PROPERTY_IO_WORKER_THREADS)).toInstance(
+               MoreExecutors.sameThreadExecutor());
+         bind(HttpCommandExecutorService.class).toInstance(mock);
+      }
+   }
+
+   protected void assertPayloadEquals(HttpRequest request, String toMatch, String contentType, boolean contentMD5) {
+      assertPayloadEquals(request, toMatch, contentType, contentMD5, null);
+   }
+
+   protected void assertPayloadEquals(HttpRequest request, String toMatch, String contentType, boolean contentMD5, Date expires) {
+      assertPayloadEquals(request, toMatch, contentType, null, null, null, contentMD5, expires);
+   }
+
+   protected void assertPayloadEquals(HttpRequest request, String toMatch, String contentType,
+         String contentDispositon, String contentEncoding, String contentLanguage, boolean contentMD5) {
+      assertPayloadEquals(request, toMatch, contentType, contentDispositon, contentEncoding, contentLanguage, 
+               contentMD5, null);
+   }
+
+   protected void assertPayloadEquals(HttpRequest request, String toMatch, String contentType,
+         String contentDispositon, String contentEncoding, String contentLanguage, boolean contentMD5,
+         Date expires) {
+      if (request.getPayload() == null) {
+         assertNull(toMatch);
+      } else {
+         String payload = null;
+         try {
+            payload = Strings2.toStringAndClose(request.getPayload().getInput());
+         } catch (IOException e) {
+            propagate(e);
+         }
+         assertEquals(payload, toMatch);
+         Long length = new Long(payload.getBytes().length);
+         try {
+            assertContentHeadersEqual(request, contentType, contentDispositon, contentEncoding, contentLanguage,
+                  length, contentMD5 ? CryptoStreams.md5(request.getPayload()) : null, expires);
+         } catch (IOException e) {
+            propagate(e);
+         }
+      }
+   }
+
+   protected void assertContentHeadersEqual(HttpRequest request, String contentType, String contentDispositon,
+         String contentEncoding, String contentLanguage, Long length, byte[] contentMD5, Date expires) {
+      MutableContentMetadata md = request.getPayload().getContentMetadata();
+      if (request.getFirstHeaderOrNull(TRANSFER_ENCODING) == null) {
+         assertEquals(md.getContentLength(), length);
+      } else {
+         assertEquals(request.getFirstHeaderOrNull(TRANSFER_ENCODING), "chunked");
+         assert md.getContentLength() == null || md.getContentLength().equals(length);
+      }
+      assertEquals(md.getContentType(), contentType);
+      assertEquals(md.getContentDisposition(), contentDispositon);
+      assertEquals(md.getContentEncoding(), contentEncoding);
+      assertEquals(md.getContentLanguage(), contentLanguage);
+      assertEquals(md.getContentMD5(), contentMD5);
+      assertEquals(md.getExpires(), expires);
+   }
+
+   // FIXME Shouldn't be assertPayloadHeadersEqual?
+   protected void assertNonPayloadHeadersEqual(HttpRequest request, String toMatch) {
+      assertEquals(sortAndConcatHeadersIntoString(request.getHeaders()), toMatch);
+   }
+
+   protected void assertRequestLineEquals(HttpRequest request, String toMatch) {
+      assertEquals(request.getRequestLine(), toMatch);
+   }
+
+   protected void assertExceptionParserClassEquals(Method method, @Nullable Class<?> parserClass) {
+      if (parserClass == null)
+         assertEquals(
+               RestAnnotationProcessor
+                     .createExceptionParserOrThrowResourceNotFoundOn404IfNoAnnotation(injector, method).getClass(),
+               MapHttp4xxCodesToExceptions.class);
+      else
+         assertEquals(
+               RestAnnotationProcessor
+                     .createExceptionParserOrThrowResourceNotFoundOn404IfNoAnnotation(injector, method).getClass(),
+               parserClass);
+   }
+
+   protected void assertSaxResponseParserClassEquals(Method method, @Nullable Class<?> parserClass) {
+      assertEquals(RestAnnotationProcessor.getSaxResponseParserClassOrNull(method), parserClass);
+   }
+
+   protected void assertResponseParserClassEquals(Method method, HttpRequest request, @Nullable Class<?> parserClass) {
+      assertEquals(RestAnnotationProcessor.createResponseParser(parserFactory, injector, method, request).getClass(),
+            parserClass);
+   }
+
+   @SuppressWarnings("unchecked")
+   protected <T> RestAnnotationProcessor<T> factory(Class<T> clazz) {
+      return ((RestAnnotationProcessor<T>) injector.getInstance(Key.get(newParameterizedType(
+            RestAnnotationProcessor.class, clazz))));
+   }
+
+}

core/src/test/java/org/jclouds/rest/internal/BaseRestClientTest.java

@@ -18,162 +18,13 @@
  */
 package org.jclouds.rest.internal;
 
-import static com.google.common.base.Throwables.propagate;
-import static com.google.inject.util.Types.newParameterizedType;
-import static org.easymock.EasyMock.createMock;
-import static org.eclipse.jetty.http.HttpHeaders.TRANSFER_ENCODING;
-import static org.jclouds.http.HttpUtils.sortAndConcatHeadersIntoString;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.util.Date;
-import java.util.concurrent.ExecutorService;
-
-import org.jclouds.Constants;
-import org.jclouds.concurrent.MoreExecutors;
-import org.jclouds.concurrent.config.ConfiguresExecutorService;
-import org.jclouds.crypto.Crypto;
-import org.jclouds.crypto.CryptoStreams;
-import org.jclouds.http.HttpCommandExecutorService;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.config.ConfiguresHttpCommandExecutorService;
-import org.jclouds.http.functions.ParseSax;
-import org.jclouds.io.MutableContentMetadata;
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.rest.functions.MapHttp4xxCodesToExceptions;
-import org.jclouds.util.Strings2;
 import org.testng.annotations.Test;
 
-import com.google.inject.AbstractModule;
-import com.google.inject.Injector;
-import com.google.inject.Key;
-import com.google.inject.name.Names;
-
 /**
  * 
  * @author Adrian Cole
  */
 @Test(groups = "unit")
-public abstract class BaseRestClientTest {
-
-   protected Injector injector;
-   protected ParseSax.Factory parserFactory;
-   protected Crypto crypto;
-
-   @ConfiguresHttpCommandExecutorService
-   @ConfiguresExecutorService
-   public static class MockModule extends AbstractModule {
-      private final HttpCommandExecutorService mock;
-
-      public MockModule() {
-         this(createMock(HttpCommandExecutorService.class));
-      }
-
-      public MockModule(HttpCommandExecutorService mock) {
-         this.mock = mock;
-      }
-
-      @Override
-      protected void configure() {
-         bind(ExecutorService.class).annotatedWith(Names.named(Constants.PROPERTY_USER_THREADS)).toInstance(
-               MoreExecutors.sameThreadExecutor());
-         bind(ExecutorService.class).annotatedWith(Names.named(Constants.PROPERTY_IO_WORKER_THREADS)).toInstance(
-               MoreExecutors.sameThreadExecutor());
-         bind(HttpCommandExecutorService.class).toInstance(mock);
-      }
-   }
-
-   protected void assertPayloadEquals(HttpRequest request, String toMatch, String contentType, boolean contentMD5) {
-      assertPayloadEquals(request, toMatch, contentType, contentMD5, null);
-   }
-
-   protected void assertPayloadEquals(HttpRequest request, String toMatch, String contentType, boolean contentMD5, Date expires) {
-      assertPayloadEquals(request, toMatch, contentType, null, null, null, contentMD5, expires);
-   }
-
-   protected void assertPayloadEquals(HttpRequest request, String toMatch, String contentType,
-         String contentDispositon, String contentEncoding, String contentLanguage, boolean contentMD5) {
-      assertPayloadEquals(request, toMatch, contentType, contentDispositon, contentEncoding, contentLanguage, 
-               contentMD5, null);
-   }
-
-   protected void assertPayloadEquals(HttpRequest request, String toMatch, String contentType,
-         String contentDispositon, String contentEncoding, String contentLanguage, boolean contentMD5,
-         Date expires) {
-      if (request.getPayload() == null) {
-         assertNull(toMatch);
-      } else {
-         String payload = null;
-         try {
-            payload = Strings2.toStringAndClose(request.getPayload().getInput());
-         } catch (IOException e) {
-            propagate(e);
-         }
-         assertEquals(payload, toMatch);
-         Long length = new Long(payload.getBytes().length);
-         try {
-            assertContentHeadersEqual(request, contentType, contentDispositon, contentEncoding, contentLanguage,
-                  length, contentMD5 ? CryptoStreams.md5(request.getPayload()) : null, expires);
-         } catch (IOException e) {
-            propagate(e);
-         }
-      }
-   }
-
-   protected void assertContentHeadersEqual(HttpRequest request, String contentType, String contentDispositon,
-         String contentEncoding, String contentLanguage, Long length, byte[] contentMD5, Date expires) {
-      MutableContentMetadata md = request.getPayload().getContentMetadata();
-      if (request.getFirstHeaderOrNull(TRANSFER_ENCODING) == null) {
-         assertEquals(md.getContentLength(), length);
-      } else {
-         assertEquals(request.getFirstHeaderOrNull(TRANSFER_ENCODING), "chunked");
-         assert md.getContentLength() == null || md.getContentLength().equals(length);
-      }
-      assertEquals(md.getContentType(), contentType);
-      assertEquals(md.getContentDisposition(), contentDispositon);
-      assertEquals(md.getContentEncoding(), contentEncoding);
-      assertEquals(md.getContentLanguage(), contentLanguage);
-      assertEquals(md.getContentMD5(), contentMD5);
-      assertEquals(md.getExpires(), expires);
-   }
-
-   // FIXME Shouldn't be assertPayloadHeadersEqual?
-   protected void assertNonPayloadHeadersEqual(HttpRequest request, String toMatch) {
-      assertEquals(sortAndConcatHeadersIntoString(request.getHeaders()), toMatch);
-   }
-
-   protected void assertRequestLineEquals(HttpRequest request, String toMatch) {
-      assertEquals(request.getRequestLine(), toMatch);
-   }
-
-   protected void assertExceptionParserClassEquals(Method method, @Nullable Class<?> parserClass) {
-      if (parserClass == null)
-         assertEquals(
-               RestAnnotationProcessor
-                     .createExceptionParserOrThrowResourceNotFoundOn404IfNoAnnotation(injector, method).getClass(),
-               MapHttp4xxCodesToExceptions.class);
-      else
-         assertEquals(
-               RestAnnotationProcessor
-                     .createExceptionParserOrThrowResourceNotFoundOn404IfNoAnnotation(injector, method).getClass(),
-               parserClass);
-   }
-
-   protected void assertSaxResponseParserClassEquals(Method method, @Nullable Class<?> parserClass) {
-      assertEquals(RestAnnotationProcessor.getSaxResponseParserClassOrNull(method), parserClass);
-   }
-
-   protected void assertResponseParserClassEquals(Method method, HttpRequest request, @Nullable Class<?> parserClass) {
-      assertEquals(RestAnnotationProcessor.createResponseParser(parserFactory, injector, method, request).getClass(),
-            parserClass);
-   }
-
-   @SuppressWarnings("unchecked")
-   protected <T> RestAnnotationProcessor<T> factory(Class<T> clazz) {
-      return ((RestAnnotationProcessor<T>) injector.getInstance(Key.get(newParameterizedType(
-            RestAnnotationProcessor.class, clazz))));
-   }
+public abstract class BaseRestClientTest extends BaseRestApiTest {
 
 }

core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java

@@ -169,7 +169,7 @@ import com.sun.jersey.api.uri.UriBuilderImpl;
 // NOTE:without testName, this will not call @Before* and fail w/NPE during
 // surefire
 @Test(groups = "unit", testName = "RestAnnotationProcessorTest")
-public class RestAnnotationProcessorTest extends BaseRestClientTest {
+public class RestAnnotationProcessorTest extends BaseRestApiTest {
 
    @ConfiguresRestClient
    protected static class CallerModule extends RestClientModule<Caller, AsyncCaller> {