From 426d4db7593df9ca82d5eadab83b5fce8fb8fc93 Mon Sep 17 00:00:00 2001 From: Marius Bogoevici Date: Wed, 6 Oct 2010 17:05:44 -0400 Subject: [PATCH] WELD-709 All EAR deployments converted to WARs. EARs are not necessary for testing right now, and ARQ-307 currently prevents those tests from running in JBoss AS when using a hierarchical deployment model. --- .../beanDeployment/mixed/BootstrapTest.java | 12 +++-------- .../singleProducerMethod/BootstrapTest.java | 12 +++-------- .../session/multiple/BootstrapTest.java | 12 +++-------- .../session/single/BootstrapTest.java | 8 ++------ ...ceProducerFieldPassivationCapableTest.java | 20 ++++++++----------- .../org/jboss/weld/tests/ejb/EJBTest.java | 8 ++------ .../enterprise/EjbDescriptorLookupTest.java | 11 +++------- .../EnterpriseBeanDefinitionTest.java | 10 +++------- .../tests/enterprise/EnterpriseBeanTest.java | 13 +++--------- .../EnterpriseBeanLifecycleTest.java | 8 ++------ .../EnterpriseBeanLifecycleTest.java | 12 +++-------- .../TransactionalObserversTest.java | 12 +++-------- .../extensions/EnterpriseExtensionTest.java | 8 ++------ .../AnnotatedTypeExtensionTest.java | 8 ++------ .../ejb/AnnotatedTypeSessionBeanTest.java | 8 ++------ .../InterceptorExtensionTest.java | 8 ++------ .../ejb/EnterpriseBeanInterceptionTest.java | 8 ++------ .../newBean/NewEnterpriseBeanTest.java | 10 +++------- 18 files changed, 51 insertions(+), 137 deletions(-) diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/BootstrapTest.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/BootstrapTest.java index 27e8d64bbee..6d684a2fe0b 100644 --- a/tests-arquillian/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/BootstrapTest.java +++ b/tests-arquillian/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/BootstrapTest.java @@ -26,10 +26,8 @@ import org.jboss.arquillian.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.BeanArchive; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.weld.bean.ManagedBean; import org.jboss.weld.bean.RIBean; import org.jboss.weld.bean.SessionBean; @@ -44,12 +42,8 @@ public class BootstrapTest @Deployment public static Archive deploy() { - return ShrinkWrap.create(EnterpriseArchive.class, "test.ear") - .addModule( - ShrinkWrap.create(JavaArchive.class) - .addPackage(BootstrapTest.class.getPackage()) - .addManifestResource(EmptyAsset.INSTANCE, "beans.xml") - ); + return ShrinkWrap.create(BeanArchive.class) + .addPackage(BootstrapTest.class.getPackage()); } @Inject diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/BootstrapTest.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/BootstrapTest.java index f153ec2fb71..0aa4e692a47 100644 --- a/tests-arquillian/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/BootstrapTest.java +++ b/tests-arquillian/src/test/java/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/BootstrapTest.java @@ -26,10 +26,8 @@ import org.jboss.arquillian.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.BeanArchive; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.weld.bean.ManagedBean; import org.jboss.weld.bean.ProducerMethod; import org.jboss.weld.bean.RIBean; @@ -44,12 +42,8 @@ public class BootstrapTest @Deployment public static Archive deploy() { - return ShrinkWrap.create(EnterpriseArchive.class, "test.ear") - .addModule( - ShrinkWrap.create(JavaArchive.class) - .addPackage(BootstrapTest.class.getPackage()) - .addManifestResource(EmptyAsset.INSTANCE, "beans.xml") - ); + return ShrinkWrap.create(BeanArchive.class) + .addPackage(BootstrapTest.class.getPackage()); } @Inject diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/BootstrapTest.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/BootstrapTest.java index c7e098d20ae..3fbd29ba8ef 100644 --- a/tests-arquillian/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/BootstrapTest.java +++ b/tests-arquillian/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/BootstrapTest.java @@ -26,10 +26,8 @@ import org.jboss.arquillian.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.BeanArchive; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.weld.bean.RIBean; import org.jboss.weld.bean.SessionBean; import org.jboss.weld.manager.BeanManagerImpl; @@ -43,12 +41,8 @@ public class BootstrapTest @Deployment public static Archive deploy() { - return ShrinkWrap.create(EnterpriseArchive.class, "test.ear") - .addModule( - ShrinkWrap.create(JavaArchive.class) - .addPackage(BootstrapTest.class.getPackage()) - .addManifestResource(EmptyAsset.INSTANCE, "beans.xml") - ); + return ShrinkWrap.create(BeanArchive.class) + .addPackage(BootstrapTest.class.getPackage()); } @Inject diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/BootstrapTest.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/BootstrapTest.java index 7444ede679c..b883baf72ae 100644 --- a/tests-arquillian/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/BootstrapTest.java +++ b/tests-arquillian/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/BootstrapTest.java @@ -28,7 +28,6 @@ import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.BeanArchive; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.weld.bean.RIBean; import org.jboss.weld.manager.BeanManagerImpl; import org.junit.Assert; @@ -41,11 +40,8 @@ public class BootstrapTest @Deployment public static Archive deploy() { - return ShrinkWrap.create(EnterpriseArchive.class, "test.ear") - .addModule( - ShrinkWrap.create(BeanArchive.class) - .addPackage(BootstrapTest.class.getPackage()) - ); + return ShrinkWrap.create(BeanArchive.class) + .addPackage(BootstrapTest.class.getPackage()); } @Inject diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/builtinBeans/ee/EEResourceProducerFieldPassivationCapableTest.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/builtinBeans/ee/EEResourceProducerFieldPassivationCapableTest.java index af37d2c5949..1f788546497 100644 --- a/tests-arquillian/src/test/java/org/jboss/weld/tests/builtinBeans/ee/EEResourceProducerFieldPassivationCapableTest.java +++ b/tests-arquillian/src/test/java/org/jboss/weld/tests/builtinBeans/ee/EEResourceProducerFieldPassivationCapableTest.java @@ -28,10 +28,9 @@ import org.jboss.arquillian.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.BeanArchive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.weld.test.Utils; import org.jboss.weld.tests.category.Integration; import org.junit.Assert; @@ -46,16 +45,13 @@ public class EEResourceProducerFieldPassivationCapableTest @Deployment public static Archive deploy() { - return ShrinkWrap.create(EnterpriseArchive.class, "test.ear") - .addModule( - ShrinkWrap.create(JavaArchive.class) - .addPackage(EEResourceProducerFieldPassivationCapableTest.class.getPackage()) - .addClass(Utils.class) - .addManifestResource( - EEResourceProducerFieldPassivationCapableTest.class.getPackage(), - "persistence.xml", "persistence.xml") - .addManifestResource(EmptyAsset.INSTANCE, "beans.xml") - ); + return ShrinkWrap.create(BeanArchive.class) + .addPackage(EEResourceProducerFieldPassivationCapableTest.class.getPackage()) + .addClass(Utils.class) + .addManifestResource( + EEResourceProducerFieldPassivationCapableTest.class.getPackage(), + "persistence.xml", "persistence.xml") + .addManifestResource(EmptyAsset.INSTANCE, "beans.xml"); } @Test diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/ejb/EJBTest.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/ejb/EJBTest.java index 2b192d2c5a0..ce35efff7a4 100644 --- a/tests-arquillian/src/test/java/org/jboss/weld/tests/ejb/EJBTest.java +++ b/tests-arquillian/src/test/java/org/jboss/weld/tests/ejb/EJBTest.java @@ -21,7 +21,6 @@ import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.BeanArchive; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.weld.tests.category.Integration; import org.junit.Assert; import org.junit.Test; @@ -35,11 +34,8 @@ public class EJBTest @Deployment public static Archive deploy() { - return ShrinkWrap.create(EnterpriseArchive.class, "test.ear") - .addModule( - ShrinkWrap.create(BeanArchive.class) - .addPackage(EJBTest.class.getPackage()) - ); + return ShrinkWrap.create(BeanArchive.class) + .addPackage(EJBTest.class.getPackage()); } @Test diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/enterprise/EjbDescriptorLookupTest.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/enterprise/EjbDescriptorLookupTest.java index 5c014d03847..8cb02f5b1e5 100644 --- a/tests-arquillian/src/test/java/org/jboss/weld/tests/enterprise/EjbDescriptorLookupTest.java +++ b/tests-arquillian/src/test/java/org/jboss/weld/tests/enterprise/EjbDescriptorLookupTest.java @@ -23,10 +23,9 @@ import org.jboss.arquillian.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.BeanArchive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.weld.bean.SessionBean; import org.jboss.weld.ejb.InternalEjbDescriptor; import org.jboss.weld.ejb.spi.EjbDescriptor; @@ -45,12 +44,8 @@ public class EjbDescriptorLookupTest @Deployment public static Archive deploy() { - return ShrinkWrap.create(EnterpriseArchive.class, "test.ear") - .addModule( - ShrinkWrap.create(JavaArchive.class) - .addPackage(EjbDescriptorLookupTest.class.getPackage()) - .addManifestResource(EmptyAsset.INSTANCE, "beans.xml") - ); + return ShrinkWrap.create(BeanArchive.class) + .addPackage(EjbDescriptorLookupTest.class.getPackage()); } @Inject diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanDefinitionTest.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanDefinitionTest.java index 51652ecaf64..2d5f1088918 100644 --- a/tests-arquillian/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanDefinitionTest.java +++ b/tests-arquillian/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanDefinitionTest.java @@ -24,7 +24,6 @@ import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.BeanArchive; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.weld.manager.BeanManagerImpl; import org.jboss.weld.test.Utils; import org.junit.Assert; @@ -37,12 +36,9 @@ public class EnterpriseBeanDefinitionTest @Deployment public static Archive deploy() { - return ShrinkWrap.create(EnterpriseArchive.class, "test.ear") - .addModule( - ShrinkWrap.create(BeanArchive.class) - .addPackage(EnterpriseBeanDefinitionTest.class.getPackage()) - .addClass(Utils.class) - ); + return ShrinkWrap.create(BeanArchive.class) + .addPackage(EnterpriseBeanDefinitionTest.class.getPackage()) + .addClass(Utils.class); } @Inject diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanTest.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanTest.java index 3f25b2cd585..9d64f9afb8a 100644 --- a/tests-arquillian/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanTest.java +++ b/tests-arquillian/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanTest.java @@ -25,10 +25,8 @@ import org.jboss.arquillian.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.BeanArchive; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.weld.bean.SessionBean; import org.jboss.weld.manager.BeanManagerImpl; import org.jboss.weld.test.Utils; @@ -46,14 +44,9 @@ public class EnterpriseBeanTest @Deployment public static Archive deploy() { - return ShrinkWrap.create(EnterpriseArchive.class, "test.ear") - .addModule( - ShrinkWrap.create(JavaArchive.class) + return ShrinkWrap.create(BeanArchive.class) .addPackage(EnterpriseBeanTest.class.getPackage()) - .addClass(Utils.class) - .addManifestResource(EmptyAsset.INSTANCE, "beans.xml") - .addManifestResource(EjbDescriptorLookupTest.class.getPackage(), "ejb-jar.xml", "ejb-jar.xml") - ); + .addClass(Utils.class); } @Inject diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java index 77737e08cf3..70484fd0cb7 100644 --- a/tests-arquillian/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java +++ b/tests-arquillian/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java @@ -26,7 +26,6 @@ import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.BeanArchive; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.weld.manager.BeanManagerImpl; import org.jboss.weld.test.Utils; import org.jboss.weld.tests.category.Integration; @@ -57,13 +56,10 @@ public class EnterpriseBeanLifecycleTest @Deployment public static Archive deploy() { - return ShrinkWrap.create(EnterpriseArchive.class, "test.ear") - .addModule( - ShrinkWrap.create(BeanArchive.class, "test.jar") + return ShrinkWrap.create(BeanArchive.class) .decorate(AlarmedChickenHutch.class) .addPackage(EnterpriseBeanLifecycleTest.class.getPackage()) - .addClass(Utils.class) - ); + .addClass(Utils.class); } @Inject diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/enterprise/proxyability/EnterpriseBeanLifecycleTest.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/enterprise/proxyability/EnterpriseBeanLifecycleTest.java index 589285b92aa..e97db61462b 100644 --- a/tests-arquillian/src/test/java/org/jboss/weld/tests/enterprise/proxyability/EnterpriseBeanLifecycleTest.java +++ b/tests-arquillian/src/test/java/org/jboss/weld/tests/enterprise/proxyability/EnterpriseBeanLifecycleTest.java @@ -19,10 +19,8 @@ import org.jboss.arquillian.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.BeanArchive; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.weld.tests.category.Integration; import org.junit.Assert; import org.junit.Test; @@ -36,12 +34,8 @@ public class EnterpriseBeanLifecycleTest @Deployment public static Archive deploy() { - return ShrinkWrap.create(EnterpriseArchive.class, "test.ear") - .addModule( - ShrinkWrap.create(JavaArchive.class) - .addPackage(EnterpriseBeanLifecycleTest.class.getPackage()) - .addManifestResource(EmptyAsset.INSTANCE, "beans.xml") - ); + return ShrinkWrap.create(BeanArchive.class) + .addPackage(EnterpriseBeanLifecycleTest.class.getPackage()); } /* diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/event/observer/transactional/TransactionalObserversTest.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/event/observer/transactional/TransactionalObserversTest.java index 430b8e77ecc..c8f784a93b4 100644 --- a/tests-arquillian/src/test/java/org/jboss/weld/tests/event/observer/transactional/TransactionalObserversTest.java +++ b/tests-arquillian/src/test/java/org/jboss/weld/tests/event/observer/transactional/TransactionalObserversTest.java @@ -24,10 +24,8 @@ import org.jboss.arquillian.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.BeanArchive; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.weld.test.Utils; import org.jboss.weld.tests.category.Broken; import org.jboss.weld.tests.category.Integration; @@ -48,13 +46,9 @@ public class TransactionalObserversTest @Deployment public static Archive deploy() { - return ShrinkWrap.create(EnterpriseArchive.class, "test.ear") - .addModule( - ShrinkWrap.create(JavaArchive.class) + return ShrinkWrap.create(BeanArchive.class) .addPackage(TransactionalObserversTest.class.getPackage()) - .addClass(Utils.class) - .addManifestResource(EmptyAsset.INSTANCE, "beans.xml") - ); + .addClass(Utils.class); } @Inject @Tame diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/EnterpriseExtensionTest.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/EnterpriseExtensionTest.java index 0711c454ee1..18f49c264aa 100644 --- a/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/EnterpriseExtensionTest.java +++ b/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/EnterpriseExtensionTest.java @@ -26,7 +26,6 @@ import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.BeanArchive; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.weld.tests.category.Integration; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -39,16 +38,13 @@ public class EnterpriseExtensionTest @Deployment public static Archive deploy() { - return ShrinkWrap.create(EnterpriseArchive.class, "test.ear") - .addModule( - ShrinkWrap.create(BeanArchive.class) + return ShrinkWrap.create(BeanArchive.class) .addPackage(EnterpriseExtensionTest.class.getPackage()) .addServiceProvider(Extension.class, SimpleExtension.class, ExtensionObserver.class, WoodlandExtension.class, - TrainlineExtension.class) - ); + TrainlineExtension.class); } /* diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/annotatedType/AnnotatedTypeExtensionTest.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/annotatedType/AnnotatedTypeExtensionTest.java index d6148370b9a..31a2ae12cf6 100644 --- a/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/annotatedType/AnnotatedTypeExtensionTest.java +++ b/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/annotatedType/AnnotatedTypeExtensionTest.java @@ -36,7 +36,6 @@ import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.BeanArchive; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.weld.manager.BeanManagerImpl; import org.jboss.weld.test.Utils; import org.jboss.weld.tests.category.Integration; @@ -53,13 +52,10 @@ public class AnnotatedTypeExtensionTest @Deployment public static Archive deploy() { - return ShrinkWrap.create(EnterpriseArchive.class, "test.ear") - .addModule( - ShrinkWrap.create(BeanArchive.class) + return ShrinkWrap.create(BeanArchive.class) .addPackage(AnnotatedTypeExtensionTest.class.getPackage()) .addClass(Utils.class) - .addServiceProvider(Extension.class, AnnotatedTypeExtension.class) - ); + .addServiceProvider(Extension.class, AnnotatedTypeExtension.class); } @Inject diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/AnnotatedTypeSessionBeanTest.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/AnnotatedTypeSessionBeanTest.java index efc9c2aea56..ffd230d5509 100644 --- a/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/AnnotatedTypeSessionBeanTest.java +++ b/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/AnnotatedTypeSessionBeanTest.java @@ -23,7 +23,6 @@ import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.BeanArchive; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.weld.test.util.annotated.TestAnnotatedTypeBuilder; import org.jboss.weld.tests.category.Integration; import org.junit.Assert; @@ -42,13 +41,10 @@ public class AnnotatedTypeSessionBeanTest @Deployment public static Archive deploy() { - return ShrinkWrap.create(EnterpriseArchive.class, "test.ear") - .addModule( - ShrinkWrap.create(BeanArchive.class) + return ShrinkWrap.create(BeanArchive.class) .addPackage(AnnotatedTypeSessionBeanTest.class.getPackage()) .addPackage(TestAnnotatedTypeBuilder.class.getPackage()) - .addServiceProvider(Extension.class, AnnotatedTypeEjbExtension.class) - ); + .addServiceProvider(Extension.class, AnnotatedTypeEjbExtension.class); } @Test diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtensionTest.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtensionTest.java index db0ad775c64..f3fb4f81aa0 100644 --- a/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtensionTest.java +++ b/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtensionTest.java @@ -27,7 +27,6 @@ import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.BeanArchive; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.weld.test.util.annotated.TestAnnotatedTypeBuilder; import org.jboss.weld.tests.category.Integration; import org.junit.Assert; @@ -48,14 +47,11 @@ public class InterceptorExtensionTest @Deployment public static Archive deploy() { - return ShrinkWrap.create(EnterpriseArchive.class, "test.ear") - .addModule( - ShrinkWrap.create(BeanArchive.class) + return ShrinkWrap.create(BeanArchive.class) .intercept(IncrementingInterceptor.class, LifecycleInterceptor.class) .addPackage(InterceptorExtensionTest.class.getPackage()) .addPackage(TestAnnotatedTypeBuilder.class.getPackage()) - .addServiceProvider(Extension.class, InterceptorExtension.class) - ); + .addServiceProvider(Extension.class, InterceptorExtension.class); } @Inject diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/ejb/EnterpriseBeanInterceptionTest.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/ejb/EnterpriseBeanInterceptionTest.java index 7922e393906..5cdaa49ce63 100644 --- a/tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/ejb/EnterpriseBeanInterceptionTest.java +++ b/tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/ejb/EnterpriseBeanInterceptionTest.java @@ -32,7 +32,6 @@ import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.BeanArchive; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.weld.bean.SessionBean; import org.jboss.weld.bean.interceptor.InterceptorBindingsAdapter; import org.jboss.weld.ejb.spi.InterceptorBindings; @@ -46,12 +45,9 @@ public class EnterpriseBeanInterceptionTest @Deployment public static Archive deploy() { - return ShrinkWrap.create(EnterpriseArchive.class, "test.ear") - .addModule( - ShrinkWrap.create(BeanArchive.class) + return ShrinkWrap.create(BeanArchive.class) .intercept(Goalkeeper.class, Defender.class, Referee.class) - .addPackage(EnterpriseBeanInterceptionTest.class.getPackage()) - ); + .addPackage(EnterpriseBeanInterceptionTest.class.getPackage()); } @Inject diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/session/newBean/NewEnterpriseBeanTest.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/session/newBean/NewEnterpriseBeanTest.java index ecebe453265..33be1e18de4 100644 --- a/tests-arquillian/src/test/java/org/jboss/weld/tests/session/newBean/NewEnterpriseBeanTest.java +++ b/tests-arquillian/src/test/java/org/jboss/weld/tests/session/newBean/NewEnterpriseBeanTest.java @@ -26,10 +26,9 @@ import org.jboss.arquillian.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.BeanArchive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.weld.bean.NewSessionBean; import org.jboss.weld.bean.SessionBean; import org.jboss.weld.introspector.WeldAnnotated; @@ -46,12 +45,9 @@ public class NewEnterpriseBeanTest @Deployment public static Archive deploy() { - return ShrinkWrap.create(EnterpriseArchive.class, "test.ear") - .addModule( - ShrinkWrap.create(JavaArchive.class) + return ShrinkWrap.create(BeanArchive.class) .addPackage(NewEnterpriseBeanTest.class.getPackage()) - .addManifestResource(EmptyAsset.INSTANCE, "beans.xml") - ); + .addManifestResource(EmptyAsset.INSTANCE, "beans.xml"); } private static final New NEW_LITERAL = new NewLiteral()