Skip to content

Commit

Permalink
WELD-709
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
@mbogoevici @pmuir
mbogoevici authored and pmuir committed Oct 11, 2010
1 parent 15c633f commit 426d4db
Show file tree
Hide file tree
Showing 18 changed files with 51 additions and 137 deletions.
12 changes: 3 additions & 9 deletions tests-arquillian/src/test/java/org/jboss/weld/tests/beanDeployment/mixed/BootstrapTest.java
View file
Expand Up @@ -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;
Expand All @@ -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
Expand Down
12 changes: 3 additions & 9 deletions ...ava/org/jboss/weld/tests/beanDeployment/producers/singleProducerMethod/BootstrapTest.java
View file
Expand Up @@ -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;
Expand All @@ -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
Expand Down
12 changes: 3 additions & 9 deletions ...ian/src/test/java/org/jboss/weld/tests/beanDeployment/session/multiple/BootstrapTest.java
View file
Expand Up @@ -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;
Expand All @@ -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
Expand Down
8 changes: 2 additions & 6 deletions ...llian/src/test/java/org/jboss/weld/tests/beanDeployment/session/single/BootstrapTest.java
View file
Expand Up @@ -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;
Expand All @@ -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
Expand Down
20 changes: 8 additions & 12 deletions ...a/org/jboss/weld/tests/builtinBeans/ee/EEResourceProducerFieldPassivationCapableTest.java
View file
Expand Up @@ -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;
Expand All @@ -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
Expand Down
8 changes: 2 additions & 6 deletions tests-arquillian/src/test/java/org/jboss/weld/tests/ejb/EJBTest.java
View file
Expand Up @@ -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;
Expand All @@ -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
Expand Down
11 changes: 3 additions & 8 deletions tests-arquillian/src/test/java/org/jboss/weld/tests/enterprise/EjbDescriptorLookupTest.java
View file
Expand Up @@ -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;
Expand All @@ -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
Expand Down
10 changes: 3 additions & 7 deletions ...rquillian/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanDefinitionTest.java
View file
Expand Up @@ -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;
Expand All @@ -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
Expand Down
13 changes: 3 additions & 10 deletions tests-arquillian/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanTest.java
View file
Expand Up @@ -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;
Expand All @@ -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
Expand Down
8 changes: 2 additions & 6 deletions .../src/test/java/org/jboss/weld/tests/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
12 changes: 3 additions & 9 deletions ...c/test/java/org/jboss/weld/tests/enterprise/proxyability/EnterpriseBeanLifecycleTest.java
View file
Expand Up @@ -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;
Expand All @@ -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());
}

/*
Expand Down
12 changes: 3 additions & 9 deletions ...st/java/org/jboss/weld/tests/event/observer/transactional/TransactionalObserversTest.java
View file
Expand Up @@ -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;
Expand All @@ -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
Expand Down
8 changes: 2 additions & 6 deletions tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/EnterpriseExtensionTest.java
View file
Expand Up @@ -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;
Expand All @@ -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);
}

/*
Expand Down
8 changes: 2 additions & 6 deletions ...c/test/java/org/jboss/weld/tests/extensions/annotatedType/AnnotatedTypeExtensionTest.java
View file
Expand Up @@ -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;
Expand All @@ -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
Expand Down
8 changes: 2 additions & 6 deletions .../java/org/jboss/weld/tests/extensions/annotatedType/ejb/AnnotatedTypeSessionBeanTest.java
View file
Expand Up @@ -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;
Expand All @@ -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
Expand Down

0 comments on commit 426d4db

Please sign in to comment.