diff --git a/apis/chef/pom.xml b/apis/chef/pom.xml index 6f2430df3f..71d4d5ae96 100644 --- a/apis/chef/pom.xml +++ b/apis/chef/pom.xml @@ -25,13 +25,12 @@ 4.0.0 org.jclouds - jclouds-chef-project + jclouds-chef-pom 1.0-SNAPSHOT - ../pom.xml + ../project/pom.xml - org.jclouds jclouds-chef - jclouds Chef core + JClouds Chef :: Core jclouds components to access Chef @@ -45,120 +44,57 @@ - ${project.groupId} + org.jclouds jclouds-core ${jclouds.version} + + org.jclouds + jclouds-core + ${jclouds.version} + test-jar + test + + + org.jclouds + jclouds-scriptbuilder + ${jclouds.version} + + + + org.jclouds + jclouds-blobstore + ${jclouds.version} + true + + + org.jclouds + jclouds-compute + ${jclouds.version} + + + org.jclouds.driver + jclouds-log4j + ${jclouds.version} + test + org.bouncycastle bcprov-jdk15 1.44 - - ${project.groupId} - jclouds-scriptbuilder - ${jclouds.version} - - - ${project.groupId} - jclouds-core - ${jclouds.version} - test-jar - test - log4j log4j 1.2.14 test - - org.jclouds.driver - jclouds-log4j - ${jclouds.version} - test - org.danlarkin clojure-json 1.1 true - - - ${project.groupId} - jclouds-blobstore - ${jclouds.version} - true - - - - diff --git a/apis/chef/src/main/java/org/jclouds/chef/config/BaseChefRestClientModule.java b/apis/chef/src/main/java/org/jclouds/chef/config/BaseChefRestClientModule.java index 8e8b48d760..1d02770fa3 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/config/BaseChefRestClientModule.java +++ b/apis/chef/src/main/java/org/jclouds/chef/config/BaseChefRestClientModule.java @@ -92,7 +92,7 @@ public class BaseChefRestClientModule extends RestClientModule { @Singleton public PrivateKey provideKey(Crypto crypto, @Named(PROPERTY_CREDENTIAL) String pem) throws InvalidKeySpecException, IOException { - return crypto.rsaKeyFactory().generatePrivate(Pems.privateKeySpec(InputSuppliers.of(pem))); + return crypto.rsaKeyFactory().generatePrivate(Pems.privateKeySpec(InputSuppliers.of(pem))); } @Override diff --git a/apis/chef/src/main/java/org/jclouds/ohai/OhaiContextBuilder.java b/apis/chef/src/main/java/org/jclouds/ohai/OhaiContextBuilder.java index 147a21dc2a..6a81c25faa 100644 --- a/apis/chef/src/main/java/org/jclouds/ohai/OhaiContextBuilder.java +++ b/apis/chef/src/main/java/org/jclouds/ohai/OhaiContextBuilder.java @@ -19,24 +19,22 @@ package org.jclouds.ohai; -import java.util.Properties; - -import javax.inject.Inject; - -import org.jclouds.ohai.config.ConfiguresOhai; -import org.jclouds.ohai.config.JMXOhaiModule; -import org.jclouds.rest.RestContext; -import org.jclouds.rest.RestContextBuilder; - import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.inject.Module; +import org.jclouds.compute.ComputeServiceContextBuilder; +import org.jclouds.ohai.config.ConfiguresOhai; +import org.jclouds.ohai.config.JMXOhaiModule; +import org.jclouds.rest.RestContext; + +import javax.inject.Inject; +import java.util.Properties; /** * * @see RestContext */ -public class OhaiContextBuilder extends RestContextBuilder { +public class OhaiContextBuilder extends ComputeServiceContextBuilder { @Inject public OhaiContextBuilder(Class syncClientClass, Class asyncClientClass, Properties properties) { diff --git a/apis/chef/src/test/java/org/jclouds/chef/BaseChefClientLiveTest.java b/apis/chef/src/test/java/org/jclouds/chef/BaseChefClientLiveTest.java index db46574313..99ae51d4ff 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/BaseChefClientLiveTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/BaseChefClientLiveTest.java @@ -60,7 +60,7 @@ import com.google.common.primitives.Bytes; * * @author Adrian Cole */ -@Test(groups = "live", testName = "chef.ChefClientLiveTest") +@Test(groups = { "live" }) public abstract class BaseChefClientLiveTest { protected String clientKey; diff --git a/apis/chef/src/test/java/org/jclouds/chef/ChefAsyncClientTest.java b/apis/chef/src/test/java/org/jclouds/chef/ChefAsyncClientTest.java index 7a516437ab..56757774e3 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/ChefAsyncClientTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/ChefAsyncClientTest.java @@ -69,7 +69,7 @@ import com.google.inject.TypeLiteral; * * @author Adrian Cole */ -@Test(groups = "unit", testName = "chef.ChefAsyncClientTest") +@Test(groups = { "unit" }) public class ChefAsyncClientTest extends RestClientTest { public void testCommitSandbox() throws SecurityException, NoSuchMethodException, IOException { diff --git a/apis/chef/src/test/java/org/jclouds/chef/ChefClientLiveTest.java b/apis/chef/src/test/java/org/jclouds/chef/ChefClientLiveTest.java index 416277b112..884a0feea2 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/ChefClientLiveTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/ChefClientLiveTest.java @@ -46,7 +46,7 @@ import com.google.inject.Module; * * @author Adrian Cole */ -@Test(groups = "live", testName = "chef.ChefClientLiveTest") +@Test(groups = { "live" }) public class ChefClientLiveTest extends BaseChefClientLiveTest { private ChefContext validatorConnection; diff --git a/apis/chef/src/test/java/org/jclouds/chef/ProvidersInPropertiesTest.java b/apis/chef/src/test/java/org/jclouds/chef/ProvidersInPropertiesTest.java index 6fec644db0..30e9fe2f41 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/ProvidersInPropertiesTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/ProvidersInPropertiesTest.java @@ -19,22 +19,21 @@ package org.jclouds.chef; -import org.jclouds.util.Utils; -import org.testng.annotations.Test; - import com.google.common.collect.Iterables; +import org.jclouds.compute.util.ComputeServiceUtils; +import org.testng.annotations.Test; /** * * @author Adrian Cole * */ -@Test(groups = "unit") +@Test(groups = { "unit" }) public class ProvidersInPropertiesTest { @Test public void testSupportedProviders() { - Iterable providers = Utils.getSupportedProviders(); + Iterable providers = ComputeServiceUtils.getSupportedProviders(); assert Iterables.contains(providers, "chef") : providers; } diff --git a/apis/chef/src/test/java/org/jclouds/chef/binders/BindHexEncodedMD5sToJsonPayloadTest.java b/apis/chef/src/test/java/org/jclouds/chef/binders/BindHexEncodedMD5sToJsonPayloadTest.java index f698e0b163..0a8d50689e 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/binders/BindHexEncodedMD5sToJsonPayloadTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/binders/BindHexEncodedMD5sToJsonPayloadTest.java @@ -39,7 +39,7 @@ import com.google.inject.Injector; /** * @author Adrian Cole */ -@Test(groups = "unit", testName = "chef.BootstrapChefClientTest") +@Test(groups = { "unit" }) public class BindHexEncodedMD5sToJsonPayloadTest { Injector injector = Guice.createInjector(new ChefParserModule(), new GsonModule()); diff --git a/apis/chef/src/test/java/org/jclouds/chef/filters/SignedHeaderAuthTest.java b/apis/chef/src/test/java/org/jclouds/chef/filters/SignedHeaderAuthTest.java index 80f75772d2..a4f4aeca89 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/filters/SignedHeaderAuthTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/filters/SignedHeaderAuthTest.java @@ -20,6 +20,7 @@ package org.jclouds.chef.filters; import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertEqualsNoOrder; import java.io.IOException; import java.net.URI; @@ -54,7 +55,7 @@ import com.google.inject.Module; * * @author Adrian Cole */ -@Test(groups = "unit", testName = "chef.SignedHeaderAuthTest") +@Test(groups = { "unit" }) public class SignedHeaderAuthTest { public static final String USER_ID = "spec-user"; @@ -77,7 +78,8 @@ public class SignedHeaderAuthTest { "NMzYZgyooSvU85qkIUmKuCqgG2AIlvYa2Q/2ctrMhoaHhLOCWWoqYNMaEqPc", "3tKHE+CfvP+WuPdWk4jv4wpIkAz6ZLxToxcGhXmZbXpk56YTmqgBW2cbbw4O", "IWPZDHSiPcw//AYNgW1CCDptt+UFuaFYbtqZegcBd2n/jzcWODA7zL4KWEUy", - "9q4rlh/+1tBReg60QdsmDRsw/cdO1GZrKtuCwbuD4+nbRdVBKv72rqHX9cu0", "utju9jzczCyB+sSAQWrxSsXB/b8vV2qs0l4VD2ML+w==" }; + "9q4rlh/+1tBReg60QdsmDRsw/cdO1GZrKtuCwbuD4+nbRdVBKv72rqHX9cu0", + "utju9jzczCyB+sSAQWrxSsXB/b8vV2qs0l4VD2ML+w==" }; // We expect Mixlib::Authentication::SignedHeaderAuth//sign to return this // if passed the BODY above. @@ -142,8 +144,8 @@ public class SignedHeaderAuthTest { request = signing_obj.filter(request); Multimap headersWithoutContentLength = LinkedHashMultimap.create(request.getHeaders()); - headersWithoutContentLength.removeAll(HttpHeaders.CONTENT_LENGTH); - assertEquals(headersWithoutContentLength.values(), EXPECTED_SIGN_RESULT.values()); + headersWithoutContentLength.removeAll( HttpHeaders.CONTENT_LENGTH ); + assertEqualsNoOrder( headersWithoutContentLength.values().toArray(), EXPECTED_SIGN_RESULT.values().toArray() ); } @Test @@ -154,7 +156,7 @@ public class SignedHeaderAuthTest { request = signing_obj.filter(request); Multimap headersWithoutContentLength = LinkedHashMultimap.create(request.getHeaders()); - assertEquals(headersWithoutContentLength.entries(), EXPECTED_SIGN_RESULT_EMPTY.entries()); + assertEqualsNoOrder(headersWithoutContentLength.entries().toArray(), EXPECTED_SIGN_RESULT_EMPTY.entries().toArray()); } @Test diff --git a/apis/chef/src/test/java/org/jclouds/chef/functions/ClientForTagTest.java b/apis/chef/src/test/java/org/jclouds/chef/functions/ClientForTagTest.java index 8157ecc612..614ea38ecb 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/functions/ClientForTagTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/functions/ClientForTagTest.java @@ -37,7 +37,7 @@ import com.google.common.collect.ImmutableSet; /** * @author Adrian Cole */ -@Test(groups = "unit", testName = "chef.ClientForTagTest") +@Test(groups = { "unit" }) public class ClientForTagTest { public void testWhenNoClientsInList() throws IOException { diff --git a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseClientFromJsonTest.java b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseClientFromJsonTest.java index bd210a809c..02ba38ceb7 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseClientFromJsonTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseClientFromJsonTest.java @@ -52,7 +52,7 @@ import com.google.inject.TypeLiteral; * * @author Adrian Cole */ -@Test(groups = "unit", sequential = true, testName = "chef.ParseClientFromJsonTest") +@Test(groups = { "unit" }, sequential = true) public class ParseClientFromJsonTest { private static final String PRIVATE_KEY = "-----BEGIN RSA PRIVATE KEY-----\nMIIEpQIBAAKCAQEAyb2ZJJqGm0KKR+8nfQJNsSd+F9tXNMV7CfOcW6jsqs8EZgiV\nR09hD1IYOj4YqM0qJONlgyg4xRWewdSG7QTPj1lJpVAida9sXy2+kzyagZA1Am0O\nZcbqb5hoeIDgcX+eDa79s0u0DomjcfO9EKhvHLBz+zM+3QqPRkPV8nYTbfs+HjVz\nzOU6D1B0XR3+IPZZl2AnWs2d0qhnStHcDUvnRVQ0P482YwN9VgceOZtpPz0DCKEJ\n5Tx5STub8k0/zt/VAMHQafLSuQMLd2s4ZLuOZptN//uAsTmxireqd37z+8ZTdBbJ\n8LEpJ+iCXuSfm5aUh7iw6oxvToY2AL53+jK2UQIDAQABAoIBAQDA88B3i/xWn0vX\nBVxFamCYoecuNjGwXXkSyZew616A+EOCu47bh4aTurdFbYL0YFaAtaWvzlaN2eHg\nDb+HDuTefE29+WkcGk6SshPmiz5T0XOCAICWw6wSVDkHmGwS4jZvbAFm7W8nwGk9\nYhxgxFiRngswJZFopOLoF5WXs2td8guIYNslMpo7tu50iFnBHwKO2ZsPAk8t9nnS\nxlDavKruymEmqHCr3+dtio5eaenJcp3fjoXBQOKUk3ipII29XRB8NqeCVV/7Kxwq\nckqOBEbRwBclckyIbD+RiAgKvOelORjEiE9R42vuqvxRA6k9kd9o7utlX0AUtpEn\n3gZc6LepAoGBAP9ael5Y75+sK2JJUNOOhO8ae45cdsilp2yI0X+UBaSuQs2+dyPp\nkpEHAxd4pmmSvn/8c9TlEZhr+qYbABXVPlDncxpIuw2Ajbk7s/S4XaSKsRqpXL57\nzj/QOqLkRk8+OVV9q6lMeQNqLtEj1u6JPviX70Ro+FQtRttNOYbfdP/fAoGBAMpA\nXjR5woV5sUb+REg9vEuYo8RSyOarxqKFCIXVUNsLOx+22+AK4+CQpbueWN7jotrl\nYD6uT6svWi3AAC7kiY0UI/fjVPRCUi8tVoQUE0TaU5VLITaYOB+W/bBaDE4M9560\n1NuDWO90baA5dfU44iuzva02rGJXK9+nS3o8nk/PAoGBALOL6djnDe4mwAaG6Jco\ncd4xr8jkyPzCRZuyBCSBbwphIUXLc7hDprPky064ncJD1UDmwIdkXd/fpMkg2QmA\n/CUk6LEFjMisqHojOaCL9gQZJPhLN5QUN2x1PJWGjs1vQh8Tkx0iUUCOa8bQPXNR\n+34OTsW6TUna4CSZAycLfhffAoGBAIggVsefBCvuQkF0NeUhmDCRZfhnd8y55RHR\n1HCvqKIlpv+rhcX/zmyBLuteopYyRJRsOiE2FW00i8+rIPRu4Z3Q5nybx7w3PzV9\noHN5R5baE9OyI4KpZWztpYYitZF67NcnAvVULHHOvVJQGnKYfLHJYmrJF7GA1ojM\nAuMdFbjFAoGAPxUhxwFy8gaqBahKUEZn4F81HFP5ihGhkT4QL6AFPO2e+JhIGjuR\n27+85hcFqQ+HHVtFsm81b/a+R7P4UuCRgc8eCjxQMoJ1Xl4n7VbjPbHMnIN0Ryvd\nO4ZpWDWYnCO021JTOUUOJ4J/y0416Bvkw0z59y7sNX7wDBBHHbK/XCc=\n-----END RSA PRIVATE KEY-----\n"; diff --git a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookVersionFromJsonTest.java b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookVersionFromJsonTest.java index 4a2be9e550..87f796ce06 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookVersionFromJsonTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookVersionFromJsonTest.java @@ -52,7 +52,7 @@ import com.google.inject.TypeLiteral; * * @author Adrian Cole */ -@Test(groups = "unit", sequential = true, testName = "chef.ParseCookbookVersionFromJsonTest") +@Test(groups = { "unit" }, sequential = true) public class ParseCookbookVersionFromJsonTest { private ParseJson handler; diff --git a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseDataBagItemFromJsonTest.java b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseDataBagItemFromJsonTest.java index 1cc6437c0f..eed404265e 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseDataBagItemFromJsonTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseDataBagItemFromJsonTest.java @@ -41,7 +41,7 @@ import com.google.inject.TypeLiteral; /** * @author AdrianCole */ -@Test(groups = "unit", testName = "chef.ParseDataBagItemFromJsonTest") +@Test(groups = { "unit" }) public class ParseDataBagItemFromJsonTest { private ParseJson handler; private Json mapper; diff --git a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseErrorFromJsonOrReturnBodyTest.java b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseErrorFromJsonOrReturnBodyTest.java index 690675a84f..a18f2a11e3 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseErrorFromJsonOrReturnBodyTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseErrorFromJsonOrReturnBodyTest.java @@ -33,7 +33,7 @@ import org.testng.annotations.Test; /** * @author Adrian Cole */ -@Test(groups = "unit", testName = "chef.ParseErrorFromJsonOrReturnBodyTest") +@Test(groups = { "unit" }) public class ParseErrorFromJsonOrReturnBodyTest { @Test diff --git a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseKeySetFromJsonTest.java b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseKeySetFromJsonTest.java index 0468e95575..6a52cd55a1 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseKeySetFromJsonTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseKeySetFromJsonTest.java @@ -39,7 +39,7 @@ import com.google.inject.Injector; * * @author Adrian Cole */ -@Test(groups = "unit", sequential = true, testName = "chef.ParseKeySetFromJsonTest") +@Test(groups = { "unit" }, sequential = true) public class ParseKeySetFromJsonTest { private ParseKeySetFromJson handler; diff --git a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseNodeFromJsonTest.java b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseNodeFromJsonTest.java index 74dac62de3..1658aa0cc2 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseNodeFromJsonTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseNodeFromJsonTest.java @@ -45,7 +45,7 @@ import com.google.inject.TypeLiteral; * * @author Adrian Cole */ -@Test(groups = "unit", sequential = true, testName = "chef.ParseNodeFromJsonTest") +@Test(groups = { "unit" }, sequential = true) public class ParseNodeFromJsonTest { private ParseJson handler; diff --git a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseSandboxFromJsonTest.java b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseSandboxFromJsonTest.java index de0957e9d6..d55f78d1e2 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseSandboxFromJsonTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseSandboxFromJsonTest.java @@ -44,7 +44,7 @@ import com.google.inject.TypeLiteral; * * @author Adrian Cole */ -@Test(groups = "unit", sequential = true, testName = "chef.ParseSandboxFromJsonTest") +@Test(groups = { "unit" }, sequential = true) public class ParseSandboxFromJsonTest { private ParseJson handler; diff --git a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseUploadSandboxFromJsonTest.java b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseUploadSandboxFromJsonTest.java index 9d5312b10f..40491450cb 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseUploadSandboxFromJsonTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseUploadSandboxFromJsonTest.java @@ -48,7 +48,7 @@ import com.google.inject.TypeLiteral; * * @author Adrian Cole */ -@Test(groups = "unit", sequential = true, testName = "chef.ParseUploadSiteFromJsonTest") +@Test(groups = { "unit" }, sequential = true) public class ParseUploadSandboxFromJsonTest { private ParseJson handler; diff --git a/apis/chef/src/test/java/org/jclouds/chef/functions/RunListForTagTest.java b/apis/chef/src/test/java/org/jclouds/chef/functions/RunListForTagTest.java index b5a5e34ad5..f71a4f810a 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/functions/RunListForTagTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/functions/RunListForTagTest.java @@ -42,7 +42,7 @@ import com.google.inject.Injector; /** * @author Adrian Cole */ -@Test(groups = "unit", testName = "chef.RunListForTagTest") +@Test(groups = { "unit" }) public class RunListForTagTest { Injector injector = Guice.createInjector(new ChefParserModule(), new GsonModule()); Json json = injector.getInstance(Json.class); diff --git a/apis/chef/src/test/java/org/jclouds/chef/functions/TagToBootScriptTest.java b/apis/chef/src/test/java/org/jclouds/chef/functions/TagToBootScriptTest.java index 17b12ec113..64c58734ea 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/functions/TagToBootScriptTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/functions/TagToBootScriptTest.java @@ -50,7 +50,7 @@ import com.google.inject.Injector; /** * @author Adrian Cole */ -@Test(groups = "unit", testName = "chef.TagToBootScriptTest") +@Test(groups = { "unit" }) public class TagToBootScriptTest { Injector injector = Guice.createInjector(new ChefParserModule(), new GsonModule()); diff --git a/apis/chef/src/test/java/org/jclouds/chef/handlers/ChefClientErrorRetryHandlerTest.java b/apis/chef/src/test/java/org/jclouds/chef/handlers/ChefClientErrorRetryHandlerTest.java index 2feb8f573d..457016f190 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/handlers/ChefClientErrorRetryHandlerTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/handlers/ChefClientErrorRetryHandlerTest.java @@ -38,7 +38,7 @@ import org.testng.annotations.Test; * * @author Adrian Cole */ -@Test(groups = "unit", testName = "chef.ChefClientErrorRetryHandlerTest") +@Test(groups = { "unit" }) public class ChefClientErrorRetryHandlerTest { @Test public void test401DoesNotRetry() { diff --git a/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/BaseChefStrategyLiveTest.java b/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/BaseChefStrategyLiveTest.java index b6260c2cb0..0cd076f76b 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/BaseChefStrategyLiveTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/BaseChefStrategyLiveTest.java @@ -46,7 +46,7 @@ import com.google.inject.Module; * * @author Adrian Cole */ -@Test(groups = "live", testName = "chef.BaseChefStrategyLiveTest") +@Test(groups = { "live" }) public abstract class BaseChefStrategyLiveTest { protected Injector injector; diff --git a/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/CleanupStaleNodesAndClientsImplLiveTest.java b/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/CleanupStaleNodesAndClientsImplLiveTest.java index 6b0186d94b..f1079b8aef 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/CleanupStaleNodesAndClientsImplLiveTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/CleanupStaleNodesAndClientsImplLiveTest.java @@ -30,13 +30,13 @@ import com.google.common.collect.ImmutableSet; * * @author Adrian Cole */ -@Test(groups = "live", testName = "chef.CleanupStaleNodesAndClientsImplLiveTest") +@Test(groups = { "live" }) public class CleanupStaleNodesAndClientsImplLiveTest extends BaseChefStrategyLiveTest { private CreateNodeAndPopulateAutomaticAttributesImpl creater; private CleanupStaleNodesAndClientsImpl strategy; private ChefClient chef; - @BeforeTest(groups = "live", dependsOnMethods = "setupClient") + @BeforeTest(groups = { "live" }, dependsOnMethods = "setupClient") void setupStrategy() { this.creater = injector.getInstance(CreateNodeAndPopulateAutomaticAttributesImpl.class); this.strategy = injector.getInstance(CleanupStaleNodesAndClientsImpl.class); diff --git a/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/CreateNodeAndPopulateAutomaticAttributesImplLiveTest.java b/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/CreateNodeAndPopulateAutomaticAttributesImplLiveTest.java index 6e06ba9426..bde4e710c9 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/CreateNodeAndPopulateAutomaticAttributesImplLiveTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/CreateNodeAndPopulateAutomaticAttributesImplLiveTest.java @@ -45,7 +45,7 @@ import com.google.inject.Module; * * @author Adrian Cole */ -@Test(groups = "live", testName = "chef.CreateNodeAndPopulateAutomaticAttributesImplLiveTest") +@Test(groups = { "live" }) public class CreateNodeAndPopulateAutomaticAttributesImplLiveTest extends BaseChefStrategyLiveTest { private CreateNodeAndPopulateAutomaticAttributesImpl strategy; @@ -64,7 +64,7 @@ public class CreateNodeAndPopulateAutomaticAttributesImplLiveTest extends BaseCh modules.add(new TestOhaiModule()); } - @BeforeTest(groups = "live", dependsOnMethods = "setupClient") + @BeforeTest(groups = { "live" }, dependsOnMethods = "setupClient") void setupStrategy() { this.strategy = injector.getInstance(CreateNodeAndPopulateAutomaticAttributesImpl.class); this.chef = injector.getInstance(ChefClient.class); diff --git a/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/CreateNodeAndPopulateAutomaticAttributesImplTest.java b/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/CreateNodeAndPopulateAutomaticAttributesImplTest.java index 8289b88613..74ca740f81 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/CreateNodeAndPopulateAutomaticAttributesImplTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/CreateNodeAndPopulateAutomaticAttributesImplTest.java @@ -40,7 +40,7 @@ import com.google.common.collect.ImmutableSet; * * @author Adrian Cole */ -@Test(groups = "unit", testName = "ohai.CreateNodeAndPopulateAutomaticAttributesImplTest") +@Test(groups = { "unit" }) public class CreateNodeAndPopulateAutomaticAttributesImplTest { @Test diff --git a/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/DeleteAllClientsAndNodesInListImplLiveTest.java b/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/DeleteAllClientsAndNodesInListImplLiveTest.java index dbf64e0c1f..16bf0cc60a 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/DeleteAllClientsAndNodesInListImplLiveTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/DeleteAllClientsAndNodesInListImplLiveTest.java @@ -30,13 +30,13 @@ import com.google.common.collect.ImmutableSet; * * @author Adrian Cole */ -@Test(groups = "live", testName = "chef.DeleteAllClientsAndNodesInListImplTest") +@Test(groups = { "live" }) public class DeleteAllClientsAndNodesInListImplLiveTest extends BaseChefStrategyLiveTest { private DeleteAllNodesInListImpl strategy; private CreateNodeAndPopulateAutomaticAttributesImpl creater; private ChefClient chef; - @BeforeTest(groups = "live", dependsOnMethods = "setupClient") + @BeforeTest(groups = { "live" }, dependsOnMethods = "setupClient") void setupStrategy() { this.creater = injector.getInstance(CreateNodeAndPopulateAutomaticAttributesImpl.class); this.strategy = injector.getInstance(DeleteAllNodesInListImpl.class); diff --git a/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/GetNodesImplLiveTest.java b/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/GetNodesImplLiveTest.java index 22ea900a1f..f4faa95698 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/GetNodesImplLiveTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/GetNodesImplLiveTest.java @@ -37,20 +37,20 @@ import com.google.common.collect.ImmutableSet; * * @author Adrian Cole */ -@Test(groups = "live", testName = "chef.GetNodesImplLiveTest") +@Test(groups = { "live" }) public class GetNodesImplLiveTest extends BaseChefStrategyLiveTest { private ListNodesImpl strategy; private CreateNodeAndPopulateAutomaticAttributesImpl creater; private ChefClient chef; - @BeforeTest(groups = "live", dependsOnMethods = "setupClient") + @BeforeTest(groups = { "live" }, dependsOnMethods = "setupClient") void setupStrategy() { this.creater = injector.getInstance(CreateNodeAndPopulateAutomaticAttributesImpl.class); this.strategy = injector.getInstance(ListNodesImpl.class); this.chef = injector.getInstance(ChefClient.class); } - @BeforeTest(groups = "live", dependsOnMethods = "setupStrategy") + @BeforeTest(groups = { "live" }, dependsOnMethods = "setupStrategy") void setupNodes() { creater.execute(prefix, ImmutableSet. of()); creater.execute(prefix + 1, ImmutableSet. of()); diff --git a/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImplLiveTest.java b/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImplLiveTest.java index bd3290ea4c..590b276891 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImplLiveTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImplLiveTest.java @@ -44,7 +44,7 @@ import com.google.inject.Module; * * @author Adrian Cole */ -@Test(groups = "live", testName = "chef.UpdateAutomaticAttributesOnNodeImplLiveTest") +@Test(groups = { "live" }) public class UpdateAutomaticAttributesOnNodeImplLiveTest extends BaseChefStrategyLiveTest { private UpdateAutomaticAttributesOnNodeImpl strategy; private ChefClient chef; @@ -61,7 +61,7 @@ public class UpdateAutomaticAttributesOnNodeImplLiveTest extends BaseChefStrateg modules.add(new TestOhaiModule()); } - @BeforeTest(groups = "live", dependsOnMethods = "setupClient") + @BeforeTest(groups = { "live" }, dependsOnMethods = "setupClient") void setupStrategy() { this.strategy = injector.getInstance(UpdateAutomaticAttributesOnNodeImpl.class); this.chef = injector.getInstance(ChefClient.class); diff --git a/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImplTest.java b/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImplTest.java index 3f052ac58f..ee33b5e7fd 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImplTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImplTest.java @@ -41,7 +41,7 @@ import com.google.common.collect.ImmutableSet; * * @author Adrian Cole */ -@Test(groups = "unit", testName = "ohai.UpdateAutomaticAttributesOnNodeImplTest") +@Test(groups = { "unit" }) public class UpdateAutomaticAttributesOnNodeImplTest { @Test diff --git a/apis/chef/src/test/java/org/jclouds/chef/test/TransientChefClientIntegrationTest.java b/apis/chef/src/test/java/org/jclouds/chef/test/TransientChefClientIntegrationTest.java index 897e78dd17..43bbb1871f 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/test/TransientChefClientIntegrationTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/test/TransientChefClientIntegrationTest.java @@ -45,7 +45,7 @@ import com.google.inject.Guice; * * @author Adrian Cole */ -@Test(groups = "integration", testName = "chef.TransientChefClientIntegrationTest") +@Test(groups = { "integration" }) public class TransientChefClientIntegrationTest extends BaseChefClientLiveTest { public void testCreateDatabag1() throws Exception { getAdminConnection().deleteDatabag(PREFIX); diff --git a/apis/chef/src/test/java/org/jclouds/chef/util/ChefUtilsTest.java b/apis/chef/src/test/java/org/jclouds/chef/util/ChefUtilsTest.java index 2c5c4f3aac..e30c38707c 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/util/ChefUtilsTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/util/ChefUtilsTest.java @@ -34,7 +34,7 @@ import com.google.common.collect.ImmutableList; * * @author Adrian Cole */ -@Test(groups = "unit", sequential = true, testName = "ohai.ChefUtilsTest") +@Test(groups = { "unit" }, sequential = true) public class ChefUtilsTest { public static long millis = 1280251180727l; public static String millisString = "1280251180727"; diff --git a/apis/chef/src/test/java/org/jclouds/ohai/config/JMXTest.java b/apis/chef/src/test/java/org/jclouds/ohai/config/JMXTest.java index b1b4f38cc5..c8b78282e1 100644 --- a/apis/chef/src/test/java/org/jclouds/ohai/config/JMXTest.java +++ b/apis/chef/src/test/java/org/jclouds/ohai/config/JMXTest.java @@ -46,7 +46,7 @@ import com.google.inject.Injector; * * @author Adrian Cole */ -@Test(groups = "unit", testName = "ohai.JMXTest") +@Test(groups = { "unit" }) public class JMXTest { @Test diff --git a/apis/chef/src/test/java/org/jclouds/ohai/config/OhaiModuleTest.java b/apis/chef/src/test/java/org/jclouds/ohai/config/OhaiModuleTest.java index fc36a7fb2e..90b0a0c80f 100644 --- a/apis/chef/src/test/java/org/jclouds/ohai/config/OhaiModuleTest.java +++ b/apis/chef/src/test/java/org/jclouds/ohai/config/OhaiModuleTest.java @@ -49,7 +49,7 @@ import com.google.inject.util.Providers; * * @author Adrian Cole */ -@Test(groups = "unit", testName = "ohai.OhaiModuleTest") +@Test(groups = { "unit" }) public class OhaiModuleTest { @Test diff --git a/apis/chef/src/test/java/org/jclouds/ohai/functions/ByteArrayToMacAddressTest.java b/apis/chef/src/test/java/org/jclouds/ohai/functions/ByteArrayToMacAddressTest.java index 39b2ee2cf5..abcdbfbf03 100644 --- a/apis/chef/src/test/java/org/jclouds/ohai/functions/ByteArrayToMacAddressTest.java +++ b/apis/chef/src/test/java/org/jclouds/ohai/functions/ByteArrayToMacAddressTest.java @@ -35,7 +35,7 @@ import com.google.inject.Injector; * * @author Adrian Cole */ -@Test(groups = "unit", sequential = true, testName = "ohai.ByteArrayToMacAddressTest") +@Test(groups = { "unit" }, sequential = true) public class ByteArrayToMacAddressTest { private ByteArrayToMacAddress converter; diff --git a/apis/chef/src/test/java/org/jclouds/ohai/functions/NestSlashKeysTest.java b/apis/chef/src/test/java/org/jclouds/ohai/functions/NestSlashKeysTest.java index a6658e5d29..f3e60609bc 100644 --- a/apis/chef/src/test/java/org/jclouds/ohai/functions/NestSlashKeysTest.java +++ b/apis/chef/src/test/java/org/jclouds/ohai/functions/NestSlashKeysTest.java @@ -41,7 +41,7 @@ import com.google.inject.Injector; * * @author Adrian Cole */ -@Test(groups = "unit", sequential = true, testName = "ohai.NestSlashKeysTest") +@Test(groups = { "unit" }, sequential = true) public class NestSlashKeysTest { private NestSlashKeys converter;