Merge branch 'develop' of github.com:seam/solder into develop

seam · Aug 22, 2011 · 6e89ace · 6e89ace
2 parents 0246ba7 + 916b295
commit 6e89ace
Show file tree

Hide file tree

Showing 24 changed files with 52 additions and 46 deletions.
diff --git a/...rnals/base/src/main/java/org/jboss/seam/solder/test/bean/defaultbean/DefaultBeanTest.java b/...rnals/base/src/main/java/org/jboss/seam/solder/test/bean/defaultbean/DefaultBeanTest.java
@@ -21,7 +21,7 @@
 import javax.enterprise.inject.spi.Extension;
 import javax.inject.Inject;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.seam.logging.Category;
 import org.jboss.seam.solder.logging.internal.Logger;
@@ -61,7 +61,7 @@ public class DefaultBeanTest {
     @Inject
     private Vehicle vehicle;
 
-    @Deployment
+    @Deployment(name = "DefaultBean")
     public static WebArchive createDeployment() {
         WebArchive war = ShrinkWrap.create(WebArchive.class, "test.war");
         war.addPackage(DefaultBeanTest.class.getPackage());

diff --git a/.../java/org/jboss/seam/solder/test/bean/generic/alternative/GenericBeanAlternativeTest.java b/.../java/org/jboss/seam/solder/test/bean/generic/alternative/GenericBeanAlternativeTest.java
@@ -22,15 +22,15 @@
 
 import junit.framework.Assert;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(Arquillian.class)
 public class GenericBeanAlternativeTest {
-    @Deployment
+    @Deployment(name = "GenericBeanAlternative")
     public static WebArchive deployment() {
         return baseDeployment().addPackage(GenericBeanAlternativeTest.class.getPackage()).addAsWebInfResource(
                 "org/jboss/seam/solder/test/bean/generic/alternative/beans.xml", "beans.xml");

diff --git a/...als/base/src/main/java/org/jboss/seam/solder/test/bean/generic/field/GenericBeanTest.java b/...als/base/src/main/java/org/jboss/seam/solder/test/bean/generic/field/GenericBeanTest.java
@@ -18,7 +18,7 @@
 
 import javax.inject.Inject;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.Archive;
 import org.junit.Test;
@@ -32,7 +32,7 @@
 
 @RunWith(Arquillian.class)
 public class GenericBeanTest {
-    @Deployment
+    @Deployment(name = "GenericBeanField")
     public static Archive<?> deployment() {
         return baseDeployment().addPackage(GenericBeanTest.class.getPackage());
     }

diff --git a/...se/src/main/java/org/jboss/seam/solder/test/bean/generic/field/GenericBeanUnwrapTest.java b/...se/src/main/java/org/jboss/seam/solder/test/bean/generic/field/GenericBeanUnwrapTest.java
@@ -19,7 +19,7 @@
 import javax.inject.Inject;
 
 import junit.framework.Assert;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.Archive;
 import org.junit.Test;
@@ -29,7 +29,7 @@
 
 @RunWith(Arquillian.class)
 public class GenericBeanUnwrapTest {
-    @Deployment
+    @Deployment(name = "GenericBeanUnwrap")
     public static Archive<?> deployment() {
         return baseDeployment().addPackage(GenericBeanUnwrapTest.class.getPackage());
     }

diff --git a/.../base/src/main/java/org/jboss/seam/solder/test/bean/generic/field/GenericProductTest.java b/.../base/src/main/java/org/jboss/seam/solder/test/bean/generic/field/GenericProductTest.java
@@ -18,7 +18,7 @@
 
 import javax.inject.Inject;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.Archive;
 import org.junit.Test;
@@ -31,7 +31,7 @@
 
 @RunWith(Arquillian.class)
 public class GenericProductTest {
-    @Deployment
+    @Deployment(name = "GenericProductField")
     public static Archive<?> deployment() {
         return baseDeployment().addPackage(GenericProductTest.class.getPackage());
     }

diff --git a/...c/main/java/org/jboss/seam/solder/test/bean/generic/field/ObserversOnGenericBeanTest.java b/...c/main/java/org/jboss/seam/solder/test/bean/generic/field/ObserversOnGenericBeanTest.java
@@ -19,7 +19,7 @@
 import javax.enterprise.event.Event;
 import javax.inject.Inject;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.Archive;
 import org.junit.Test;
@@ -32,7 +32,7 @@
 @RunWith(Arquillian.class)
 public class ObserversOnGenericBeanTest {
 
-    @Deployment
+    @Deployment(name = "ObserversOnGenericBean")
     public static Archive<?> deployment() {
         return baseDeployment().addPackage(ObserversOnGenericBeanTest.class.getPackage());
     }

diff --git a/...c/main/java/org/jboss/seam/solder/test/bean/generic/field/ProducersOnGenericBeanTest.java b/...c/main/java/org/jboss/seam/solder/test/bean/generic/field/ProducersOnGenericBeanTest.java
@@ -18,7 +18,7 @@
 
 import javax.inject.Inject;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.Archive;
 import org.junit.Test;
@@ -31,7 +31,7 @@
 @RunWith(Arquillian.class)
 public class ProducersOnGenericBeanTest {
 
-    @Deployment
+    @Deployment(name = "ProducersOnGenericBean")
     public static Archive<?> deployment() {
         return baseDeployment().addPackage(ProducersOnGenericBeanTest.class.getPackage());
     }

diff --git a/...ls/base/src/main/java/org/jboss/seam/solder/test/bean/generic/method/GenericBeanTest.java b/...ls/base/src/main/java/org/jboss/seam/solder/test/bean/generic/method/GenericBeanTest.java
@@ -18,7 +18,7 @@
 
 import javax.inject.Inject;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.Archive;
 import org.junit.Test;
@@ -32,7 +32,7 @@
 @RunWith(Arquillian.class)
 public class GenericBeanTest {
 
-    @Deployment
+    @Deployment(name = "GenericBeanMethod")
     public static Archive<?> deployment() {
         return baseDeployment().addPackage(GenericBeanTest.class.getPackage());
     }

diff --git a/...base/src/main/java/org/jboss/seam/solder/test/bean/generic/method/GenericProductTest.java b/...base/src/main/java/org/jboss/seam/solder/test/bean/generic/method/GenericProductTest.java
@@ -25,7 +25,7 @@
 import javax.inject.Inject;
 
 import junit.framework.Assert;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.Archive;
 import org.junit.Test;
@@ -38,7 +38,7 @@
 @RunWith(Arquillian.class)
 public class GenericProductTest {
 
-    @Deployment
+    @Deployment(name = "GenericProductMethod")
     public static Archive<?> deployment() {
         return baseDeployment().addPackage(GenericProductTest.class.getPackage());
     }

diff --git a/.../main/java/org/jboss/seam/solder/test/bean/generic/method/ProducersOnGenericBeanTest.java b/.../main/java/org/jboss/seam/solder/test/bean/generic/method/ProducersOnGenericBeanTest.java
@@ -21,7 +21,7 @@
 
 import javax.inject.Inject;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.Archive;
 import org.junit.Test;
@@ -35,7 +35,7 @@
 @RunWith(Arquillian.class)
 public class ProducersOnGenericBeanTest {
 
-    @Deployment
+    @Deployment(name = "ProducersOnGenericBean")
     public static Archive<?> deployment() {
         return baseDeployment().addPackage(ProducersOnGenericBeanTest.class.getPackage());
     }

diff --git a/...ain/java/org/jboss/seam/solder/test/bean/generic/method/QualifierOnlyGenericBeanTest.java b/...ain/java/org/jboss/seam/solder/test/bean/generic/method/QualifierOnlyGenericBeanTest.java
@@ -18,7 +18,7 @@
 
 import javax.inject.Inject;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.Archive;
 import org.junit.Test;
@@ -31,7 +31,7 @@
 @RunWith(Arquillian.class)
 public class QualifierOnlyGenericBeanTest {
 
-    @Deployment
+    @Deployment(name = "QualifierOnlyGenericBean")
     public static Archive<?> deployment() {
         return baseDeployment().addPackage(QualifierOnlyGenericBeanTest.class.getPackage());
     }

diff --git a/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/core/CoreTest.java b/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/core/CoreTest.java
@@ -25,7 +25,7 @@
 import javax.inject.Inject;
 
 import junit.framework.Assert;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.seam.solder.core.CoreExtension;
 import org.jboss.seam.solder.core.VersionLoggerUtil;
@@ -46,7 +46,7 @@
 @RunWith(Arquillian.class)
 public class CoreTest {
 
-    @Deployment
+    @Deployment(name = "Core")
     public static Archive<?> deployment() {
         return baseDeployment().addPackage(CoreTest.class.getPackage())
                 .addPackage(FullyQualifiedFromPackageNamedBean.class.getPackage())

diff --git a/...e/internals/base/src/main/java/org/jboss/seam/solder/test/core/requires/RequiresTest.java b/...e/internals/base/src/main/java/org/jboss/seam/solder/test/core/requires/RequiresTest.java
@@ -19,7 +19,7 @@
 import javax.enterprise.inject.spi.BeanManager;
 import javax.inject.Inject;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.seam.solder.test.core.requires.beans.EnabledOptionalBean;
 import org.jboss.seam.solder.test.core.requires.beans.pkg.OptionalBeanWithPackageLevelDependencies;
@@ -36,7 +36,7 @@ public class RequiresTest {
     @Inject
     private BeanManager manager;
 
-    @Deployment
+    @Deployment(name = "Requires")
     public static WebArchive getDeployment() {
         return baseDeployment().addClasses(CommonInterface.class, Tiger.class, Lion.class)
                 .addPackage(EnabledOptionalBean.class.getPackage())

diff --git a/.../internals/base/src/main/java/org/jboss/seam/solder/test/defaultbean/DefaultBeanTest.java b/.../internals/base/src/main/java/org/jboss/seam/solder/test/defaultbean/DefaultBeanTest.java
@@ -19,7 +19,7 @@
 import javax.enterprise.inject.spi.BeanManager;
 import javax.inject.Inject;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.seam.solder.literal.DefaultLiteral;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
@@ -60,7 +60,7 @@ public class DefaultBeanTest {
     @LaptopHardDrive
     HardDrive laptopHardDrive;
 
-    @Deployment
+    @Deployment(name = "DefaultBeanTest")
     public static WebArchive deployment() {
         return baseDeployment().addPackage(DefaultBeanTest.class.getPackage());
     }

diff --git a/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/el/ElTest.java b/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/el/ElTest.java
@@ -20,7 +20,7 @@
 import javax.inject.Inject;
 
 import com.sun.el.ExpressionFactoryImpl;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.seam.solder.el.ELResolverProducer;
 import org.jboss.seam.solder.el.Expressions;
@@ -39,7 +39,7 @@ public class ElTest {
     @Inject
     Expressions expressions;
 
-    @Deployment
+    @Deployment(name = "EL")
     public static Archive<?> deployment() {
         // hack to work around container differences atm
         boolean isEmbedded = targetContainerAdapterClass().getName().contains(".embedded");

diff --git a/.../internals/base/src/main/java/org/jboss/seam/solder/test/logging/LoggerInjectionTest.java b/.../internals/base/src/main/java/org/jboss/seam/solder/test/logging/LoggerInjectionTest.java
@@ -22,7 +22,7 @@
 import javax.enterprise.inject.spi.InjectionTarget;
 
 import junit.framework.Assert;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.seam.solder.test.util.Deployments;
 import org.jboss.shrinkwrap.api.Archive;
@@ -42,7 +42,7 @@
  */
 @RunWith(Arquillian.class)
 public class LoggerInjectionTest {
-    @Deployment
+    @Deployment(name = "LoggerInjection")
     public static Archive<?> createDeployment() {
         return Deployments.baseDeployment()
                 .addClasses(Sparrow.class, Finch.class, Wren.class, Raven.class, NonBean.class);

diff --git a/...ase/src/main/java/org/jboss/seam/solder/test/logging/TypedMessageLoggerInjectionTest.java b/...ase/src/main/java/org/jboss/seam/solder/test/logging/TypedMessageLoggerInjectionTest.java
@@ -19,7 +19,7 @@
 
 import javax.enterprise.inject.Instance;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.Archive;
 import org.junit.Test;
@@ -42,7 +42,7 @@
  */
 @RunWith(Arquillian.class)
 public class TypedMessageLoggerInjectionTest {
-    @Deployment
+    @Deployment(name = "TypedMessageLoggerInjection")
     public static Archive<?> createDeployment() {
         return baseDeployment()
                 .addPackage(TypedMessageLoggerInjectionTest.class.getPackage());

diff --git a/...se/src/main/java/org/jboss/seam/solder/test/messages/TypedMessageBundleInjectionTest.java b/...se/src/main/java/org/jboss/seam/solder/test/messages/TypedMessageBundleInjectionTest.java
@@ -17,7 +17,7 @@
 
 package org.jboss.seam.solder.test.messages;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.Archive;
 import org.junit.Test;
@@ -34,7 +34,7 @@
  */
 @RunWith(Arquillian.class)
 public class TypedMessageBundleInjectionTest {
-    @Deployment
+    @Deployment(name = "TypedMessageBundleInjection")
     public static Archive<?> createDeployment() {
         return baseDeployment()
                 .addPackage(TypedMessageBundleInjectionTest.class.getPackage());

diff --git a/...nals/base/src/main/java/org/jboss/seam/solder/test/resourceLoader/ResourceLoaderTest.java b/...nals/base/src/main/java/org/jboss/seam/solder/test/resourceLoader/ResourceLoaderTest.java
@@ -28,7 +28,7 @@
 import javax.enterprise.inject.spi.BeanManager;
 import javax.inject.Inject;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.seam.solder.resourceLoader.Resource;
 import org.jboss.seam.solder.resourceLoader.ResourceLoader;
@@ -45,7 +45,7 @@
 
 @RunWith(Arquillian.class)
 public class ResourceLoaderTest {
-    @Deployment
+    @Deployment(name = "ResourceLoader")
     public static Archive<?> deployment() {
         // hack to work around container differences atm
         boolean isEmbedded = targetContainerAdapterClass().getName().contains(".embedded");

diff --git a/...nals/base/src/main/java/org/jboss/seam/solder/test/serviceHandler/ServiceHandlerTest.java b/...nals/base/src/main/java/org/jboss/seam/solder/test/serviceHandler/ServiceHandlerTest.java
@@ -19,7 +19,7 @@
 import javax.inject.Inject;
 
 import junit.framework.Assert;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.Archive;
 import org.junit.Test;
@@ -33,7 +33,7 @@
 @RunWith(Arquillian.class)
 public class ServiceHandlerTest {
 
-    @Deployment
+    @Deployment(name = "ServiceHandler")
     public static Archive<?> deployment() {
         return baseDeployment().addPackage(ServiceHandlerTest.class.getPackage());
     }

diff --git a/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/unwraps/UnwrapsTest.java b/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/unwraps/UnwrapsTest.java
@@ -19,7 +19,7 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.Archive;
 import org.junit.Test;
@@ -30,7 +30,7 @@
 @RunWith(Arquillian.class)
 public class UnwrapsTest {
 
-    @Deployment
+    @Deployment(name = "Unwraps")
     public static Archive<?> deployment() {
         return baseDeployment().addPackage(UnwrapsTest.class.getPackage());
     }

diff --git a/...internals/base/src/main/java/org/jboss/seam/solder/test/util/AnnotationInspectorTest.java b/...internals/base/src/main/java/org/jboss/seam/solder/test/util/AnnotationInspectorTest.java
@@ -24,7 +24,7 @@
 import javax.enterprise.inject.spi.BeanManager;
 import javax.inject.Inject;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.seam.solder.reflection.AnnotationInspector;
 import org.jboss.seam.solder.reflection.annotated.AnnotatedTypeBuilder;
@@ -39,7 +39,7 @@
 
 @RunWith(Arquillian.class)
 public class AnnotationInspectorTest {
-    @Deployment
+    @Deployment(name = "AnnotationInspector")
     public static Archive<?> deployment() {
         return baseDeployment().addPackage(AnnotationInspectorTest.class.getPackage());
     }