Fix TransientChef and Strategy live tests
diff --git a/core/src/main/java/org/jclouds/chef/test/config/TransientChefApiModule.java b/core/src/main/java/org/jclouds/chef/test/config/TransientChefApiModule.java
index 8318042..a10ba71 100644
--- a/core/src/main/java/org/jclouds/chef/test/config/TransientChefApiModule.java
+++ b/core/src/main/java/org/jclouds/chef/test/config/TransientChefApiModule.java
@@ -41,12 +41,14 @@
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 @@
* @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(
diff --git a/core/src/test/java/org/jclouds/chef/internal/BaseChefLiveTest.java b/core/src/test/java/org/jclouds/chef/internal/BaseChefLiveTest.java
index 0503b86..03ce707 100644
--- a/core/src/test/java/org/jclouds/chef/internal/BaseChefLiveTest.java
+++ b/core/src/test/java/org/jclouds/chef/internal/BaseChefLiveTest.java
@@ -48,6 +48,10 @@
protected ChefService chefService;
protected Json json;
+ protected BaseChefLiveTest() {
+ provider = "chef";
+ }
+
/**
* the credential is a path to the pem file.
*/
diff --git a/core/src/test/java/org/jclouds/chef/strategy/internal/CleanupStaleNodesAndClientsImplLiveTest.java b/core/src/test/java/org/jclouds/chef/strategy/internal/CleanupStaleNodesAndClientsImplLiveTest.java
index 0ba2381..ce5c050 100644
--- a/core/src/test/java/org/jclouds/chef/strategy/internal/CleanupStaleNodesAndClientsImplLiveTest.java
+++ b/core/src/test/java/org/jclouds/chef/strategy/internal/CleanupStaleNodesAndClientsImplLiveTest.java
@@ -39,7 +39,7 @@
private CleanupStaleNodesAndClientsImpl strategy;
@Override
- public void initialize() {
+ protected void initialize() {
super.initialize();
this.creater = injector.getInstance(CreateNodeAndPopulateAutomaticAttributesImpl.class);
this.strategy = injector.getInstance(CleanupStaleNodesAndClientsImpl.class);
diff --git a/core/src/test/java/org/jclouds/chef/strategy/internal/CreateNodeAndPopulateAutomaticAttributesImplLiveTest.java b/core/src/test/java/org/jclouds/chef/strategy/internal/CreateNodeAndPopulateAutomaticAttributesImplLiveTest.java
index a0cd655..34e7d8f 100644
--- a/core/src/test/java/org/jclouds/chef/strategy/internal/CreateNodeAndPopulateAutomaticAttributesImplLiveTest.java
+++ b/core/src/test/java/org/jclouds/chef/strategy/internal/CreateNodeAndPopulateAutomaticAttributesImplLiveTest.java
@@ -43,7 +43,7 @@
private CreateNodeAndPopulateAutomaticAttributesImpl strategy;
@Override
- public void initialize() {
+ protected void initialize() {
super.initialize();
this.currentUserProvider = injector.getInstance(CurrentUserProvider.class);
this.strategy = injector.getInstance(CreateNodeAndPopulateAutomaticAttributesImpl.class);
diff --git a/core/src/test/java/org/jclouds/chef/strategy/internal/DeleteAllApisAndNodesInListImplLiveTest.java b/core/src/test/java/org/jclouds/chef/strategy/internal/DeleteAllApisAndNodesInListImplLiveTest.java
index 615342b..caa6f44 100644
--- a/core/src/test/java/org/jclouds/chef/strategy/internal/DeleteAllApisAndNodesInListImplLiveTest.java
+++ b/core/src/test/java/org/jclouds/chef/strategy/internal/DeleteAllApisAndNodesInListImplLiveTest.java
@@ -39,7 +39,7 @@
private CreateNodeAndPopulateAutomaticAttributesImpl creater;
@Override
- public void initialize() {
+ protected void initialize() {
super.initialize();
this.creater = injector.getInstance(CreateNodeAndPopulateAutomaticAttributesImpl.class);
this.strategy = injector.getInstance(DeleteAllNodesInListImpl.class);
diff --git a/core/src/test/java/org/jclouds/chef/strategy/internal/GetNodesImplLiveTest.java b/core/src/test/java/org/jclouds/chef/strategy/internal/GetNodesImplLiveTest.java
index 10dd287..2374595 100644
--- a/core/src/test/java/org/jclouds/chef/strategy/internal/GetNodesImplLiveTest.java
+++ b/core/src/test/java/org/jclouds/chef/strategy/internal/GetNodesImplLiveTest.java
@@ -41,7 +41,7 @@
private CreateNodeAndPopulateAutomaticAttributesImpl creater;
@Override
- public void initialize() {
+ protected void initialize() {
super.initialize();
this.creater = injector.getInstance(CreateNodeAndPopulateAutomaticAttributesImpl.class);
this.strategy = injector.getInstance(ListNodesImpl.class);
diff --git a/core/src/test/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImplLiveTest.java b/core/src/test/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImplLiveTest.java
index e3268f2..54bd0cc 100644
--- a/core/src/test/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImplLiveTest.java
+++ b/core/src/test/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImplLiveTest.java
@@ -42,7 +42,7 @@
private UpdateAutomaticAttributesOnNodeImpl strategy;
@Override
- public void initialize() {
+ protected void initialize() {
super.initialize();
this.currentUserProvider = injector.getInstance(CurrentUserProvider.class);
this.strategy = injector.getInstance(UpdateAutomaticAttributesOnNodeImpl.class);
