From aaab439c972444ed579f1ba6b413c33f468139a2 Mon Sep 17 00:00:00 2001 From: Ken Finnigan Date: Sun, 21 Aug 2011 22:46:25 -0400 Subject: [PATCH] Fixes for solder testsuite --- .../seam/solder/test/bean/defaultbean/DefaultBeanTest.java | 4 ++-- .../generic/alternative/GenericBeanAlternativeTest.java | 4 ++-- .../solder/test/bean/generic/field/GenericBeanTest.java | 4 ++-- .../test/bean/generic/field/GenericBeanUnwrapTest.java | 4 ++-- .../solder/test/bean/generic/field/GenericProductTest.java | 4 ++-- .../test/bean/generic/field/ObserversOnGenericBeanTest.java | 4 ++-- .../test/bean/generic/field/ProducersOnGenericBeanTest.java | 4 ++-- .../solder/test/bean/generic/method/GenericBeanTest.java | 4 ++-- .../solder/test/bean/generic/method/GenericProductTest.java | 4 ++-- .../bean/generic/method/ProducersOnGenericBeanTest.java | 4 ++-- .../bean/generic/method/QualifierOnlyGenericBeanTest.java | 4 ++-- .../main/java/org/jboss/seam/solder/test/core/CoreTest.java | 4 ++-- .../jboss/seam/solder/test/core/requires/RequiresTest.java | 4 ++-- .../jboss/seam/solder/test/defaultbean/DefaultBeanTest.java | 4 ++-- .../src/main/java/org/jboss/seam/solder/test/el/ElTest.java | 4 ++-- .../jboss/seam/solder/test/logging/LoggerInjectionTest.java | 4 ++-- .../test/logging/TypedMessageLoggerInjectionTest.java | 4 ++-- .../test/messages/TypedMessageBundleInjectionTest.java | 4 ++-- .../seam/solder/test/resourceLoader/ResourceLoaderTest.java | 4 ++-- .../seam/solder/test/serviceHandler/ServiceHandlerTest.java | 4 ++-- .../org/jboss/seam/solder/test/unwraps/UnwrapsTest.java | 4 ++-- .../seam/solder/test/util/AnnotationInspectorTest.java | 4 ++-- .../java/org/jboss/seam/solder/test/util/Deployments.java | 4 ++-- testsuite/internals/jbossas/pom.xml | 6 ++++++ 24 files changed, 52 insertions(+), 46 deletions(-) diff --git a/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/defaultbean/DefaultBeanTest.java b/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/defaultbean/DefaultBeanTest.java index fc442428..78ad1d5c 100644 --- a/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/defaultbean/DefaultBeanTest.java +++ b/testsuite/internals/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/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/generic/alternative/GenericBeanAlternativeTest.java b/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/generic/alternative/GenericBeanAlternativeTest.java index 66fb3f39..126ccc51 100644 --- a/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/generic/alternative/GenericBeanAlternativeTest.java +++ b/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/generic/alternative/GenericBeanAlternativeTest.java @@ -22,7 +22,7 @@ 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; @@ -30,7 +30,7 @@ @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/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/generic/field/GenericBeanTest.java b/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/generic/field/GenericBeanTest.java index 32d3925c..860ab292 100644 --- a/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/generic/field/GenericBeanTest.java +++ b/testsuite/internals/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/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/generic/field/GenericBeanUnwrapTest.java b/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/generic/field/GenericBeanUnwrapTest.java index c43d86fe..eebb7760 100644 --- a/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/generic/field/GenericBeanUnwrapTest.java +++ b/testsuite/internals/base/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/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/generic/field/GenericProductTest.java b/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/generic/field/GenericProductTest.java index 3db1a45d..37248643 100644 --- a/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/generic/field/GenericProductTest.java +++ b/testsuite/internals/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/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/generic/field/ObserversOnGenericBeanTest.java b/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/generic/field/ObserversOnGenericBeanTest.java index 7e21b75a..15e4dbfc 100644 --- a/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/generic/field/ObserversOnGenericBeanTest.java +++ b/testsuite/internals/base/src/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/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/generic/field/ProducersOnGenericBeanTest.java b/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/generic/field/ProducersOnGenericBeanTest.java index 10148385..1b31cb37 100644 --- a/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/generic/field/ProducersOnGenericBeanTest.java +++ b/testsuite/internals/base/src/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/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/generic/method/GenericBeanTest.java b/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/generic/method/GenericBeanTest.java index 4c0c6854..8e249198 100644 --- a/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/generic/method/GenericBeanTest.java +++ b/testsuite/internals/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/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/generic/method/GenericProductTest.java b/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/generic/method/GenericProductTest.java index 5ca76fd4..2b9b2b60 100644 --- a/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/generic/method/GenericProductTest.java +++ b/testsuite/internals/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/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/generic/method/ProducersOnGenericBeanTest.java b/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/generic/method/ProducersOnGenericBeanTest.java index 1b237151..cf5608c3 100644 --- a/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/generic/method/ProducersOnGenericBeanTest.java +++ b/testsuite/internals/base/src/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/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/generic/method/QualifierOnlyGenericBeanTest.java b/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/generic/method/QualifierOnlyGenericBeanTest.java index caed6203..ffe0ae7d 100644 --- a/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/bean/generic/method/QualifierOnlyGenericBeanTest.java +++ b/testsuite/internals/base/src/main/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 index d2db84a0..bbf5955b 100644 --- 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/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/core/requires/RequiresTest.java b/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/core/requires/RequiresTest.java index 87c4b456..2420e145 100644 --- a/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/core/requires/RequiresTest.java +++ b/testsuite/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/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/defaultbean/DefaultBeanTest.java b/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/defaultbean/DefaultBeanTest.java index 0a7796e9..64cc0a9f 100644 --- a/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/defaultbean/DefaultBeanTest.java +++ b/testsuite/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 index bf5f9bbd..8501f3de 100644 --- 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/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/logging/LoggerInjectionTest.java b/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/logging/LoggerInjectionTest.java index 34c2bd04..25ae5576 100644 --- a/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/logging/LoggerInjectionTest.java +++ b/testsuite/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/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/logging/TypedMessageLoggerInjectionTest.java b/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/logging/TypedMessageLoggerInjectionTest.java index 248f1e03..4d255c01 100644 --- a/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/logging/TypedMessageLoggerInjectionTest.java +++ b/testsuite/internals/base/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/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/messages/TypedMessageBundleInjectionTest.java b/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/messages/TypedMessageBundleInjectionTest.java index 958d6099..a891b9b2 100644 --- a/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/messages/TypedMessageBundleInjectionTest.java +++ b/testsuite/internals/base/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/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/resourceLoader/ResourceLoaderTest.java b/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/resourceLoader/ResourceLoaderTest.java index 11ed4191..f56b7648 100644 --- a/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/resourceLoader/ResourceLoaderTest.java +++ b/testsuite/internals/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/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/serviceHandler/ServiceHandlerTest.java b/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/serviceHandler/ServiceHandlerTest.java index 6319cb20..9af7dffa 100644 --- a/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/serviceHandler/ServiceHandlerTest.java +++ b/testsuite/internals/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 index 18633650..32cec642 100644 --- 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/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/util/AnnotationInspectorTest.java b/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/util/AnnotationInspectorTest.java index 48d6a930..e6937342 100644 --- a/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/util/AnnotationInspectorTest.java +++ b/testsuite/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()); } diff --git a/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/util/Deployments.java b/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/util/Deployments.java index 4e626950..16df19f9 100644 --- a/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/util/Deployments.java +++ b/testsuite/internals/base/src/main/java/org/jboss/seam/solder/test/util/Deployments.java @@ -16,8 +16,8 @@ */ package org.jboss.seam.solder.test.util; -import org.jboss.arquillian.spi.client.container.DeployableContainer; -import org.jboss.arquillian.spi.util.ServiceLoader; +import org.jboss.arquillian.container.spi.client.container.DeployableContainer; +import org.jboss.arquillian.container.test.spi.util.ServiceLoader; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; diff --git a/testsuite/internals/jbossas/pom.xml b/testsuite/internals/jbossas/pom.xml index f2a7972d..a389bde4 100644 --- a/testsuite/internals/jbossas/pom.xml +++ b/testsuite/internals/jbossas/pom.xml @@ -19,6 +19,12 @@ org.jboss.seam.solder seam-solder + compile + + + org.jboss.seam.solder + seam-solder-api + compile