Merge pull request #85 from nacx/fix-test-config

Fix TransientChef and Strategy live tests

apis/chef/src/main/java/org/jclouds/chef/test/config/TransientChefApiModule.java

@@ -41,12 +41,14 @@ import org.jclouds.concurrent.config.ExecutorServiceModule;
 import org.jclouds.crypto.Crypto;
 import org.jclouds.domain.JsonBall;
 import org.jclouds.rest.ConfiguresHttpApi;
-import org.jclouds.rest.config.HttpApiModule;
+import org.jclouds.rest.config.RestModule;
+import org.jclouds.rest.config.SyncToAsyncHttpInvocationModule;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Supplier;
 import com.google.common.cache.CacheLoader;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.AbstractModule;
 import com.google.inject.Injector;
 import com.google.inject.Module;
 import com.google.inject.Provides;
@@ -57,10 +59,12 @@ import com.google.inject.name.Names;
  * @author Adrian Cole
  */
 @ConfiguresHttpApi
-public class TransientChefApiModule extends HttpApiModule<TransientChefApi> {
+public class TransientChefApiModule extends AbstractModule {
 
    @Override
    protected void configure() {
+      install(new RestModule());
+      install(new SyncToAsyncHttpInvocationModule());
       bind(ChefApi.class).to(TransientChefApi.class);
       bind(LocalBlobStore.class).annotatedWith(Names.named("databags"))
             .toInstance(

apis/chef/src/test/java/org/jclouds/chef/internal/BaseChefLiveTest.java

@@ -48,6 +48,10 @@ public abstract class BaseChefLiveTest<A extends ChefApi> extends BaseApiLiveTes
    protected ChefService chefService;
    protected Json json;
 
+   protected BaseChefLiveTest() {
+      provider = "chef";
+   }
+
    /**
     * the credential is a path to the pem file.
     */

apis/chef/src/test/java/org/jclouds/chef/strategy/internal/CleanupStaleNodesAndClientsImplLiveTest.java

@@ -39,7 +39,7 @@ public class CleanupStaleNodesAndClientsImplLiveTest extends BaseChefLiveTest<Ch
    private CleanupStaleNodesAndClientsImpl strategy;
 
    @Override
-   public void initialize() {
+   protected void initialize() {
       super.initialize();
       this.creater = injector.getInstance(CreateNodeAndPopulateAutomaticAttributesImpl.class);
       this.strategy = injector.getInstance(CleanupStaleNodesAndClientsImpl.class);

apis/chef/src/test/java/org/jclouds/chef/strategy/internal/CreateNodeAndPopulateAutomaticAttributesImplLiveTest.java

@@ -43,7 +43,7 @@ public class CreateNodeAndPopulateAutomaticAttributesImplLiveTest extends BaseCh
    private CreateNodeAndPopulateAutomaticAttributesImpl strategy;
 
    @Override
-   public void initialize() {
+   protected void initialize() {
       super.initialize();
       this.currentUserProvider = injector.getInstance(CurrentUserProvider.class);
       this.strategy = injector.getInstance(CreateNodeAndPopulateAutomaticAttributesImpl.class);

apis/chef/src/test/java/org/jclouds/chef/strategy/internal/DeleteAllApisAndNodesInListImplLiveTest.java

@@ -39,7 +39,7 @@ public class DeleteAllApisAndNodesInListImplLiveTest extends BaseChefLiveTest<Ch
    private CreateNodeAndPopulateAutomaticAttributesImpl creater;
 
    @Override
-   public void initialize() {
+   protected void initialize() {
       super.initialize();
       this.creater = injector.getInstance(CreateNodeAndPopulateAutomaticAttributesImpl.class);
       this.strategy = injector.getInstance(DeleteAllNodesInListImpl.class);

apis/chef/src/test/java/org/jclouds/chef/strategy/internal/GetNodesImplLiveTest.java

@@ -41,7 +41,7 @@ public class GetNodesImplLiveTest extends BaseChefLiveTest<ChefApi> {
    private CreateNodeAndPopulateAutomaticAttributesImpl creater;
 
    @Override
-   public void initialize() {
+   protected void initialize() {
       super.initialize();
       this.creater = injector.getInstance(CreateNodeAndPopulateAutomaticAttributesImpl.class);
       this.strategy = injector.getInstance(ListNodesImpl.class);

apis/chef/src/test/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImplLiveTest.java

@@ -42,7 +42,7 @@ public class UpdateAutomaticAttributesOnNodeImplLiveTest extends BaseChefLiveTes
    private UpdateAutomaticAttributesOnNodeImpl strategy;
 
    @Override
-   public void initialize() {
+   protected void initialize() {
       super.initialize();
       this.currentUserProvider = injector.getInstance(CurrentUserProvider.class);
       this.strategy = injector.getInstance(UpdateAutomaticAttributesOnNodeImpl.class);