Merge pull request #14 from nacx/issue-13-unit-tests

Upgraded surefire plugin version. Fixes #13
jclouds · Jun 5, 2012 · 8f3faf9 · 8f3faf9
2 parents 4049315 + e237f91
commit 8f3faf9
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/opscodeplatform/src/main/java/org/jclouds/opscodeplatform/OpscodePlatformApiMetadata.java b/opscodeplatform/src/main/java/org/jclouds/opscodeplatform/OpscodePlatformApiMetadata.java
@@ -7,7 +7,7 @@
 import org.jclouds.chef.ChefApiMetadata;
 import org.jclouds.chef.ChefAsyncClient;
 import org.jclouds.ohai.config.JMXOhaiModule;
-import org.jclouds.opscodeplatform.functions.OpscodePlatformRestClientModule;
+import org.jclouds.opscodeplatform.config.OpscodePlatformRestClientModule;
 import org.jclouds.rest.RestContext;
 import org.jclouds.rest.internal.BaseRestApiMetadata;
 

diff --git a/opscodeplatform/src/main/java/org/jclouds/opscodeplatform/OpscodePlatformAsyncClient.java b/opscodeplatform/src/main/java/org/jclouds/opscodeplatform/OpscodePlatformAsyncClient.java
@@ -34,10 +34,10 @@
 import org.jclouds.chef.ChefClient;
 import org.jclouds.chef.filters.SignedHeaderAuth;
 import org.jclouds.chef.functions.ParseKeySetFromJson;
-import org.jclouds.opscodeplatform.config.OrganizationName;
-import org.jclouds.opscodeplatform.config.Username;
 import org.jclouds.opscodeplatform.domain.Organization;
 import org.jclouds.opscodeplatform.domain.User;
+import org.jclouds.opscodeplatform.functions.OrganizationName;
+import org.jclouds.opscodeplatform.functions.Username;
 import org.jclouds.rest.annotations.BinderParam;
 import org.jclouds.rest.annotations.ExceptionParser;
 import org.jclouds.rest.annotations.Headers;

diff --git a/...ions/OpscodePlatformRestClientModule.java → ...nfig/OpscodePlatformRestClientModule.java b/...ions/OpscodePlatformRestClientModule.java → ...nfig/OpscodePlatformRestClientModule.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.opscodeplatform.functions;
+package org.jclouds.opscodeplatform.config;
 
 import java.util.Map;
 

diff --git a/...codeplatform/config/OrganizationName.java → ...eplatform/functions/OrganizationName.java b/...codeplatform/config/OrganizationName.java → ...eplatform/functions/OrganizationName.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.opscodeplatform.config;
+package org.jclouds.opscodeplatform.functions;
 
 import javax.inject.Singleton;
 

diff --git a/...ouds/opscodeplatform/config/Username.java → ...s/opscodeplatform/functions/Username.java b/...ouds/opscodeplatform/config/Username.java → ...s/opscodeplatform/functions/Username.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.opscodeplatform.config;
+package org.jclouds.opscodeplatform.functions;
 
 import javax.inject.Singleton;
 

diff --git a/...odeplatform/src/test/java/org/jclouds/opscodeplatform/OpscodePlatformAsyncClientTest.java b/...odeplatform/src/test/java/org/jclouds/opscodeplatform/OpscodePlatformAsyncClientTest.java
@@ -31,9 +31,9 @@
 import org.jclouds.http.HttpRequest;
 import org.jclouds.http.functions.ParseJson;
 import org.jclouds.http.functions.ReturnTrueIf2xx;
+import org.jclouds.opscodeplatform.config.OpscodePlatformRestClientModule;
 import org.jclouds.opscodeplatform.domain.Organization;
 import org.jclouds.opscodeplatform.domain.User;
-import org.jclouds.opscodeplatform.functions.OpscodePlatformRestClientModule;
 import org.jclouds.rest.ConfiguresRestClient;
 import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404;
 import org.jclouds.rest.functions.ReturnFalseOnNotFoundOr404;
@@ -53,7 +53,7 @@
  * 
  * @author Adrian Cole
  */
-@Test(groups = { "unit" })
+@Test(groups = "unit", testName = "OpscodePlatformAsyncClientTest")
 public class OpscodePlatformAsyncClientTest extends BaseAsyncClientTest<OpscodePlatformAsyncClient> {
 
    public void testListUsers() throws SecurityException, NoSuchMethodException, IOException {

diff --git a/opscodeplatform/src/test/java/org/jclouds/opscodeplatform/OpscodePlatformClientLiveTest.java b/opscodeplatform/src/test/java/org/jclouds/opscodeplatform/OpscodePlatformClientLiveTest.java
@@ -55,7 +55,7 @@
  * 
  * @author Adrian Cole
  */
-@Test(groups = { "live" })
+@Test(groups = "live", testName = "OpscodePlatformClientLiveTest")
 public class OpscodePlatformClientLiveTest extends BaseChefClientLiveTest {
 
    private OpscodePlatformContext validatorConnection;

diff --git a/project/pom.xml b/project/pom.xml
@@ -97,7 +97,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.8.1</version>
+          <version>2.12</version>
         </plugin>
         <plugin>
           <groupId>org.apache.felix</groupId>