[jboss-cvs] JBossAS SVN: r106575 - in projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test: resources/org/jboss/test/deployers/test and 1 other directory.

Mon Jul 12 04:14:46 EDT 2010

Author: flavia.rainone at jboss.com
Date: 2010-07-12 04:14:45 -0400 (Mon, 12 Jul 2010)
New Revision: 106575

Added:
   projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/java/org/jboss/test/deployers/test/AbstractEnvironmentTest.java
   projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/java/org/jboss/test/deployers/test/ArchiveEnvironmentTestCase.java
   projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/java/org/jboss/test/deployers/test/DeploymentEnvironmentTestCase.java
   projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/resources/org/jboss/test/deployers/test/ArchiveEnvironmentTestCase.xml
   projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/resources/org/jboss/test/deployers/test/DeploymentEnvironmentTestCase.xml
Removed:
   projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/java/org/jboss/test/deployers/test/ArchiveDiscoveryDeploymentTestCase.java
   projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/java/org/jboss/test/deployers/test/JBossDeploymentTestCase.java
   projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/resources/org/jboss/test/deployers/test/ArchiveDiscoveryDeploymentTestCase.xml
   projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/resources/org/jboss/test/deployers/test/JBossDeploymentTestCase.xml
Log:
[WELDINT-1] Refactor out the common piece of code in ArchiveDiscoveryDeploymentTestCase and JBossDeploymentTestCase into new AbstractEnvironmentTest class.
Rename ArchiveDiscoveryDeploymentTestCase to ArchiveEnvironmentTestCase and JBossDeploymentTestCase to DeploymentEnvironmentTestCase.

Added: projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/java/org/jboss/test/deployers/test/AbstractEnvironmentTest.java
===================================================================

--- projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/java/org/jboss/test/deployers/test/AbstractEnvironmentTest.java	                        (rev 0)
+++ projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/java/org/jboss/test/deployers/test/AbstractEnvironmentTest.java	2010-07-12 08:14:45 UTC (rev 106575)
@@ -0,0 +1,616 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.deployers.test;
+
+import java.net.URL;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import junit.framework.Test;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.container.LibraryContainer;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.test.deployers.support.MockArchiveManifest;
+import org.jboss.test.deployers.support.crm.CrmWebBean;
+import org.jboss.test.deployers.support.ejb.BusinessInterface;
+import org.jboss.test.deployers.support.ejb.MySLSBean;
+import org.jboss.test.deployers.support.ext.ExternalWebBean;
+import org.jboss.test.deployers.support.jar.PlainJavaBean;
+import org.jboss.test.deployers.support.jsf.NotWBJsfBean;
+import org.jboss.test.deployers.support.ui.UIWebBean;
+import org.jboss.test.deployers.support.util.SomeUtil;
+import org.jboss.test.deployers.support.web.ServletWebBean;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.wsf.spi.metadata.j2ee.SLSBMetaData;
+
+/**
+ * Abstract Environment test case.
+ *
+ * @author <a href="mailto:flavia.rainone at jboss.com">Flavia Rainone</a>
+ * @param E the type of environment this test applies to
+ */
+public abstract class AbstractEnvironmentTest<E> extends AbstractWeldTest
+{
+   protected static final String EAR_NAME = "simple.ear";
+   protected static final String EJB_JAR_NAME = "ejb.jar";
+   protected static final String WAR_NAME = "simple.war";
+   
+   public AbstractEnvironmentTest(String name)
+   {
+      super(name);
+   }
+
+   public static Test suite()
+   {
+      return suite(AbstractEnvironmentTest.class);
+   }
+
+   protected DeploymentUnit unit;
+
+   public void tearDown() throws Exception
+   {
+      undeploy(unit);
+      super.tearDown();
+   }
+   
+   public void testEjbJar() throws Exception
+   {
+      JavaArchive ejbJar = createEjbJar(true);
+      unit = assertDeploy(ejbJar);
+
+      E environment = assertSingleEnvironment(EJB_JAR_NAME);
+      assertExpectedClasses(environment, PlainJavaBean.class);
+      assertExpectedResources(environment, "ejb.jar");
+   }
+
+   public void testEjbJarWithoutXml() throws Exception
+   {
+      JavaArchive ejbJar = createEjbJar(false);
+      unit = assertDeploy(ejbJar);
+      
+      assertEmptyEnvironment();
+   }
+
+   public void testEjbJarInEar() throws Exception
+   {
+      EnterpriseArchive ear = ShrinkWrap.create(EAR_NAME, EnterpriseArchive.class);
+      JavaArchive ejbJar = createEjbJar(true);
+      ear.addModule(ejbJar);
+      MockArchiveManifest.addManifest(ear);
+      unit = assertDeploy(ear);
+      
+      E environment = assertSingleEnvironment(EAR_NAME);
+      assertExpectedClasses(environment, PlainJavaBean.class);
+      assertExpectedResources(environment, unit.getSimpleName() + "/ejb.jar");
+   }
+
+   public void testEjbJarWithoutXmlInEar() throws Exception
+   {
+      EnterpriseArchive ear = ShrinkWrap.create(EAR_NAME, EnterpriseArchive.class);
+      JavaArchive ejbJar = createEjbJar(false);
+      ear.addModule(ejbJar);
+      MockArchiveManifest.addManifest(ear);
+      unit = assertDeploy(ear);
+      
+      assertEmptyEnvironment();
+   }
+
+   public void testEjbJarsInEar() throws Exception
+   {
+      EnterpriseArchive ear = ShrinkWrap.create(EAR_NAME, EnterpriseArchive.class);
+      JavaArchive ejbJar1 = createEjbJar("ejbJar1.jar", true, PlainJavaBean.class);
+      ear.addModule(ejbJar1);
+      JavaArchive ejbJar2 = createEjbJar("ejbJar2.jar", true, MySLSBean.class, SLSBMetaData.class);
+      ear.addModule(ejbJar2);
+      MockArchiveManifest.addManifest(ear);
+      unit = assertDeploy(ear);
+      
+      E environment = assertSingleEnvironment(EAR_NAME);
+      assertExpectedClasses(environment, PlainJavaBean.class, MySLSBean.class,
+               SLSBMetaData.class);
+      assertExpectedResources(environment, EAR_NAME + "/ejbJar1.jar",
+               EAR_NAME + "/ejbJar2.jar");
+   }
+
+   public void testMixedEjbJarsInEar() throws Exception
+   {
+      EnterpriseArchive ear = ShrinkWrap.create(EAR_NAME, EnterpriseArchive.class);
+      JavaArchive ejbJar1 = createEjbJar("ejbJar1.jar", false, PlainJavaBean.class);
+      ear.addModule(ejbJar1);
+      JavaArchive ejbJar2 = createEjbJar("ejbJar2.jar", true, MySLSBean.class, SLSBMetaData.class);
+      ear.addModule(ejbJar2);
+      MockArchiveManifest.addManifest(ear);
+      unit = assertDeploy(ear);
+      
+      E environment = assertSingleEnvironment(EAR_NAME);
+      assertExpectedClasses(environment, MySLSBean.class, SLSBMetaData.class);
+      assertExpectedResources(environment, "simple.ear/ejbJar2.jar");
+   }
+
+   public void testEjbJarsWithoutXmlInEar() throws Exception
+   {
+      EnterpriseArchive ear = ShrinkWrap.create(EAR_NAME, EnterpriseArchive.class);
+      JavaArchive ejbJar1 = createEjbJar("ejbJar1.jar", false, PlainJavaBean.class);
+      ear.addModule(ejbJar1);
+      JavaArchive ejbJar2 = createEjbJar("ejbJar2.jar", false, MySLSBean.class, SLSBMetaData.class);
+      ear.addModule(ejbJar2);
+      MockArchiveManifest.addManifest(ear);
+      unit = assertDeploy(ear);
+      
+      assertEmptyEnvironment();
+   }
+
+   public void testWar() throws Exception
+   {
+      WebArchive war = createWar(true);
+      unit = assertDeploy(war);
+      
+      E environment = assertSingleEnvironment(WAR_NAME);
+      assertExpectedClasses(environment, ServletWebBean.class);
+      assertExpectedWarResources(environment, unit.getSimpleName(), true);
+   }
+
+   public void testWarWithLib() throws Exception
+   {
+      WebArchive war = createWarWithLib(true, true);
+      unit = assertDeploy(war);
+      
+      E environment = assertSingleEnvironment(WAR_NAME);
+      assertExpectedClasses(environment, ServletWebBean.class, UIWebBean.class);
+      assertExpectedWarResources(environment, unit.getSimpleName(), true, "lib.jar");
+   }
+
+   public void testWarWithLibs() throws Exception
+   {
+      WebArchive war = createWarWithLibs(true, true, true);
+      unit = assertDeploy(war);
+      
+      E environment = assertSingleEnvironment(WAR_NAME);
+      assertExpectedClasses(environment, ServletWebBean.class, UIWebBean.class, CrmWebBean.class);
+      assertExpectedWarResources(environment, unit.getSimpleName(), true, "lib1.jar", "lib2.jar");
+   }
+
+   public void testWarWithLibWithoutXml() throws Exception
+   {
+      WebArchive war = createWarWithLib(true, false);
+      unit = assertDeploy(war);
+      
+      E environment = assertSingleEnvironment(WAR_NAME);
+      assertExpectedClasses(environment, ServletWebBean.class);
+      assertExpectedWarResources(environment, unit.getSimpleName(), true);
+   }
+
+   public void testWarWithLibsWithoutXml() throws Exception
+   {
+      WebArchive war = createWarWithLibs(true, false, false);
+      unit = assertDeploy(war);
+      
+      E environment = assertSingleEnvironment(WAR_NAME);
+      assertExpectedClasses(environment, ServletWebBean.class);
+      assertExpectedWarResources(environment, unit.getSimpleName(), true);
+   }
+
+   public void testWarWithMixedLibs() throws Exception
+   {
+      WebArchive war = createWarWithLibs(true, true, false);
+      unit = assertDeploy(war);
+      
+      E environment = assertSingleEnvironment(WAR_NAME);
+      assertExpectedClasses(environment, ServletWebBean.class, UIWebBean.class);
+      assertExpectedWarResources(environment, unit.getSimpleName(), true, "lib1.jar");
+   }
+
+   public void testWarWithoutXmlWithLib() throws Exception
+   {
+      WebArchive war = createWarWithLib(false, true);
+      unit = assertDeploy(war);
+      
+      E environment = assertSingleEnvironment(WAR_NAME);
+      assertExpectedClasses(environment, UIWebBean.class);
+      assertExpectedWarResources(environment, unit.getSimpleName(), false, "lib.jar");
+   }
+
+   public void testWarWithoutXmlWithLibs() throws Exception
+   {
+      WebArchive war = createWarWithLibs(false, true, true);
+      unit = assertDeploy(war);
+      
+      E environment = assertSingleEnvironment(WAR_NAME);
+      assertExpectedClasses(environment, UIWebBean.class, CrmWebBean.class);
+      assertExpectedWarResources(environment, unit.getSimpleName(), false, "lib1.jar", "lib2.jar");
+   }
+
+   public void testWarWithoutXmlWithLibWithoutXml() throws Exception
+   {
+      WebArchive war = createWarWithLib(false, false);
+      unit = assertDeploy(war);
+      
+      assertEmptyEnvironment();
+   }
+
+   public void testWarWithoutXmlWithMixedLibs() throws Exception
+   {
+      WebArchive war = createWarWithLibs(false, true, false);
+      unit = assertDeploy(war);
+      
+      E environment = assertSingleEnvironment(WAR_NAME);
+      assertExpectedClasses(environment, UIWebBean.class);
+      assertExpectedWarResources(environment, unit.getSimpleName(), false, "lib1.jar");
+   }
+
+   public void testWarWithoutXmlWithLibsWithoutXml() throws Exception
+   {
+      WebArchive war = createWarWithLibs(false, false, false);
+      unit = assertDeploy(war);
+      
+      assertEmptyEnvironment();
+   }
+
+   public void testWarWithoutXml() throws Exception
+   {
+      WebArchive war = createWar(false);
+      unit = assertDeploy(war);
+      
+      assertEmptyEnvironment();
+   }
+
+   public void testWarInEar() throws Exception
+   {
+      EnterpriseArchive ear = ShrinkWrap.create("warinear.ear", EnterpriseArchive.class);
+      WebArchive war = createWar(true);
+      ear.addModule(war);
+      MockArchiveManifest.addManifest(ear);
+      unit = assertDeploy(ear);
+      
+      E environment = assertSingleEnvironment("warinear.ear/simple.war");
+      assertExpectedClasses(environment, ServletWebBean.class);
+      assertExpectedWarResources(environment, "warinear.ear/simple.war", true);
+   }
+
+   public void testWarsInEar() throws Exception
+   {
+      EnterpriseArchive ear = ShrinkWrap.create("warinear.ear", EnterpriseArchive.class);
+      WebArchive war = createWar("simple1.war", true, ServletWebBean.class);
+      ear.addModule(war);
+      war = createWar("simple2.war", true, NotWBJsfBean.class);
+      ear.addModule(war);
+      MockArchiveManifest.addManifest(ear);
+      unit = assertDeploy(ear);
+      
+      assertWarsInEar();
+   }
+
+   protected abstract void assertWarsInEar();
+
+   public void testMixedWarsInEar() throws Exception
+   {
+      EnterpriseArchive ear = ShrinkWrap.create("warinear.ear", EnterpriseArchive.class);
+      WebArchive war = createWar("simple1.war", true, ServletWebBean.class);
+      ear.addModule(war);
+      war = createWar("simple2.war", false, NotWBJsfBean.class);
+      ear.addModule(war);
+      MockArchiveManifest.addManifest(ear);
+      unit = assertDeploy(ear);
+      
+      E environment = assertSingleEnvironment("warinear.ear/simple1.war");
+      assertExpectedClasses(environment, ServletWebBean.class);
+      assertExpectedWarResources(environment, "warinear.ear/simple1.war", true);
+   }
+
+   public void testWarsWithoutXmlInEar() throws Exception
+   {
+      EnterpriseArchive ear = ShrinkWrap.create("warinear.ear", EnterpriseArchive.class);
+      WebArchive war = createWar("simple1.war", false, ServletWebBean.class);
+      ear.addModule(war);
+      war = createWar("simple2.war", false, NotWBJsfBean.class);
+      ear.addModule(war);
+      MockArchiveManifest.addManifest(ear);
+      unit = assertDeploy(ear);
+      
+      assertEmptyEnvironment();
+   }
+
+   public void testWarWithLibInEar() throws Exception
+   {
+      EnterpriseArchive ear = ShrinkWrap.create("warinear.ear", EnterpriseArchive.class);
+      WebArchive war = createWarWithLib(true, true);
+      ear.addModule(war);
+      MockArchiveManifest.addManifest(ear);
+      unit = assertDeploy(ear);
+      
+      E environment = assertSingleEnvironment("warinear.ear/" + WAR_NAME);
+      assertExpectedClasses(environment, ServletWebBean.class, UIWebBean.class);
+      assertExpectedWarResources(environment, "warinear.ear/" + WAR_NAME, true, "lib.jar");
+   }
+
+   public void testWarWithLibWithoutXmlInEar() throws Exception
+   {
+      EnterpriseArchive ear = ShrinkWrap.create("warinear.ear", EnterpriseArchive.class);
+      WebArchive war = createWarWithLib(true, false);
+      ear.addModule(war);
+      MockArchiveManifest.addManifest(ear);
+      unit = assertDeploy(ear);
+      
+      E environment = assertSingleEnvironment("warinear.ear/" + WAR_NAME);
+      assertExpectedClasses(environment, ServletWebBean.class);
+      assertExpectedWarResources(environment, "warinear.ear/" + WAR_NAME, true);
+   }
+
+   public void testWarWithoutXmlWithLibWithoutXmlInEar() throws Exception
+   {
+      EnterpriseArchive ear = ShrinkWrap.create("warinear.ear", EnterpriseArchive.class);
+      WebArchive war = createWarWithLib(false, false);
+      ear.addModule(war);
+      MockArchiveManifest.addManifest(ear);
+      unit = assertDeploy(ear);
+      
+      assertEmptyEnvironment();
+   }
+
+   public void testWarWithoutXmlWithLibInEar() throws Exception
+   {
+      EnterpriseArchive ear = ShrinkWrap.create("warinear.ear", EnterpriseArchive.class);
+      WebArchive war = createWarWithLib(false, true);
+      ear.addModule(war);
+      MockArchiveManifest.addManifest(ear);
+      unit = assertDeploy(ear);
+      
+      E environment = assertSingleEnvironment("warinear.ear/" + WAR_NAME);
+      assertExpectedClasses(environment, UIWebBean.class);
+      assertExpectedWarResources(environment, "warinear.ear/" + WAR_NAME, false, "lib.jar");
+   }
+
+   public void testBasicEar() throws Exception
+   {
+      VirtualFile ear = createBasicEar();
+      unit = assertDeploy(ear);
+
+      assertBasicEar();
+   }
+
+   protected abstract void assertBasicEar();
+
+   public void testBasicEarFullCDI() throws Exception
+   {
+      EnterpriseArchive ear = ShrinkWrap.create("top-level.ear", EnterpriseArchive.class);
+      createLib(ear, "util.jar", true, SomeUtil.class);
+      createLib(ear, "ext.jar", true, ExternalWebBean.class);
+      JavaArchive ejbJar = createEjbJar("simple.jar", true, PlainJavaBean.class);
+      ear.addModule(ejbJar);
+      ejbJar = createEjbJar("ejbs.jar", true, MySLSBean.class, BusinessInterface.class);
+      ear.addModule(ejbJar);
+      WebArchive war = createWar("simple.war", true, ServletWebBean.class);
+      createLib(war, "ui.jar", true, UIWebBean.class);
+      ear.addModule(war);
+      war = createWar("crm.war", true, NotWBJsfBean.class);
+      createLib(war, "crm.jar", true, CrmWebBean.class);
+      ear.addModule(war);
+      unit = assertDeploy(ear);
+      
+      assertBasicEarFullCDI();
+   }
+
+   protected abstract void assertBasicEarFullCDI();
+
+   public void testBasicEarWithoutXml() throws Exception
+   {
+      EnterpriseArchive ear = ShrinkWrap.create("simple.ear", EnterpriseArchive.class);
+      createLib(ear, "util.jar", false, SomeUtil.class);
+      createLib(ear, "ext.jar", false, ExternalWebBean.class);
+      JavaArchive ejbJar = createEjbJar("simple.jar", false, PlainJavaBean.class);
+      ear.addModule(ejbJar);
+      ejbJar = createEjbJar("ejbs.jar", false, MySLSBean.class, BusinessInterface.class);
+      ear.addModule(ejbJar);
+      WebArchive war = createWar("simple.war", false, ServletWebBean.class);
+      createLib(war, "ui.jar", false, UIWebBean.class);
+      ear.addModule(war);
+      war = createWar("crm.war", false, NotWBJsfBean.class);
+      createLib(war, "crm.jar", false, CrmWebBean.class);
+      ear.addModule(war);
+      unit = assertDeploy(ear);
+
+      assertBasicEarWithoutXml();
+   }
+
+   protected abstract void assertBasicEarWithoutXml();
+
+   private static void addExpectedResource(Set<String> expected, String unit)
+   {
+      addExpectedResource(expected, unit, "/META-INF/beans.xml");
+   }
+
+   private static void addExpectedResource(Set<String> expected, String unit, String suffix)
+   {
+      expected.add(unit + suffix);
+   }
+
+   private static void addExpectedClass(Set<String> expected, Class<?> clazz)
+   {
+      expected.add(clazz.getName());
+   }
+
+   private void assertExpectedClasses(E environment, Set<String> expected)
+   {
+      Collection<Class<?>> weldClasses = getClasses(environment);
+      assertNotNull(weldClasses);
+      assertTrue("Unexpected empty weld classes collection", expected.isEmpty() || !weldClasses.isEmpty());
+      for (Class<?> clazz : weldClasses)
+      {
+         assertTrue("Found unexpected class: " + clazz.getName(), expected.remove(clazz.getName()));
+      }
+      assertEmpty("Should be emtpy, missing " + expected, expected);
+   }
+
+   protected void assertExpectedClasses(E environment, Class<?>... classes)
+   {
+      Set<String> expected = new HashSet<String>();
+      for(Class<?> clazz: classes)
+      {
+         addExpectedClass(expected, clazz);
+      }
+      assertExpectedClasses(environment, expected);
+   }
+
+   private void assertExpectedResources(E environment, Set<String> expected)
+   {
+      Collection<URL> weldXml = getResources(environment);
+      assertNotNull(weldXml);
+      assertTrue("Unexpected empty weld XML collection", expected.isEmpty() || !weldXml.isEmpty());
+      for (URL url : weldXml)
+      {
+         boolean found = false;
+         Iterator<String> iter = expected.iterator();
+         while (iter.hasNext())
+         {
+            String expectedURL = iter.next();
+            if (url.toExternalForm().endsWith(expectedURL))
+            {
+               iter.remove();
+               found = true;
+               break;
+            }
+         }
+         assertTrue("Unexpected wb url: " + url, found);
+      }
+      assertEmpty("Should be emtpy, missing " + expected, expected);
+   }
+
+   protected void assertExpectedResources(E environment, String... units)
+   {
+      Set<String> expected = new HashSet<String>();
+      for (String unit: units)
+      {
+         addExpectedResource(expected, unit);
+      }
+      assertExpectedResources(environment, expected);
+   }
+
+   protected void assertExpectedWarResources(E environment, String warUnit, boolean warResourceExpected, String... units)
+   {
+      Set<String> expected = new HashSet<String>();
+      if (warResourceExpected)
+         addExpectedResource(expected, warUnit, "/WEB-INF/beans.xml");
+      for (String unit: units)
+      {
+         addExpectedResource(expected, warUnit, "/WEB-INF/lib/" + unit + "/META-INF/beans.xml");
+      }
+      assertExpectedResources(environment, expected);
+   }
+
+   // TODO extract these methods for Deployment.loadBeanDeploymentArchive tests
+   private JavaArchive createEjbJar(boolean jarCDI)
+   {
+      return createEjbJar(EJB_JAR_NAME, jarCDI, PlainJavaBean.class);
+   }
+   
+   private JavaArchive createEjbJar(String jarName, boolean jarCDI, Class<?>... classes)
+   {
+      JavaArchive ejbJar = ShrinkWrap.create(jarName, JavaArchive.class);
+      for (Class<?> clazz: classes)
+      {
+         ejbJar.addClass(clazz);
+      }
+      MockArchiveManifest.addManifest(ejbJar, jarCDI);
+      return ejbJar;
+   }
+
+   private WebArchive createWar(boolean warCDI)
+   {
+      return createWar(WAR_NAME, warCDI, ServletWebBean.class);
+   }
+
+   private WebArchive createWar(String warName, boolean warCDI, Class<?>... classes)
+   {
+      WebArchive war = ShrinkWrap.create(warName, WebArchive.class);
+      for (Class<?> clazz: classes)
+      {
+         war.addClass(clazz);
+      }
+      MockArchiveManifest.addManifest(war, warCDI);
+      return war;
+   }
+
+   private WebArchive createWarWithLib(boolean warCDI, boolean libCDI)
+   {
+      WebArchive war = createWar(warCDI);
+      createLib(war, "lib.jar", libCDI, UIWebBean.class);
+      return war;
+   }
+
+   private WebArchive createWarWithLibs(boolean warCDI, boolean lib1CDI, boolean lib2CDI)
+   {
+      WebArchive war = createWar(warCDI);
+      createLib(war, "lib1.jar", lib1CDI, UIWebBean.class);
+      createLib(war, "lib2.jar", lib2CDI, CrmWebBean.class);
+      return war;
+   }
+
+   private void createLib(LibraryContainer<?> archive, String libName, boolean cdi, Class<?>... classes)
+   {
+      JavaArchive lib = ShrinkWrap.create(libName, JavaArchive.class);
+      if (cdi)
+      {
+         MockArchiveManifest.addCDIManifest(lib);
+      }
+      for (Class<?> libClass: classes)
+      {
+         lib.addClass(libClass);
+      }
+      archive.addLibrary(lib);
+   }
+
+   /**
+    * Asserts that there is only one environment resultant from the deployment.
+    * 
+    * @param name the name of the environment
+    * @return     the environment
+    */
+   protected abstract E assertSingleEnvironment(String name);
+   
+   /**
+    * Asserts that there is no environment resultant from the deployment.
+    */
+   protected abstract void assertEmptyEnvironment();
+
+   /**
+    * Returns the classes recorded in the environment.
+    * 
+    * @param environment the environment
+    * @return the list of classes that have been found in the environment
+    */
+   protected abstract Collection<Class<?>> getClasses(E environment);
+
+   /**
+    * Returns the Weld XML resources recorded in the environment.
+    * 
+    * @param environment the environment
+    * @return the list of URLs pointing to the Weld XML files that have been found in the
+    *         environment
+    */
+   protected abstract Collection<URL> getResources(E environment);
+}


Property changes on: projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/java/org/jboss/test/deployers/test/AbstractEnvironmentTest.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/java/org/jboss/test/deployers/test/ArchiveDiscoveryDeploymentTestCase.java
===================================================================
--- projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/java/org/jboss/test/deployers/test/ArchiveDiscoveryDeploymentTestCase.java	2010-07-12 07:49:14 UTC (rev 106574)
+++ projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/java/org/jboss/test/deployers/test/ArchiveDiscoveryDeploymentTestCase.java	2010-07-12 08:14:45 UTC (rev 106575)
@@ -1,789 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.deployers.test;
-
-import java.net.URL;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import junit.framework.Test;
-
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.container.LibraryContainer;
-import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.test.deployers.support.MockArchiveManifest;
-import org.jboss.test.deployers.support.crm.CrmWebBean;
-import org.jboss.test.deployers.support.ejb.BusinessInterface;
-import org.jboss.test.deployers.support.ejb.MySLSBean;
-import org.jboss.test.deployers.support.ext.ExternalWebBean;
-import org.jboss.test.deployers.support.jar.PlainJavaBean;
-import org.jboss.test.deployers.support.jsf.NotWBJsfBean;
-import org.jboss.test.deployers.support.ui.UIWebBean;
-import org.jboss.test.deployers.support.util.SomeUtil;
-import org.jboss.test.deployers.support.web.ServletWebBean;
-import org.jboss.vfs.VirtualFile;
-import org.jboss.weld.integration.deployer.env.WeldDiscoveryEnvironment;
-import org.jboss.weld.integration.deployer.env.bda.ArchiveInfo;
-import org.jboss.wsf.spi.metadata.j2ee.SLSBMetaData;
-
-/**
- * ArchiveInfo environment discovery test case.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- * @author <a href="mailto:flavia.rainone at jboss.com">Flavia Rainone</a>
- */
-public class ArchiveDiscoveryDeploymentTestCase extends AbstractWeldTest
-{
-   public ArchiveDiscoveryDeploymentTestCase(String name)
-   {
-      super(name);
-   }
-
-   public static Test suite()
-   {
-      return suite(ArchiveDiscoveryDeploymentTestCase.class);
-   }
-
-   private DeploymentUnit unit;
-   
-   public void tearDown() throws Exception
-   {
-      undeploy(unit);
-      super.tearDown();
-   }
-   
-   public void testEjbJar() throws Exception
-   {
-      JavaArchive ejbJar = createEjbJar(true);
-      unit = assertDeploy(ejbJar);
-
-      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery, PlainJavaBean.class);
-      assertExpectedResources(discovery, unit.getSimpleName());
-   }
-
-   public void testEjbJarWithoutXml() throws Exception
-   {
-      JavaArchive ejbJar = createEjbJar(false);
-      unit = assertDeploy(ejbJar);
-      
-      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery);
-      assertExpectedResources(discovery);
-   }
-
-   public void testEjbJarInEar() throws Exception
-   {
-      EnterpriseArchive ear = ShrinkWrap.create("simple.ear", EnterpriseArchive.class);
-      JavaArchive ejbJar = createEjbJar(true);
-      ear.addModule(ejbJar);
-      MockArchiveManifest.addManifest(ear);
-      unit = assertDeploy(ear);
-      
-      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery, PlainJavaBean.class);
-      assertExpectedResources(discovery, unit.getSimpleName() + "/ejb.jar");
-      
-      assertSingleChildAsUnit("ejb.jar");
-      assertNoArchiveInfo(unit);
-   }
-
-   public void testEjbJarWithoutXmlInEar() throws Exception
-   {
-      EnterpriseArchive ear = ShrinkWrap.create("simple.ear", EnterpriseArchive.class);
-      JavaArchive ejbJar = createEjbJar(false);
-      ear.addModule(ejbJar);
-      MockArchiveManifest.addManifest(ear);
-      unit = assertDeploy(ear);
-      
-      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery);
-      assertExpectedResources(discovery);
-      
-      assertSingleChildAsUnit("ejb.jar");
-      assertNoArchiveInfo(unit);
-   }
-   
-   public void testEjbJarsInEar() throws Exception
-   {
-      EnterpriseArchive ear = ShrinkWrap.create("simple.ear", EnterpriseArchive.class);
-      JavaArchive ejbJar1 = createEjbJar("ejbJar1.jar", true, PlainJavaBean.class);
-      ear.addModule(ejbJar1);
-      JavaArchive ejbJar2 = createEjbJar("ejbJar2.jar", true, MySLSBean.class, SLSBMetaData.class);
-      ear.addModule(ejbJar2);
-      MockArchiveManifest.addManifest(ear);
-      unit = assertDeploy(ear);
-      
-      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery, PlainJavaBean.class, MySLSBean.class,
-               SLSBMetaData.class);
-      assertExpectedResources(discovery, "simple.ear/ejbJar1.jar", "simple.ear/ejbJar2.jar");
-      
-      assertEquals(2, unit.getChildren().size());
-      for (DeploymentUnit childUnit: unit.getChildren())
-      {
-         assertNoArchiveInfo(childUnit);
-      }
-   }
-
-   public void testMixedEjbJarsInEar() throws Exception
-   {
-      EnterpriseArchive ear = ShrinkWrap.create("simple.ear", EnterpriseArchive.class);
-      JavaArchive ejbJar1 = createEjbJar("ejbJar1.jar", false, PlainJavaBean.class);
-      ear.addModule(ejbJar1);
-      JavaArchive ejbJar2 = createEjbJar("ejbJar2.jar", true, MySLSBean.class, SLSBMetaData.class);
-      ear.addModule(ejbJar2);
-      MockArchiveManifest.addManifest(ear);
-      unit = assertDeploy(ear);
-      
-      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery, MySLSBean.class, SLSBMetaData.class);
-      assertExpectedResources(discovery, "simple.ear/ejbJar2.jar");
-      
-      assertEquals(2, unit.getChildren().size());
-      for (DeploymentUnit childUnit: unit.getChildren())
-      {
-         assertNoArchiveInfo(childUnit);
-      }
-   }
-
-   public void testEjbJarsWithoutXmlInEar() throws Exception
-   {
-      EnterpriseArchive ear = ShrinkWrap.create("simple.ear", EnterpriseArchive.class);
-      JavaArchive ejbJar1 = createEjbJar("ejbJar1.jar", false, PlainJavaBean.class);
-      ear.addModule(ejbJar1);
-      JavaArchive ejbJar2 = createEjbJar("ejbJar2.jar", false, MySLSBean.class, SLSBMetaData.class);
-      ear.addModule(ejbJar2);
-      MockArchiveManifest.addManifest(ear);
-      unit = assertDeploy(ear);
-      
-      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery);
-      assertExpectedResources(discovery);
-      
-      assertEquals(2, unit.getChildren().size());
-      for (DeploymentUnit childUnit: unit.getChildren())
-      {
-         assertNoArchiveInfo(childUnit);
-      }
-   }
-   
-   public void testWar() throws Exception
-   {
-      WebArchive war = createWar(true);
-      unit = assertDeploy(war);
-      
-      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery, ServletWebBean.class);
-      assertExpectedWarResources(discovery, unit.getSimpleName(), true);
-   }
-   
-   public void testWarWithLib() throws Exception
-   {
-      WebArchive war = createWarWithLib(true, true);
-      unit = assertDeploy(war);
-      
-      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery, ServletWebBean.class, UIWebBean.class);
-      assertExpectedWarResources(discovery, unit.getSimpleName(), true, "lib.jar");
-   }
-
-   public void testWarWithLibs() throws Exception
-   {
-      WebArchive war = createWarWithLibs(true, true, true);
-      unit = assertDeploy(war);
-      
-      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery, ServletWebBean.class, UIWebBean.class, CrmWebBean.class);
-      assertExpectedWarResources(discovery, unit.getSimpleName(), true, "lib1.jar", "lib2.jar");
-   }
-
-   public void testWarWithLibWithoutXml() throws Exception
-   {
-      WebArchive war = createWarWithLib(true, false);
-      unit = assertDeploy(war);
-      
-      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery, ServletWebBean.class);
-      assertExpectedWarResources(discovery, unit.getSimpleName(), true);
-   }
-
-   public void testWarWithLibsWithoutXml() throws Exception
-   {
-      WebArchive war = createWarWithLibs(true, false, false);
-      unit = assertDeploy(war);
-      
-      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery, ServletWebBean.class);
-      assertExpectedWarResources(discovery, unit.getSimpleName(), true);
-   }
-
-   public void testWarWithMixedLibs() throws Exception
-   {
-      WebArchive war = createWarWithLibs(true, true, false);
-      unit = assertDeploy(war);
-      
-      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery, ServletWebBean.class, UIWebBean.class);
-      assertExpectedWarResources(discovery, unit.getSimpleName(), true, "lib1.jar");
-   }
-
-   public void testWarWithoutXmlWithLib() throws Exception
-   {
-      WebArchive war = createWarWithLib(false, true);
-      unit = assertDeploy(war);
-      
-      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery, UIWebBean.class);
-      assertExpectedWarResources(discovery, unit.getSimpleName(), false, "lib.jar");
-   }
-
-   public void testWarWithoutXmlWithLibs() throws Exception
-   {
-      WebArchive war = createWarWithLibs(false, true, true);
-      unit = assertDeploy(war);
-      
-      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery, UIWebBean.class, CrmWebBean.class);
-      assertExpectedWarResources(discovery, unit.getSimpleName(), false, "lib1.jar", "lib2.jar");
-   }
-
-   public void testWarWithoutXmlWithLibWithoutXml() throws Exception
-   {
-      WebArchive war = createWarWithLib(false, false);
-      unit = assertDeploy(war);
-      
-      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery);
-      assertExpectedResources(discovery);
-   }
-
-   public void testWarWithoutXmlWithMixedLibs() throws Exception
-   {
-      WebArchive war = createWarWithLibs(false, true, false);
-      unit = assertDeploy(war);
-      
-      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery, UIWebBean.class);
-      assertExpectedWarResources(discovery, unit.getSimpleName(), false, "lib1.jar");
-   }
-
-   public void testWarWithoutXmlWithLibsWithoutXml() throws Exception
-   {
-      WebArchive war = createWarWithLibs(false, false, false);
-      unit = assertDeploy(war);
-      
-      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery);
-      assertExpectedResources(discovery);
-   }
-
-   public void testWarWithoutXml() throws Exception
-   {
-      WebArchive war = createWar(false);
-      unit = assertDeploy(war);
-      
-      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery);
-      assertExpectedResources(discovery);
-   }
-   
-   public void testWarInEar() throws Exception
-   {
-      EnterpriseArchive ear = ShrinkWrap.create("warinear.ear", EnterpriseArchive.class);
-      WebArchive war = createWar(true);
-      ear.addModule(war);
-      MockArchiveManifest.addManifest(ear);
-      unit = assertDeploy(ear);
-      
-      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery);
-      assertExpectedResources(discovery);
-      
-      assertSingleChildAsUnit("simple.war");
-      discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery, ServletWebBean.class);
-      assertExpectedWarResources(discovery, "simple.war", true);
-   }
-
-   public void testWarsInEar() throws Exception
-   {
-      EnterpriseArchive ear = ShrinkWrap.create("warinear.ear", EnterpriseArchive.class);
-      WebArchive war = createWar("simple1.war", true, ServletWebBean.class);
-      ear.addModule(war);
-      war = createWar("simple2.war", true, NotWBJsfBean.class);
-      ear.addModule(war);
-      MockArchiveManifest.addManifest(ear);
-      unit = assertDeploy(ear);
-      
-      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery);
-      assertExpectedResources(discovery);
-      
-      for (DeploymentUnit childUnit: unit.getChildren())
-      {
-         unit = childUnit;
-         if (unit.getSimpleName().equals("simple1.war"))
-         {
-            discovery = assertDiscoveryEnvironment();
-            assertExpectedClasses(discovery, ServletWebBean.class);
-            assertExpectedWarResources(discovery, "simple1.war", true);
-         }
-         else if (unit.getSimpleName().equals("simple2.war"))
-         {
-            discovery = assertDiscoveryEnvironment();
-            assertExpectedClasses(discovery, NotWBJsfBean.class);
-            assertExpectedWarResources(discovery, "simple2.war", true);
-         }
-         else
-         {
-            fail("Unexpected childUnit: " + unit.getSimpleName());
-         }
-      }
-   }
-
-   public void testMixedWarsInEar() throws Exception
-   {
-      EnterpriseArchive ear = ShrinkWrap.create("warinear.ear", EnterpriseArchive.class);
-      WebArchive war = createWar("simple1.war", true, ServletWebBean.class);
-      ear.addModule(war);
-      war = createWar("simple2.war", false, NotWBJsfBean.class);
-      ear.addModule(war);
-      MockArchiveManifest.addManifest(ear);
-      unit = assertDeploy(ear);
-      
-      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery);
-      assertExpectedResources(discovery);
-      
-      for (DeploymentUnit childUnit: unit.getChildren())
-      {
-         unit = childUnit;
-         if (unit.getSimpleName().equals("simple1.war"))
-         {
-            discovery = assertDiscoveryEnvironment();
-            assertExpectedClasses(discovery, ServletWebBean.class);
-            assertExpectedWarResources(discovery, "simple1.war", true);
-         }
-         else if (unit.getSimpleName().equals("simple2.war"))
-         {
-            discovery = assertDiscoveryEnvironment();
-            assertExpectedClasses(discovery);
-            assertExpectedResources(discovery);
-         }
-         else
-         {
-            fail("Unexpected childUnit: " + unit.getSimpleName());
-         }
-      }
-   }
-   
-   public void testWarsWithoutXmlInEar() throws Exception
-   {
-      EnterpriseArchive ear = ShrinkWrap.create("warinear.ear", EnterpriseArchive.class);
-      WebArchive war = createWar("simple1.war", false, ServletWebBean.class);
-      ear.addModule(war);
-      war = createWar("simple2.war", false, NotWBJsfBean.class);
-      ear.addModule(war);
-      MockArchiveManifest.addManifest(ear);
-      unit = assertDeploy(ear);
-      
-      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery);
-      assertExpectedResources(discovery);
-      
-      for (DeploymentUnit childUnit: unit.getChildren())
-      {
-         unit = childUnit;
-         assertTrue("Unexpected childUnit: " + unit.getSimpleName(), 
-                  unit.getSimpleName().equals("simple1.war") ||
-                  unit.getSimpleName().equals("simple2.war"));
-         discovery = assertDiscoveryEnvironment();
-         assertExpectedClasses(discovery);
-         assertExpectedResources(discovery);
-      }
-   }
-
-   public void testWarWithLibInEar() throws Exception
-   {
-      EnterpriseArchive ear = ShrinkWrap.create("warinear.ear", EnterpriseArchive.class);
-      WebArchive war = createWarWithLib(true, true);
-      ear.addModule(war);
-      MockArchiveManifest.addManifest(ear);
-      unit = assertDeploy(ear);
-      
-      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery);
-      assertExpectedResources(discovery);
-      
-      assertSingleChildAsUnit("simple.war");
-      discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery, ServletWebBean.class, UIWebBean.class);
-      assertExpectedWarResources(discovery, "simple.war", true, "lib.jar");
-   }
-
-   public void testWarWithLibWithoutXmlInEar() throws Exception
-   {
-      EnterpriseArchive ear = ShrinkWrap.create("warinear.ear", EnterpriseArchive.class);
-      WebArchive war = createWarWithLib(true, false);
-      ear.addModule(war);
-      MockArchiveManifest.addManifest(ear);
-      unit = assertDeploy(ear);
-      
-      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery);
-      assertExpectedResources(discovery);
-      
-      assertSingleChildAsUnit("simple.war");
-      discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery, ServletWebBean.class);
-      assertExpectedWarResources(discovery, "simple.war", true);
-   }
-
-   public void testWarWithoutXmlWithLibWithoutXmlInEar() throws Exception
-   {
-      EnterpriseArchive ear = ShrinkWrap.create("warinear.ear", EnterpriseArchive.class);
-      WebArchive war = createWarWithLib(false, false);
-      ear.addModule(war);
-      MockArchiveManifest.addManifest(ear);
-      unit = assertDeploy(ear);
-      
-      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery);
-      assertExpectedResources(discovery);
-      
-      assertSingleChildAsUnit("simple.war");
-      discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery);
-      assertExpectedResources(discovery);
-   }
-
-   public void testWarWithoutXmlWithLibInEar() throws Exception
-   {
-      EnterpriseArchive ear = ShrinkWrap.create("warinear.ear", EnterpriseArchive.class);
-      WebArchive war = createWarWithLib(false, true);
-      ear.addModule(war);
-      MockArchiveManifest.addManifest(ear);
-      unit = assertDeploy(ear);
-      
-      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery);
-      assertExpectedResources(discovery);
-      
-      assertSingleChildAsUnit("simple.war");
-      discovery = assertDiscoveryEnvironment();
-      assertExpectedClasses(discovery, UIWebBean.class);
-      assertExpectedWarResources(discovery, "simple.war", false, "lib.jar");
-   }
-
-   public void testBasicEar() throws Exception
-   {
-      VirtualFile ear = createBasicEar();
-      unit = assertDeploy(ear);
-      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
-      
-      assertExpectedClasses(discovery, BusinessInterface.class, MySLSBean.class,
-               ExternalWebBean.class, PlainJavaBean.class);
-      assertExpectedResources(discovery, "ejbs.jar", "ext.jar", "simple.jar");
-
-      for (DeploymentUnit childUnit: unit.getChildren())
-      {
-         unit = childUnit;
-         if (childUnit.getName().endsWith("simple.war/"))
-         {
-            discovery = assertDiscoveryEnvironment();
-            assertExpectedClasses(discovery, UIWebBean.class, ServletWebBean.class);
-            assertExpectedWarResources(discovery, "simple.war", true, "ui.jar");
-         }
-         else if (childUnit.getName().endsWith("crm.war/"))
-         {
-            discovery = assertDiscoveryEnvironment();
-            assertExpectedClasses(discovery, CrmWebBean.class);
-            assertExpectedResources(discovery, "crm.jar");
-         }
-         else
-         {
-            ArchiveInfo archiveInfo = childUnit.getAttachment(ArchiveInfo.class);
-            assertNull("Unit " + unit.getName() +  " contains a not null ArchiveInfo", archiveInfo);
-         }
-      }
-   }
-   
-   public void testBasicEarFullCDI() throws Exception
-   {
-      EnterpriseArchive ear = ShrinkWrap.create("simple.ear", EnterpriseArchive.class);
-      createLib(ear, "util.jar", true, SomeUtil.class);
-      createLib(ear, "ext.jar", true, ExternalWebBean.class);
-      JavaArchive ejbJar = createEjbJar("simple.jar", true, PlainJavaBean.class);
-      ear.addModule(ejbJar);
-      ejbJar = createEjbJar("ejbs.jar", true, MySLSBean.class, BusinessInterface.class);
-      ear.addModule(ejbJar);
-      WebArchive war = createWar("simple.war", true, ServletWebBean.class);
-      createLib(war, "ui.jar", true, UIWebBean.class);
-      ear.addModule(war);
-      war = createWar("crm.war", true, NotWBJsfBean.class);
-      createLib(war, "crm.jar", true, CrmWebBean.class);
-      ear.addModule(war);
-      unit = assertDeploy(ear);
-      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
-      
-      assertExpectedClasses(discovery, BusinessInterface.class, MySLSBean.class,
-               ExternalWebBean.class, PlainJavaBean.class, SomeUtil.class);
-      assertExpectedResources(discovery, "util.jar", "ext.jar", "simple.jar", "ejbs.jar");
-
-      for (DeploymentUnit childUnit: unit.getChildren())
-      {
-         unit = childUnit;
-         if (childUnit.getName().endsWith("simple.war/"))
-         {
-            discovery = assertDiscoveryEnvironment();
-            assertExpectedClasses(discovery, UIWebBean.class, ServletWebBean.class);
-            assertExpectedWarResources(discovery, "simple.war", true, "ui.jar");
-         }
-         else if (childUnit.getName().endsWith("crm.war/"))
-         {
-            discovery = assertDiscoveryEnvironment();
-            assertExpectedClasses(discovery, CrmWebBean.class, NotWBJsfBean.class);
-            assertExpectedWarResources(discovery, "simple.ear/crm.war", true, "crm.jar");
-         }
-         else
-         {
-            ArchiveInfo archiveInfo = childUnit.getAttachment(ArchiveInfo.class);
-            assertNull("Unit " + unit.getName() +  " contains a not null ArchiveInfo", archiveInfo);
-         }
-      }
-   }
-   
-   public void testBasicEarWithoutXml() throws Exception
-   {
-      EnterpriseArchive ear = ShrinkWrap.create("simple.ear", EnterpriseArchive.class);
-      createLib(ear, "util.jar", false, SomeUtil.class);
-      createLib(ear, "ext.jar", false, ExternalWebBean.class);
-      JavaArchive ejbJar = createEjbJar("simple.jar", false, PlainJavaBean.class);
-      ear.addModule(ejbJar);
-      ejbJar = createEjbJar("ejbs.jar", false, MySLSBean.class, BusinessInterface.class);
-      ear.addModule(ejbJar);
-      WebArchive war = createWar("simple.war", false, ServletWebBean.class);
-      createLib(war, "ui.jar", false, UIWebBean.class);
-      ear.addModule(war);
-      war = createWar("crm.war", false, NotWBJsfBean.class);
-      createLib(war, "crm.jar", false, CrmWebBean.class);
-      ear.addModule(war);
-      unit = assertDeploy(ear);
-      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
-      
-      assertExpectedClasses(discovery);
-      assertExpectedResources(discovery);
-
-      for (DeploymentUnit childUnit: unit.getChildren())
-      {
-         if (childUnit.getName().endsWith("simple.war/") ||
-                  childUnit.getName().endsWith("crm.war/"))
-         {
-            unit = childUnit;
-            discovery = assertDiscoveryEnvironment();
-            assertExpectedClasses(discovery);
-            assertExpectedResources(discovery);
-         }
-         else
-         {
-            ArchiveInfo archiveInfo = childUnit.getAttachment(ArchiveInfo.class);
-            assertNull("Unit " + unit.getName() +  " contains a not null ArchiveInfo", archiveInfo);
-         }
-      }
-   }
-   
-   
-   // TODO
-   // Several of these methods will be reused by other test classes and will be
-   // extracted to a common superclass once done
-   private void assertNoArchiveInfo(DeploymentUnit unit)
-   {
-      assertNull(unit.getAttachment(ArchiveInfo.class));
-   }
-
-   private WeldDiscoveryEnvironment assertDiscoveryEnvironment()
-   {
-      ArchiveInfo archiveInfo = unit.getAttachment(ArchiveInfo.class);
-      assertNotNull(archiveInfo);
-      WeldDiscoveryEnvironment discovery = archiveInfo.getEnvironment();
-      assertNotNull(discovery);
-      return discovery;
-   }
-
-   private static void addExpectedResource(Set<String> expected, String unit)
-   {
-      addExpectedResource(expected, unit, "/META-INF/beans.xml");
-   }
-
-   private static void addExpectedResource(Set<String> expected, String unit, String suffix)
-   {
-      expected.add(unit + suffix);
-   }
-
-   private static void addExpectedClass(Set<String> expected, Class<?> clazz)
-   {
-      expected.add(clazz.getName());
-   }
-   
-   private void assertExpectedClasses(WeldDiscoveryEnvironment discoveryEnvironment, Set<String> expected)
-   {
-      Collection<Class<?>> weldClasses = discoveryEnvironment.getWeldClasses();
-      assertNotNull(weldClasses);
-      assertTrue("Unexpected empty weld classes collection", expected.isEmpty() || !weldClasses.isEmpty());
-      for (Class<?> clazz : weldClasses)
-      {
-         assertTrue("Found unexpected class: " + clazz.getName(), expected.remove(clazz.getName()));
-      }
-      assertEmpty("Should be emtpy, missing " + expected, expected);
-   }
-   
-   private void assertExpectedClasses(WeldDiscoveryEnvironment discoveryEnvironment, Class<?>... classes)
-   {
-      Set<String> expected = new HashSet<String>();
-      for(Class<?> clazz: classes)
-      {
-         addExpectedClass(expected, clazz);
-      }
-      assertExpectedClasses(discoveryEnvironment, expected);
-   }
-   
-   private void assertExpectedResources(WeldDiscoveryEnvironment discoveryEnvironment, Set<String> expected)
-   {
-      Collection<URL> weldXml = discoveryEnvironment.getWeldXml();
-      assertNotNull(weldXml);
-      assertTrue("Unexpected empty weld XML collection", expected.isEmpty() || !weldXml.isEmpty());
-      for (URL url : weldXml)
-      {
-         boolean found = false;
-         Iterator<String> iter = expected.iterator();
-         while (iter.hasNext())
-         {
-            String expectedURL = iter.next();
-            if (url.toExternalForm().endsWith(expectedURL))
-            {
-               iter.remove();
-               found = true;
-               break;
-            }
-         }
-         assertTrue("Unexpected wb url: " + url, found);
-      }
-      assertEmpty("Should be emtpy, missing " + expected, expected);
-   }
-   
-   public void assertExpectedResources(WeldDiscoveryEnvironment discoveryEnvironment, String... units)
-   {
-      Set<String> expected = new HashSet<String>();
-      for (String unit: units)
-      {
-         addExpectedResource(expected, unit);
-      }
-      assertExpectedResources(discoveryEnvironment, expected);
-   }
-   
-   public void assertExpectedWarResources(WeldDiscoveryEnvironment discoveryEnvironment, String warUnit, boolean warResourceExpected, String... units)
-   {
-      Set<String> expected = new HashSet<String>();
-      if (warResourceExpected)
-         addExpectedResource(expected, warUnit, "/WEB-INF/beans.xml");
-      for (String unit: units)
-      {
-         addExpectedResource(expected, warUnit, "/WEB-INF/lib/" + unit + "/META-INF/beans.xml");
-      }
-      assertExpectedResources(discoveryEnvironment, expected);
-   }
-   
-   private JavaArchive createEjbJar(boolean jarCDI)
-   {
-      return createEjbJar("ejb.jar", jarCDI, PlainJavaBean.class);
-   }
-   
-   private JavaArchive createEjbJar(String jarName, boolean jarCDI, Class<?>... classes)
-   {
-      JavaArchive ejbJar = ShrinkWrap.create(jarName, JavaArchive.class);
-      for (Class<?> clazz: classes)
-      {
-         ejbJar.addClass(clazz);
-      }
-      MockArchiveManifest.addManifest(ejbJar, jarCDI);
-      return ejbJar;
-   }
-
-   private WebArchive createWar(boolean warCDI)
-   {
-      return createWar("simple.war", warCDI, ServletWebBean.class);
-   }
-   
-   private WebArchive createWar(String warName, boolean warCDI, Class<?>... classes)
-   {
-      WebArchive war = ShrinkWrap.create(warName, WebArchive.class);
-      for (Class<?> clazz: classes)
-      {
-         war.addClass(clazz);
-      }
-      MockArchiveManifest.addManifest(war, warCDI);
-      return war;
-   }
-   
-   private WebArchive createWarWithLib(boolean warCDI, boolean libCDI)
-   {
-      WebArchive war = createWar(warCDI);
-      createLib(war, "lib.jar", libCDI, UIWebBean.class);
-      return war;
-   }
-   
-   private WebArchive createWarWithLibs(boolean warCDI, boolean lib1CDI, boolean lib2CDI)
-   {
-      WebArchive war = createWar(warCDI);
-      createLib(war, "lib1.jar", lib1CDI, UIWebBean.class);
-      createLib(war, "lib2.jar", lib2CDI, CrmWebBean.class);
-      return war;
-   }
-
-   
-   private void createLib(LibraryContainer<?> archive, String libName, boolean cdi, Class<?>... classes)
-   {
-      JavaArchive lib = ShrinkWrap.create(libName, JavaArchive.class);
-      if (cdi)
-      {
-         MockArchiveManifest.addCDIManifest(lib);
-      }
-      for (Class<?> libClass: classes)
-      {
-         lib.addClass(libClass);
-      }
-      archive.addLibrary(lib);
-   }
-   
-   private void assertSingleChildAsUnit(String name)
-   {
-      assertEquals(1, unit.getChildren().size());
-      unit = unit.getChildren().iterator().next();//FIXME
-      assertEquals(unit.getSimpleName(), name);
-   }
-}

Copied: projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/java/org/jboss/test/deployers/test/ArchiveEnvironmentTestCase.java (from rev 106439, projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/java/org/jboss/test/deployers/test/ArchiveDiscoveryDeploymentTestCase.java)
===================================================================
--- projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/java/org/jboss/test/deployers/test/ArchiveEnvironmentTestCase.java	                        (rev 0)
+++ projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/java/org/jboss/test/deployers/test/ArchiveEnvironmentTestCase.java	2010-07-12 08:14:45 UTC (rev 106575)
@@ -0,0 +1,274 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.deployers.test;
+
+import java.net.URL;
+import java.util.Collection;
+
+import junit.framework.Test;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.test.deployers.support.crm.CrmWebBean;
+import org.jboss.test.deployers.support.ejb.BusinessInterface;
+import org.jboss.test.deployers.support.ejb.MySLSBean;
+import org.jboss.test.deployers.support.ext.ExternalWebBean;
+import org.jboss.test.deployers.support.jar.PlainJavaBean;
+import org.jboss.test.deployers.support.jsf.NotWBJsfBean;
+import org.jboss.test.deployers.support.ui.UIWebBean;
+import org.jboss.test.deployers.support.util.SomeUtil;
+import org.jboss.test.deployers.support.web.ServletWebBean;
+import org.jboss.util.UnreachableStatementException;
+import org.jboss.weld.integration.deployer.env.WeldDiscoveryEnvironment;
+import org.jboss.weld.integration.deployer.env.bda.ArchiveInfo;
+
+/**
+ * ArchiveInfo environment discovery test case.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ * @author <a href="mailto:flavia.rainone at jboss.com">Flavia Rainone</a>
+ */
+public class ArchiveEnvironmentTestCase extends AbstractEnvironmentTest<WeldDiscoveryEnvironment>
+{
+   public ArchiveEnvironmentTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static Test suite()
+   {
+      return suite(ArchiveEnvironmentTestCase.class);
+   }
+
+   @Override
+   public void testEjbJarInEar() throws Exception
+   {
+      super.testEjbJarInEar();
+
+      assertSingleChildAsUnit(EJB_JAR_NAME);
+      assertNoArchiveInfo(unit);
+   }
+
+   @Override
+   public void testEjbJarWithoutXmlInEar() throws Exception
+   {
+      super.testEjbJarWithoutXmlInEar();
+
+      assertSingleChildAsUnit(EJB_JAR_NAME);
+      assertNoArchiveInfo(unit);
+   }
+
+   @Override
+   protected void assertWarsInEar()
+   {
+      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
+      assertExpectedClasses(discovery);
+      assertExpectedResources(discovery);
+      
+      for (DeploymentUnit childUnit: unit.getChildren())
+      {
+         unit = childUnit;
+         if (unit.getSimpleName().equals("simple1.war"))
+         {
+            discovery = assertDiscoveryEnvironment();
+            assertExpectedClasses(discovery, ServletWebBean.class);
+            assertExpectedWarResources(discovery, "warinear.ear/simple1.war", true);
+         }
+         else if (unit.getSimpleName().equals("simple2.war"))
+         {
+            discovery = assertDiscoveryEnvironment();
+            assertExpectedClasses(discovery, NotWBJsfBean.class);
+            assertExpectedWarResources(discovery, "warinear.ear/simple2.war", true);
+         }
+         else
+         {
+            fail("Unexpected childUnit: " + unit.getSimpleName());
+         }
+      }
+   }
+
+   @Override
+   protected void assertBasicEar()
+   {
+      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
+      assertExpectedClasses(discovery, BusinessInterface.class, MySLSBean.class,
+               ExternalWebBean.class, PlainJavaBean.class);
+      assertExpectedResources(discovery, "top-level.ear/ejbs.jar",
+               "top-level.ear/lib/ext.jar", "top-level.ear/simple.jar");
+
+      for (DeploymentUnit childUnit: unit.getChildren())
+      {
+         unit = childUnit;
+         if (childUnit.getName().endsWith("simple.war/"))
+         {
+            discovery = assertDiscoveryEnvironment();
+            assertExpectedClasses(discovery, UIWebBean.class, ServletWebBean.class);
+            assertExpectedWarResources(discovery, "top-level.ear/simple.war", true, "ui.jar");
+         }
+         else if (childUnit.getName().endsWith("crm.war/"))
+         {
+            discovery = assertDiscoveryEnvironment();
+            assertExpectedClasses(discovery, CrmWebBean.class);
+            assertExpectedWarResources(discovery, "top-level.ear/crm.war", false, "crm.jar");
+         }
+         else
+         {
+            ArchiveInfo archiveInfo = childUnit.getAttachment(ArchiveInfo.class);
+            assertNull("Unit " + unit.getName() +  " contains a not null ArchiveInfo", archiveInfo);
+         }
+      }
+   }
+
+   @Override
+   protected void assertBasicEarFullCDI()
+   {
+      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
+      assertExpectedClasses(discovery, BusinessInterface.class, MySLSBean.class,
+               ExternalWebBean.class, PlainJavaBean.class, SomeUtil.class);
+      assertExpectedResources(discovery, "top-level.ear/lib/util.jar",
+               "top-level.ear/lib/ext.jar", "top-level.ear/simple.jar",
+               "top-level.ear/ejbs.jar");
+
+      for (DeploymentUnit childUnit: unit.getChildren())
+      {
+         unit = childUnit;
+         if (childUnit.getName().endsWith("simple.war/"))
+         {
+            discovery = assertDiscoveryEnvironment();
+            assertExpectedClasses(discovery, UIWebBean.class, ServletWebBean.class);
+            assertExpectedWarResources(discovery, "top-level.ear/simple.war", true, "ui.jar");
+         }
+         else if (childUnit.getName().endsWith("crm.war/"))
+         {
+            discovery = assertDiscoveryEnvironment();
+            assertExpectedClasses(discovery, CrmWebBean.class, NotWBJsfBean.class);
+            assertExpectedWarResources(discovery, "top-level.ear/crm.war", true, "crm.jar");
+         }
+         else
+         {
+            ArchiveInfo archiveInfo = childUnit.getAttachment(ArchiveInfo.class);
+            assertNull("Unit " + unit.getName() +  " contains a not null ArchiveInfo", archiveInfo);
+         }
+      }
+   }
+
+   @Override
+   protected void assertBasicEarWithoutXml()
+   {
+      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
+      
+      assertExpectedClasses(discovery);
+      assertExpectedResources(discovery);
+
+      for (DeploymentUnit childUnit: unit.getChildren())
+      {
+         if (childUnit.getName().endsWith("simple.war/") ||
+                  childUnit.getName().endsWith("crm.war/"))
+         {
+            unit = childUnit;
+            discovery = assertDiscoveryEnvironment();
+            assertExpectedClasses(discovery);
+            assertExpectedResources(discovery);
+         }
+         else
+         {
+            ArchiveInfo archiveInfo = childUnit.getAttachment(ArchiveInfo.class);
+            assertNull("Unit " + unit.getName() +  " contains a not null ArchiveInfo", archiveInfo);
+         }
+      }
+   }
+
+   @Override
+   protected void assertEmptyEnvironment()
+   {
+      WeldDiscoveryEnvironment discovery = assertDiscoveryEnvironment();
+      assertExpectedClasses(discovery);
+      assertExpectedResources(discovery);
+   }
+
+   @Override
+   protected WeldDiscoveryEnvironment assertSingleEnvironment(String name)
+   {
+      if (unit.getName().contains(name))
+      {
+         return assertDiscoveryEnvironment(name);
+      }
+      for (DeploymentUnit childUnit : unit.getChildren())
+      {
+         if (childUnit.getName().contains(name))
+         {
+            return assertDiscoveryEnvironment(childUnit, name);
+         }
+      }
+      fail("Was not able to find a unit with suffix " + name);
+      throw new UnreachableStatementException();
+   }
+
+   @Override
+   protected Collection<Class<?>> getClasses(
+            WeldDiscoveryEnvironment environment)
+   {
+      return environment.getWeldClasses();
+   }
+
+   @Override
+   protected Collection<URL> getResources(WeldDiscoveryEnvironment environment)
+   {
+      return environment.getWeldXml();
+   }
+
+   private void assertSingleChildAsUnit(String name)
+   {
+      assertEquals(1, unit.getChildren().size());
+      unit = unit.getChildren().iterator().next();
+      assertEquals(unit.getSimpleName(), name);
+   }
+
+   private void assertNoArchiveInfo(DeploymentUnit unit)
+   {
+      assertNull(unit.getAttachment(ArchiveInfo.class));
+   }
+
+   private WeldDiscoveryEnvironment assertDiscoveryEnvironment(String name)
+   {
+      return assertDiscoveryEnvironment(unit, name);
+   }
+
+   private WeldDiscoveryEnvironment assertDiscoveryEnvironment(DeploymentUnit unit, String name)
+   {
+      ArchiveInfo archiveInfo = unit.getAttachment(ArchiveInfo.class);
+      assertNotNull(archiveInfo);
+      assertTrue("Unit name \"" + unit.getName() + "\" expected to end with \"" + name +
+               "\" suffix", unit.getName().endsWith(name + '/'));
+      WeldDiscoveryEnvironment discovery = archiveInfo.getEnvironment();
+      assertNotNull(discovery);
+      return discovery;
+   }
+
+   private WeldDiscoveryEnvironment assertDiscoveryEnvironment()
+   {
+      ArchiveInfo archiveInfo = unit.getAttachment(ArchiveInfo.class);
+      assertNotNull(archiveInfo);
+      WeldDiscoveryEnvironment discovery = archiveInfo.getEnvironment();
+      assertNotNull(discovery);
+      return discovery;
+   }
+}

Copied: projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/java/org/jboss/test/deployers/test/DeploymentEnvironmentTestCase.java (from rev 106573, projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/java/org/jboss/test/deployers/test/JBossDeploymentTestCase.java)
===================================================================
--- projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/java/org/jboss/test/deployers/test/DeploymentEnvironmentTestCase.java	                        (rev 0)
+++ projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/java/org/jboss/test/deployers/test/DeploymentEnvironmentTestCase.java	2010-07-12 08:14:45 UTC (rev 106575)
@@ -0,0 +1,272 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.deployers.test;
+
+import java.net.URL;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import junit.framework.Test;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.test.deployers.support.CheckableBootstrap;
+import org.jboss.test.deployers.support.MockEjbServices;
+import org.jboss.test.deployers.support.MockEmptyEjbServices;
+import org.jboss.test.deployers.support.MockTransactionServices;
+import org.jboss.test.deployers.support.MockWeldBootstrap;
+import org.jboss.test.deployers.support.WeldDEWrapper;
+import org.jboss.test.deployers.support.crm.CrmWebBean;
+import org.jboss.test.deployers.support.ejb.BusinessInterface;
+import org.jboss.test.deployers.support.ejb.MySLSBean;
+import org.jboss.test.deployers.support.ext.ExternalWebBean;
+import org.jboss.test.deployers.support.jar.PlainJavaBean;
+import org.jboss.test.deployers.support.jsf.NotWBJsfBean;
+import org.jboss.test.deployers.support.ui.UIWebBean;
+import org.jboss.test.deployers.support.util.SomeUtil;
+import org.jboss.test.deployers.support.web.ServletWebBean;
+import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
+import org.jboss.weld.bootstrap.spi.Deployment;
+
+/**
+ * JBossDeployment environment test case.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ * @author <a href="mailto:flavia.rainone at jboss.com">Flavia Rainone</a>
+ */
+public class DeploymentEnvironmentTestCase extends AbstractEnvironmentTest<BeanDeploymentArchive>
+{
+   public DeploymentEnvironmentTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static Test suite()
+   {
+      return suite(DeploymentEnvironmentTestCase.class);
+   }
+
+   public void setUp() throws Exception
+   {
+      super.setUp();
+      JavaArchive mockJar = ShrinkWrap.create("mock.jar", JavaArchive.class);
+      mockJar.addClass(CheckableBootstrap.class);
+      mockJar.addClass(MockEjbServices.class);
+      mockJar.addClass(MockEmptyEjbServices.class);
+      mockJar.addClass(MockTransactionServices.class);
+      mockJar.addClass(MockWeldBootstrap.class);
+      mockJar.addClass(WeldDEWrapper.class);
+      assertDeploy(mockJar);
+   }
+
+   @Override
+   protected void assertWarsInEar()
+   {
+      Deployment deployment = (Deployment) getBean(Deployment.class);
+      Collection<BeanDeploymentArchive> bdas = getBDAs(deployment);
+      assertEquals(2, bdas.size());
+      Iterator<BeanDeploymentArchive> iterator = bdas.iterator();
+      BeanDeploymentArchive bda = iterator.next();
+      BeanDeploymentArchive bda1, bda2;
+      if (bda.getId().contains("simple1.war"))
+      {
+         bda1 = bda;
+         bda2 = iterator.next();
+      }
+      else
+      {
+         bda2 = bda;
+         bda1 = iterator.next();
+      }
+      assertBDAId(bda1, "warinear.ear/simple1.war");
+      assertExpectedClasses(bda1, ServletWebBean.class);
+      assertExpectedWarResources(bda1, "simple1.war", true);
+
+      assertBDAId(bda2, "warinear.ear/simple2.war");
+      assertExpectedClasses(bda2, NotWBJsfBean.class);
+      assertExpectedWarResources(bda2, "simple2.war", true);
+      
+      Collection<BeanDeploymentArchive> reachableBDAs = getReachableBDAs(bda1);
+      assertTrue(reachableBDAs.isEmpty());
+      reachableBDAs = getReachableBDAs(bda2);
+      assertTrue(reachableBDAs.isEmpty());
+   }
+
+   @Override
+   protected void assertBasicEar()
+   {
+      Deployment deployment = (Deployment) getBean(Deployment.class);
+      Collection<BeanDeploymentArchive> bdas = getBDAs(deployment);
+      assertEquals(3, bdas.size());
+      BeanDeploymentArchive earBDA = null, simpleWarBDA = null, crmWarBDA = null;
+      for (BeanDeploymentArchive bda: bdas)
+      {
+         if (bda.getId().contains("simple.war"))
+         {
+            simpleWarBDA = bda;
+            assertBDAId(simpleWarBDA, "top-level.ear/simple.war");
+            assertExpectedClasses(simpleWarBDA, UIWebBean.class, ServletWebBean.class);
+            assertExpectedWarResources(simpleWarBDA, "top-level.ear/simple.war", true, "ui.jar");
+         }
+         else if (bda.getId().contains("crm.war"))
+         {
+            crmWarBDA = bda;
+            assertBDAId(crmWarBDA, "top-level.ear/crm.war");
+            assertExpectedClasses(crmWarBDA, CrmWebBean.class);
+            assertExpectedResources(crmWarBDA, "crm.jar");
+         }
+         else
+         {
+            earBDA = bda;
+            assertBDAId(earBDA, "top-level.ear");
+            assertExpectedClasses(earBDA, BusinessInterface.class, MySLSBean.class,
+                     ExternalWebBean.class, PlainJavaBean.class);
+            assertExpectedResources(earBDA, "top-level.ear/ejbs.jar",
+                     "top-level.ear/lib/ext.jar", "top-level.ear/simple.jar");
+         }
+      }
+      Collection<BeanDeploymentArchive> reachableBDAs = getReachableBDAs(earBDA);
+      assertTrue(reachableBDAs.isEmpty());
+      reachableBDAs = getReachableBDAs(simpleWarBDA);
+      assertEquals(1, reachableBDAs.size());
+      assertSame(earBDA, reachableBDAs.iterator().next());
+   }
+
+   @Override
+   protected void assertBasicEarFullCDI()
+   {
+      Deployment deployment = (Deployment) getBean(Deployment.class);
+      Collection<BeanDeploymentArchive> bdas = getBDAs(deployment);
+      assertEquals(3, bdas.size());
+      BeanDeploymentArchive earBDA = null, simpleWarBDA = null, crmWarBDA = null;
+      for (BeanDeploymentArchive bda: bdas)
+      {
+         if (bda.getId().contains("simple.war"))
+         {
+            simpleWarBDA = bda;
+            assertBDAId(simpleWarBDA, "top-level.ear/simple.war");
+            assertExpectedClasses(simpleWarBDA, UIWebBean.class, ServletWebBean.class);
+            assertExpectedWarResources(simpleWarBDA, "top-level.ear/simple.war", true, "ui.jar");
+         }
+         else if (bda.getId().contains("crm.war"))
+         {
+            crmWarBDA = bda;
+            assertBDAId(crmWarBDA, "top-level.ear/crm.war");
+            assertExpectedClasses(crmWarBDA, CrmWebBean.class, NotWBJsfBean.class);
+            assertExpectedWarResources(crmWarBDA, "top-level.ear/crm.war", true, "crm.jar");
+         }
+         else
+         {
+            earBDA = bda;
+            assertBDAId(earBDA, "top-level.ear");
+            assertExpectedClasses(earBDA, BusinessInterface.class, MySLSBean.class,
+                     ExternalWebBean.class, PlainJavaBean.class, SomeUtil.class);
+            assertExpectedResources(earBDA, "top-level.ear/lib/util.jar",
+                     "top-level.ear/lib/ext.jar", "top-level.ear/simple.jar",
+                     "top-level.ear/ejbs.jar");
+         }
+      }
+
+      Collection<BeanDeploymentArchive> reachableBDAs = getReachableBDAs(earBDA);
+      assertTrue(reachableBDAs.isEmpty());
+      reachableBDAs = getReachableBDAs(simpleWarBDA);
+      assertEquals(1, reachableBDAs.size());
+      assertSame(earBDA, reachableBDAs.iterator().next());
+   }
+
+   @Override
+   protected void assertBasicEarWithoutXml()
+   {
+      assertEmptyEnvironment();
+   }
+
+   @Override
+   protected void assertEmptyEnvironment()
+   {
+      assertNoBean(Deployment.class);
+   }
+
+   @Override
+   protected BeanDeploymentArchive assertSingleEnvironment(String name)
+   {
+      Deployment deployment = (Deployment) getBean(Deployment.class);
+      return assertOneBDA(deployment, name);
+   }
+
+   @Override
+   protected Collection<Class<?>> getClasses(BeanDeploymentArchive bda)
+   {
+      return bda.getBeanClasses();
+   }
+
+   @Override
+   protected Collection<URL> getResources(BeanDeploymentArchive bda)
+   {
+      return bda.getBeansXml();
+   }
+
+   private BeanDeploymentArchive assertOneBDA(Deployment deployment, String name)
+   {
+      Collection<BeanDeploymentArchive> bdas = getBDAs(deployment);
+      assertEquals(1, bdas.size());
+      BeanDeploymentArchive bda = bdas.iterator().next();
+      assertBDAId(bda, name);
+      assertTrue(getReachableBDAs(bda).isEmpty());
+      return bda;
+   }
+
+   private Collection<BeanDeploymentArchive> getBDAs(Deployment deployment)
+   {
+      assertNotNull(deployment);
+      Collection<BeanDeploymentArchive> bdas = deployment.getBeanDeploymentArchives();
+      assertNotNull(bdas);
+      return bdas;
+   }
+
+   private void assertBDAId(BeanDeploymentArchive bda, String name)
+   {
+      assertTrue("BDA id \""  + bda.getId() + "\" expected to end with suffix \"" + name + "/}\"",
+               bda.getId().endsWith(name + "/}"));
+   }
+
+   private Collection<BeanDeploymentArchive> getReachableBDAs(BeanDeploymentArchive bda)
+   {
+      Collection<BeanDeploymentArchive> result = new HashSet<BeanDeploymentArchive>();
+      getReachableBDAs(bda, result);
+      result.remove(bda);
+      return result;
+   }
+
+   private void getReachableBDAs(BeanDeploymentArchive bda, Collection<BeanDeploymentArchive> result)
+   {
+      if (result.contains(bda))
+      {
+         return;
+      }
+      result.add(bda);
+      for (BeanDeploymentArchive reachableBDA: bda.getBeanDeploymentArchives())
+      {
+         getReachableBDAs(reachableBDA, result);
+      }
+   }
+}

Deleted: projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/java/org/jboss/test/deployers/test/JBossDeploymentTestCase.java
===================================================================
--- projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/java/org/jboss/test/deployers/test/JBossDeploymentTestCase.java	2010-07-12 07:49:14 UTC (rev 106574)
+++ projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/java/org/jboss/test/deployers/test/JBossDeploymentTestCase.java	2010-07-12 08:14:45 UTC (rev 106575)
@@ -1,755 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.deployers.test;
-
-import java.net.URL;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import junit.framework.Test;
-
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.container.LibraryContainer;
-import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.test.deployers.support.CheckableBootstrap;
-import org.jboss.test.deployers.support.MockArchiveManifest;
-import org.jboss.test.deployers.support.MockEjbServices;
-import org.jboss.test.deployers.support.MockEmptyEjbServices;
-import org.jboss.test.deployers.support.MockTransactionServices;
-import org.jboss.test.deployers.support.MockWeldBootstrap;
-import org.jboss.test.deployers.support.WeldDEWrapper;
-import org.jboss.test.deployers.support.crm.CrmWebBean;
-import org.jboss.test.deployers.support.ejb.BusinessInterface;
-import org.jboss.test.deployers.support.ejb.MySLSBean;
-import org.jboss.test.deployers.support.ext.ExternalWebBean;
-import org.jboss.test.deployers.support.jar.PlainJavaBean;
-import org.jboss.test.deployers.support.jsf.NotWBJsfBean;
-import org.jboss.test.deployers.support.ui.UIWebBean;
-import org.jboss.test.deployers.support.util.SomeUtil;
-import org.jboss.test.deployers.support.web.ServletWebBean;
-import org.jboss.vfs.VirtualFile;
-import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
-import org.jboss.weld.bootstrap.spi.Deployment;
-import org.jboss.wsf.spi.metadata.j2ee.SLSBMetaData;
-
-/**
- * JBossDeployment test case.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- * @author <a href="mailto:flavia.rainone at jboss.com">Flavia Rainone</a>
- */
-public class JBossDeploymentTestCase extends AbstractWeldTest
-{
-   public JBossDeploymentTestCase(String name)
-   {
-      super(name);
-   }
-
-   public static Test suite()
-   {
-      return suite(JBossDeploymentTestCase.class);
-   }
-
-   private DeploymentUnit unit;
-   
-   public void setUp() throws Exception
-   {
-      super.setUp();
-      JavaArchive mockJar = ShrinkWrap.create("mock.jar", JavaArchive.class);
-      mockJar.addClass(CheckableBootstrap.class);
-      mockJar.addClass(MockEjbServices.class);
-      mockJar.addClass(MockEmptyEjbServices.class);
-      mockJar.addClass(MockTransactionServices.class);
-      mockJar.addClass(MockWeldBootstrap.class);
-      mockJar.addClass(WeldDEWrapper.class);
-      assertDeploy(mockJar);
-   }
-   
-   public void tearDown() throws Exception
-   {
-      undeploy(unit);
-      super.tearDown();
-   }
-   
-   public void testEjbJar() throws Exception
-   {
-      JavaArchive ejbJar = createEjbJar(true);
-      unit = assertDeploy(ejbJar);
-
-      Deployment deployment = (Deployment) getBean(Deployment.class);
-      BeanDeploymentArchive bda = assertOneBDA(deployment, "ejb.jar");
-      assertExpectedClasses(bda, PlainJavaBean.class);
-      assertExpectedResources(bda, "ejb.jar");
-   }
-
-
-   private void assertBDAId(BeanDeploymentArchive bda, String name)
-   {
-      assertTrue("BDA id \""  + bda.getId() + "\" expected to end with suffix \"" + name + "/}\"",
-               bda.getId().endsWith(name + "/}"));
-   }
-   
-   public void testEjbJarWithoutXml() throws Exception
-   {
-      JavaArchive ejbJar = createEjbJar(false);
-      unit = assertDeploy(ejbJar);
-      
-      assertNoBean(Deployment.class);
-   }
-
-   public void testEjbJarInEar() throws Exception
-   {
-      EnterpriseArchive ear = ShrinkWrap.create("simple.ear", EnterpriseArchive.class);
-      JavaArchive ejbJar = createEjbJar(true);
-      ear.addModule(ejbJar);
-      MockArchiveManifest.addManifest(ear);
-      unit = assertDeploy(ear);
-      
-      Deployment deployment = (Deployment) getBean(Deployment.class);
-      BeanDeploymentArchive bda = assertOneBDA(deployment, "simple.ear");
-      assertExpectedClasses(bda, PlainJavaBean.class);
-      assertExpectedResources(bda, unit.getSimpleName() + "/ejb.jar");
-   }
-
-   public void testEjbJarWithoutXmlInEar() throws Exception
-   {
-      EnterpriseArchive ear = ShrinkWrap.create("simple.ear", EnterpriseArchive.class);
-      JavaArchive ejbJar = createEjbJar(false);
-      ear.addModule(ejbJar);
-      MockArchiveManifest.addManifest(ear);
-      unit = assertDeploy(ear);
-      
-      assertNoBean(Deployment.class);
-   }
-   
-   public void testEjbJarsInEar() throws Exception
-   {
-      EnterpriseArchive ear = ShrinkWrap.create("simple.ear", EnterpriseArchive.class);
-      JavaArchive ejbJar1 = createEjbJar("ejbJar1.jar", true, PlainJavaBean.class);
-      ear.addModule(ejbJar1);
-      JavaArchive ejbJar2 = createEjbJar("ejbJar2.jar", true, MySLSBean.class, SLSBMetaData.class);
-      ear.addModule(ejbJar2);
-      MockArchiveManifest.addManifest(ear);
-      unit = assertDeploy(ear);
-      
-      Deployment deployment = (Deployment) getBean(Deployment.class);
-      BeanDeploymentArchive bda = assertOneBDA(deployment, "simple.ear");
-      assertExpectedClasses(bda, PlainJavaBean.class, MySLSBean.class,
-               SLSBMetaData.class);
-      assertExpectedResources(bda, "simple.ear/ejbJar1.jar", "simple.ear/ejbJar2.jar");
-   }
-
-
-   public void testMixedEjbJarsInEar() throws Exception
-   {
-      EnterpriseArchive ear = ShrinkWrap.create("simple.ear", EnterpriseArchive.class);
-      JavaArchive ejbJar1 = createEjbJar("ejbJar1.jar", false, PlainJavaBean.class);
-      ear.addModule(ejbJar1);
-      JavaArchive ejbJar2 = createEjbJar("ejbJar2.jar", true, MySLSBean.class, SLSBMetaData.class);
-      ear.addModule(ejbJar2);
-      MockArchiveManifest.addManifest(ear);
-      unit = assertDeploy(ear);
-      
-      Deployment deployment = (Deployment) getBean(Deployment.class);
-      BeanDeploymentArchive bda = assertOneBDA(deployment, "simple.ear");
-      assertExpectedClasses(bda, MySLSBean.class, SLSBMetaData.class);
-      assertExpectedResources(bda, "simple.ear/ejbJar2.jar");
-   }
-
-   public void testEjbJarsWithoutXmlInEar() throws Exception
-   {
-      EnterpriseArchive ear = ShrinkWrap.create("simple.ear", EnterpriseArchive.class);
-      JavaArchive ejbJar1 = createEjbJar("ejbJar1.jar", false, PlainJavaBean.class);
-      ear.addModule(ejbJar1);
-      JavaArchive ejbJar2 = createEjbJar("ejbJar2.jar", false, MySLSBean.class, SLSBMetaData.class);
-      ear.addModule(ejbJar2);
-      MockArchiveManifest.addManifest(ear);
-      unit = assertDeploy(ear);
-      
-      assertNoBean(Deployment.class);
-   }
-   
-   public void testWar() throws Exception
-   {
-      WebArchive war = createWar(true);
-      unit = assertDeploy(war);
-      
-      Deployment deployment = (Deployment) getBean(Deployment.class);
-      BeanDeploymentArchive bda = assertOneBDA(deployment, "simple.war");
-      assertExpectedClasses(bda, ServletWebBean.class);
-      assertExpectedWarResources(bda, unit.getSimpleName(), true);
-   }
-   
-   public void testWarWithLib() throws Exception
-   {
-      WebArchive war = createWarWithLib(true, true);
-      unit = assertDeploy(war);
-      
-      Deployment deployment = (Deployment) getBean(Deployment.class);
-      BeanDeploymentArchive bda = assertOneBDA(deployment, "simple.war");
-      assertExpectedClasses(bda, ServletWebBean.class, UIWebBean.class);
-      assertExpectedWarResources(bda, unit.getSimpleName(), true, "lib.jar");
-   }
-
-   public void testWarWithLibs() throws Exception
-   {
-      WebArchive war = createWarWithLibs(true, true, true);
-      unit = assertDeploy(war);
-      
-      Deployment deployment = (Deployment) getBean(Deployment.class);
-      BeanDeploymentArchive bda = assertOneBDA(deployment, "simple.war");
-      assertExpectedClasses(bda, ServletWebBean.class, UIWebBean.class, CrmWebBean.class);
-      assertExpectedWarResources(bda, unit.getSimpleName(), true, "lib1.jar", "lib2.jar");
-   }
-
-   public void testWarWithLibWithoutXml() throws Exception
-   {
-      WebArchive war = createWarWithLib(true, false);
-      unit = assertDeploy(war);
-      
-      Deployment deployment = (Deployment) getBean(Deployment.class);
-      BeanDeploymentArchive bda = assertOneBDA(deployment, "simple.war");
-      assertExpectedClasses(bda, ServletWebBean.class);
-      assertExpectedWarResources(bda, unit.getSimpleName(), true);
-   }
-
-   public void testWarWithLibsWithoutXml() throws Exception
-   {
-      WebArchive war = createWarWithLibs(true, false, false);
-      unit = assertDeploy(war);
-      
-      Deployment deployment = (Deployment) getBean(Deployment.class);
-      BeanDeploymentArchive bda = assertOneBDA(deployment, "simple.war");
-      assertExpectedClasses(bda, ServletWebBean.class);
-      assertExpectedWarResources(bda, unit.getSimpleName(), true);
-   }
-
-   public void testWarWithMixedLibs() throws Exception
-   {
-      WebArchive war = createWarWithLibs(true, true, false);
-      unit = assertDeploy(war);
-      
-      Deployment deployment = (Deployment) getBean(Deployment.class);
-      BeanDeploymentArchive bda = assertOneBDA(deployment, "simple.war");
-      assertExpectedClasses(bda, ServletWebBean.class, UIWebBean.class);
-      assertExpectedWarResources(bda, unit.getSimpleName(), true, "lib1.jar");
-   }
-
-   public void testWarWithoutXmlWithLib() throws Exception
-   {
-      WebArchive war = createWarWithLib(false, true);
-      unit = assertDeploy(war);
-      
-      Deployment deployment = (Deployment) getBean(Deployment.class);
-      BeanDeploymentArchive bda = assertOneBDA(deployment, "simple.war");
-      assertExpectedClasses(bda, UIWebBean.class);
-      assertExpectedWarResources(bda, unit.getSimpleName(), false, "lib.jar");
-   }
-
-   public void testWarWithoutXmlWithLibs() throws Exception
-   {
-      WebArchive war = createWarWithLibs(false, true, true);
-      unit = assertDeploy(war);
-      
-      Deployment deployment = (Deployment) getBean(Deployment.class);
-      BeanDeploymentArchive bda = assertOneBDA(deployment, "simple.war");
-      assertExpectedClasses(bda, UIWebBean.class, CrmWebBean.class);
-      assertExpectedWarResources(bda, unit.getSimpleName(), false, "lib1.jar", "lib2.jar");
-   }
-
-   public void testWarWithoutXmlWithLibWithoutXml() throws Exception
-   {
-      WebArchive war = createWarWithLib(false, false);
-      unit = assertDeploy(war);
-      
-      assertNoBean(Deployment.class);
-   }
-
-   public void testWarWithoutXmlWithMixedLibs() throws Exception
-   {
-      WebArchive war = createWarWithLibs(false, true, false);
-      unit = assertDeploy(war);
-      
-      Deployment deployment = (Deployment) getBean(Deployment.class);
-      BeanDeploymentArchive bda = assertOneBDA(deployment, "simple.war");
-      assertExpectedClasses(bda, UIWebBean.class);
-      assertExpectedWarResources(bda, unit.getSimpleName(), false, "lib1.jar");
-   }
-
-   public void testWarWithoutXmlWithLibsWithoutXml() throws Exception
-   {
-      WebArchive war = createWarWithLibs(false, false, false);
-      unit = assertDeploy(war);
-      
-      assertNoBean(Deployment.class);
-   }
-
-   public void testWarWithoutXml() throws Exception
-   {
-      WebArchive war = createWar(false);
-      unit = assertDeploy(war);
-      
-      assertNoBean(Deployment.class);
-   }
-   
-   public void testWarInEar() throws Exception
-   {
-      EnterpriseArchive ear = ShrinkWrap.create("warinear.ear", EnterpriseArchive.class);
-      WebArchive war = createWar(true);
-      ear.addModule(war);
-      MockArchiveManifest.addManifest(ear);
-      unit = assertDeploy(ear);
-      
-      Deployment deployment = (Deployment) getBean(Deployment.class);
-      BeanDeploymentArchive bda = assertOneBDA(deployment, "warinear.ear/simple.war");
-      assertExpectedClasses(bda, ServletWebBean.class);
-      assertExpectedWarResources(bda, "simple.war", true);
-   }
-
-   public void testWarsInEar() throws Exception
-   {
-      EnterpriseArchive ear = ShrinkWrap.create("warinear.ear", EnterpriseArchive.class);
-      WebArchive war = createWar("simple1.war", true, ServletWebBean.class);
-      ear.addModule(war);
-      war = createWar("simple2.war", true, NotWBJsfBean.class);
-      ear.addModule(war);
-      MockArchiveManifest.addManifest(ear);
-      unit = assertDeploy(ear);
-      
-      Deployment deployment = (Deployment) getBean(Deployment.class);
-      Collection<BeanDeploymentArchive> bdas = getBDAs(deployment);
-      assertEquals(2, bdas.size());
-      Iterator<BeanDeploymentArchive> iterator = bdas.iterator();
-      BeanDeploymentArchive bda = iterator.next();
-      BeanDeploymentArchive bda1, bda2;
-      if (bda.getId().contains("simple1.war"))
-      {
-         bda1 = bda;
-         bda2 = iterator.next();
-      }
-      else
-      {
-         bda2 = bda;
-         bda1 = iterator.next();
-      }
-      assertBDAId(bda1, "warinear.ear/simple1.war");
-      assertExpectedClasses(bda1, ServletWebBean.class);
-      assertExpectedWarResources(bda1, "simple1.war", true);
-
-      assertBDAId(bda2, "warinear.ear/simple2.war");
-      assertExpectedClasses(bda2, NotWBJsfBean.class);
-      assertExpectedWarResources(bda2, "simple2.war", true);
-      
-      Collection<BeanDeploymentArchive> reachableBDAs = getReachableBDAs(bda1);
-      assertTrue(reachableBDAs.isEmpty());
-      reachableBDAs = getReachableBDAs(bda2);
-      assertTrue(reachableBDAs.isEmpty());
-   }
-
-   public void testMixedWarsInEar() throws Exception
-   {
-      EnterpriseArchive ear = ShrinkWrap.create("warinear.ear", EnterpriseArchive.class);
-      WebArchive war = createWar("simple1.war", true, ServletWebBean.class);
-      ear.addModule(war);
-      war = createWar("simple2.war", false, NotWBJsfBean.class);
-      ear.addModule(war);
-      MockArchiveManifest.addManifest(ear);
-      unit = assertDeploy(ear);
-      
-      Deployment deployment = (Deployment) getBean(Deployment.class);
-      BeanDeploymentArchive bda = assertOneBDA(deployment, "warinear.ear/simple1.war");
-      assertExpectedClasses(bda, ServletWebBean.class);
-      assertExpectedWarResources(bda, "warinear.ear/simple1.war", true);
-   }
-   
-   public void testWarsWithoutXmlInEar() throws Exception
-   {
-      EnterpriseArchive ear = ShrinkWrap.create("warinear.ear", EnterpriseArchive.class);
-      WebArchive war = createWar("simple1.war", false, ServletWebBean.class);
-      ear.addModule(war);
-      war = createWar("simple2.war", false, NotWBJsfBean.class);
-      ear.addModule(war);
-      MockArchiveManifest.addManifest(ear);
-      unit = assertDeploy(ear);
-      
-      assertNoBean(Deployment.class);
-   }
-
-   public void testWarWithLibInEar() throws Exception
-   {
-      EnterpriseArchive ear = ShrinkWrap.create("warinear.ear", EnterpriseArchive.class);
-      WebArchive war = createWarWithLib(true, true);
-      ear.addModule(war);
-      MockArchiveManifest.addManifest(ear);
-      unit = assertDeploy(ear);
-      
-      Deployment deployment = (Deployment) getBean(Deployment.class);
-      BeanDeploymentArchive bda = assertOneBDA(deployment, "warinear.ear/simple.war");
-      assertExpectedClasses(bda, ServletWebBean.class, UIWebBean.class);
-      assertExpectedWarResources(bda, "simple.war", true, "lib.jar");
-   }
-
-   public void testWarWithLibWithoutXmlInEar() throws Exception
-   {
-      EnterpriseArchive ear = ShrinkWrap.create("warinear.ear", EnterpriseArchive.class);
-      WebArchive war = createWarWithLib(true, false);
-      ear.addModule(war);
-      MockArchiveManifest.addManifest(ear);
-      unit = assertDeploy(ear);
-      
-      Deployment deployment = (Deployment) getBean(Deployment.class);
-      BeanDeploymentArchive bda = assertOneBDA(deployment, "warinear.ear/simple.war");
-      assertExpectedClasses(bda, ServletWebBean.class);
-      assertExpectedWarResources(bda, "simple.war", true);
-   }
-
-   public void testWarWithoutXmlWithLibWithoutXmlInEar() throws Exception
-   {
-      EnterpriseArchive ear = ShrinkWrap.create("warinear.ear", EnterpriseArchive.class);
-      WebArchive war = createWarWithLib(false, false);
-      ear.addModule(war);
-      MockArchiveManifest.addManifest(ear);
-      unit = assertDeploy(ear);
-      
-      assertNoBean(Deployment.class);
-   }
-
-   public void testWarWithoutXmlWithLibInEar() throws Exception
-   {
-      EnterpriseArchive ear = ShrinkWrap.create("warinear.ear", EnterpriseArchive.class);
-      WebArchive war = createWarWithLib(false, true);
-      ear.addModule(war);
-      MockArchiveManifest.addManifest(ear);
-      unit = assertDeploy(ear);
-      
-      Deployment deployment = (Deployment) getBean(Deployment.class);
-      BeanDeploymentArchive bda = assertOneBDA(deployment, "warinear.ear/simple.war");
-      assertExpectedClasses(bda, UIWebBean.class);
-      assertExpectedWarResources(bda, "simple.war", false, "lib.jar");
-   }
-
-   public void testBasicEar() throws Exception
-   {
-      VirtualFile ear = createBasicEar();
-      unit = assertDeploy(ear);
-
-      Deployment deployment = (Deployment) getBean(Deployment.class);
-      Collection<BeanDeploymentArchive> bdas = getBDAs(deployment);
-      assertEquals(3, bdas.size());
-      BeanDeploymentArchive earBDA = null, simpleWarBDA = null, crmWarBDA = null;
-      for (BeanDeploymentArchive bda: bdas)
-      {
-         if (bda.getId().contains("simple.war"))
-         {
-            simpleWarBDA = bda;
-            assertBDAId(simpleWarBDA, "top-level.ear/simple.war");
-            assertExpectedClasses(simpleWarBDA, UIWebBean.class, ServletWebBean.class);
-            assertExpectedWarResources(simpleWarBDA, "simple.war", true, "ui.jar");
-         }
-         else if (bda.getId().contains("crm.war"))
-         {
-            crmWarBDA = bda;
-            assertBDAId(crmWarBDA, "top-level.ear/crm.war");
-            assertExpectedClasses(crmWarBDA, CrmWebBean.class);
-            assertExpectedResources(crmWarBDA, "crm.jar");
-         }
-         else
-         {
-            earBDA = bda;
-            assertBDAId(earBDA, "top-level.ear");
-            assertExpectedClasses(earBDA, BusinessInterface.class, MySLSBean.class,
-                     ExternalWebBean.class, PlainJavaBean.class);
-            assertExpectedResources(earBDA, "ejbs.jar", "ext.jar", "simple.jar");
-         }
-      }
-      Collection<BeanDeploymentArchive> reachableBDAs = getReachableBDAs(earBDA);
-      assertTrue(reachableBDAs.isEmpty());
-      reachableBDAs = getReachableBDAs(simpleWarBDA);
-      assertEquals(1, reachableBDAs.size());
-      assertSame(earBDA, reachableBDAs.iterator().next());
-   }
-   
-   public void testBasicEarFullCDI() throws Exception
-   {
-      EnterpriseArchive ear = ShrinkWrap.create("top-level.ear", EnterpriseArchive.class);
-      createLib(ear, "util.jar", true, SomeUtil.class);
-      createLib(ear, "ext.jar", true, ExternalWebBean.class);
-      JavaArchive ejbJar = createEjbJar("simple.jar", true, PlainJavaBean.class);
-      ear.addModule(ejbJar);
-      ejbJar = createEjbJar("ejbs.jar", true, MySLSBean.class, BusinessInterface.class);
-      ear.addModule(ejbJar);
-      WebArchive war = createWar("simple.war", true, ServletWebBean.class);
-      createLib(war, "ui.jar", true, UIWebBean.class);
-      ear.addModule(war);
-      war = createWar("crm.war", true, NotWBJsfBean.class);
-      createLib(war, "crm.jar", true, CrmWebBean.class);
-      ear.addModule(war);
-      unit = assertDeploy(ear);
-      
-      Deployment deployment = (Deployment) getBean(Deployment.class);
-      Collection<BeanDeploymentArchive> bdas = getBDAs(deployment);
-      assertEquals(3, bdas.size());
-      BeanDeploymentArchive earBDA = null, simpleWarBDA = null, crmWarBDA = null;
-      for (BeanDeploymentArchive bda: bdas)
-      {
-         if (bda.getId().contains("simple.war"))
-         {
-            simpleWarBDA = bda;
-            assertBDAId(simpleWarBDA, "top-level.ear/simple.war");
-            assertExpectedClasses(simpleWarBDA, UIWebBean.class, ServletWebBean.class);
-            assertExpectedWarResources(simpleWarBDA, "top-level.ear/simple.war", true, "ui.jar");
-         }
-         else if (bda.getId().contains("crm.war"))
-         {
-            crmWarBDA = bda;
-            assertBDAId(crmWarBDA, "top-level.ear/crm.war");
-            assertExpectedClasses(crmWarBDA, CrmWebBean.class, NotWBJsfBean.class);
-            assertExpectedWarResources(crmWarBDA, "top-level.ear/crm.war", true, "crm.jar");
-         }
-         else
-         {
-            earBDA = bda;
-            assertBDAId(earBDA, "top-level.ear");
-            assertExpectedClasses(earBDA, BusinessInterface.class, MySLSBean.class,
-                     ExternalWebBean.class, PlainJavaBean.class, SomeUtil.class);
-            assertExpectedResources(earBDA, "top-level.ear/lib/util.jar",
-                     "top-level.ear/lib/ext.jar", "top-level.ear/simple.jar",
-                     "top-level.ear/ejbs.jar");
-         }
-      }
-
-      Collection<BeanDeploymentArchive> reachableBDAs = getReachableBDAs(earBDA);
-      assertTrue(reachableBDAs.isEmpty());
-      reachableBDAs = getReachableBDAs(simpleWarBDA);
-      assertEquals(1, reachableBDAs.size());
-      assertSame(earBDA, reachableBDAs.iterator().next());
-   }
-   
-   public void testBasicEarWithoutXml() throws Exception
-   {
-      EnterpriseArchive ear = ShrinkWrap.create("simple.ear", EnterpriseArchive.class);
-      createLib(ear, "util.jar", false, SomeUtil.class);
-      createLib(ear, "ext.jar", false, ExternalWebBean.class);
-      JavaArchive ejbJar = createEjbJar("simple.jar", false, PlainJavaBean.class);
-      ear.addModule(ejbJar);
-      ejbJar = createEjbJar("ejbs.jar", false, MySLSBean.class, BusinessInterface.class);
-      ear.addModule(ejbJar);
-      WebArchive war = createWar("simple.war", false, ServletWebBean.class);
-      createLib(war, "ui.jar", false, UIWebBean.class);
-      ear.addModule(war);
-      war = createWar("crm.war", false, NotWBJsfBean.class);
-      createLib(war, "crm.jar", false, CrmWebBean.class);
-      ear.addModule(war);
-      unit = assertDeploy(ear);
-
-      assertNoBean(Deployment.class);
-   }
-
-   private static void addExpectedResource(Set<String> expected, String unit)
-   {
-      addExpectedResource(expected, unit, "/META-INF/beans.xml");
-   }
-
-   private static void addExpectedResource(Set<String> expected, String unit, String suffix)
-   {
-      expected.add(unit + suffix);
-   }
-
-   private static void addExpectedClass(Set<String> expected, Class<?> clazz)
-   {
-      expected.add(clazz.getName());
-   }
-   
-   private void assertExpectedClasses(BeanDeploymentArchive bda, Set<String> expected)
-   {
-      Collection<Class<?>> weldClasses = bda.getBeanClasses();
-      assertNotNull(weldClasses);
-      assertTrue("Unexpected empty weld classes collection", expected.isEmpty() || !weldClasses.isEmpty());
-      for (Class<?> clazz : weldClasses)
-      {
-         assertTrue("Found unexpected class: " + clazz.getName(), expected.remove(clazz.getName()));
-      }
-      assertEmpty("Should be emtpy, missing " + expected, expected);
-   }
-   
-   private void assertExpectedClasses(BeanDeploymentArchive bda, Class<?>... classes)
-   {
-      Set<String> expected = new HashSet<String>();
-      for(Class<?> clazz: classes)
-      {
-         addExpectedClass(expected, clazz);
-      }
-      assertExpectedClasses(bda, expected);
-   }
-   
-   private void assertExpectedResources(BeanDeploymentArchive bda, Set<String> expected)
-   {
-      Collection<URL> weldXml = bda.getBeansXml();
-      assertNotNull(weldXml);
-      assertTrue("Unexpected empty weld XML collection", expected.isEmpty() || !weldXml.isEmpty());
-      for (URL url : weldXml)
-      {
-         boolean found = false;
-         Iterator<String> iter = expected.iterator();
-         while (iter.hasNext())
-         {
-            String expectedURL = iter.next();
-            if (url.toExternalForm().endsWith(expectedURL))
-            {
-               iter.remove();
-               found = true;
-               break;
-            }
-         }
-         assertTrue("Unexpected wb url: " + url, found);
-      }
-      assertEmpty("Should be emtpy, missing " + expected, expected);
-   }
-   
-   public void assertExpectedResources(BeanDeploymentArchive bda, String... units)
-   {
-      Set<String> expected = new HashSet<String>();
-      for (String unit: units)
-      {
-         addExpectedResource(expected, unit);
-      }
-      assertExpectedResources(bda, expected);
-   }
-   
-   public void assertExpectedWarResources(BeanDeploymentArchive bda, String warUnit, boolean warResourceExpected, String... units)
-   {
-      Set<String> expected = new HashSet<String>();
-      if (warResourceExpected)
-         addExpectedResource(expected, warUnit, "/WEB-INF/beans.xml");
-      for (String unit: units)
-      {
-         addExpectedResource(expected, warUnit, "/WEB-INF/lib/" + unit + "/META-INF/beans.xml");
-      }
-      assertExpectedResources(bda, expected);
-   }
-   
-   private JavaArchive createEjbJar(boolean jarCDI)
-   {
-      return createEjbJar("ejb.jar", jarCDI, PlainJavaBean.class);
-   }
-   
-   private JavaArchive createEjbJar(String jarName, boolean jarCDI, Class<?>... classes)
-   {
-      JavaArchive ejbJar = ShrinkWrap.create(jarName, JavaArchive.class);
-      for (Class<?> clazz: classes)
-      {
-         ejbJar.addClass(clazz);
-      }
-      MockArchiveManifest.addManifest(ejbJar, jarCDI);
-      return ejbJar;
-   }
-
-   private WebArchive createWar(boolean warCDI)
-   {
-      return createWar("simple.war", warCDI, ServletWebBean.class);
-   }
-   
-   private WebArchive createWar(String warName, boolean warCDI, Class<?>... classes)
-   {
-      WebArchive war = ShrinkWrap.create(warName, WebArchive.class);
-      for (Class<?> clazz: classes)
-      {
-         war.addClass(clazz);
-      }
-      MockArchiveManifest.addManifest(war, warCDI);
-      return war;
-   }
-   
-   private WebArchive createWarWithLib(boolean warCDI, boolean libCDI)
-   {
-      WebArchive war = createWar(warCDI);
-      createLib(war, "lib.jar", libCDI, UIWebBean.class);
-      return war;
-   }
-   
-   private WebArchive createWarWithLibs(boolean warCDI, boolean lib1CDI, boolean lib2CDI)
-   {
-      WebArchive war = createWar(warCDI);
-      createLib(war, "lib1.jar", lib1CDI, UIWebBean.class);
-      createLib(war, "lib2.jar", lib2CDI, CrmWebBean.class);
-      return war;
-   }
-
-   
-   private void createLib(LibraryContainer<?> archive, String libName, boolean cdi, Class<?>... classes)
-   {
-      JavaArchive lib = ShrinkWrap.create(libName, JavaArchive.class);
-      if (cdi)
-      {
-         MockArchiveManifest.addCDIManifest(lib);
-      }
-      for (Class<?> libClass: classes)
-      {
-         lib.addClass(libClass);
-      }
-      archive.addLibrary(lib);
-   }
-
-   public Collection<BeanDeploymentArchive> getReachableBDAs(BeanDeploymentArchive bda)
-   {
-      Collection<BeanDeploymentArchive> result = new HashSet<BeanDeploymentArchive>();
-      getReachableBDAs(bda, result);
-      result.remove(bda);
-      return result;
-   }
-
-   private void getReachableBDAs(BeanDeploymentArchive bda, Collection<BeanDeploymentArchive> result)
-   {
-      if (result.contains(bda))
-      {
-         return;
-      }
-      result.add(bda);
-      for (BeanDeploymentArchive reachableBDA: bda.getBeanDeploymentArchives())
-      {
-         getReachableBDAs(reachableBDA, result);
-      }
-   }
-
-   private BeanDeploymentArchive assertOneBDA(Deployment deployment, String name)
-   {
-      Collection<BeanDeploymentArchive> bdas = getBDAs(deployment);
-      assertEquals(1, bdas.size());
-      BeanDeploymentArchive bda = bdas.iterator().next();
-      assertBDAId(bda, name);
-      assertTrue(getReachableBDAs(bda).isEmpty());
-      return bda;
-   }
-
-   private Collection<BeanDeploymentArchive> getBDAs(Deployment deployment)
-   {
-      assertNotNull(deployment);
-      Collection<BeanDeploymentArchive> bdas = deployment.getBeanDeploymentArchives();
-      assertNotNull(bdas);
-      return bdas;
-   }
-}

Deleted: projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/resources/org/jboss/test/deployers/test/ArchiveDiscoveryDeploymentTestCase.xml
===================================================================
--- projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/resources/org/jboss/test/deployers/test/ArchiveDiscoveryDeploymentTestCase.xml	2010-07-12 07:49:14 UTC (rev 106574)
+++ projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/resources/org/jboss/test/deployers/test/ArchiveDiscoveryDeploymentTestCase.xml	2010-07-12 08:14:45 UTC (rev 106575)
@@ -1,14 +0,0 @@
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-  <bean name="EarStructure" class="org.jboss.test.deployers.vfs.structure.ear.support.MockEarStructureDeployer"/>
-  <bean name="WarStructure" class="org.jboss.test.deployers.vfs.structure.war.support.MockWarStructureDeployer"/>
-  <bean name="WarClassLoader" class="org.jboss.test.deployers.vfs.reflect.support.MockWarClassLoaderDeployer"/>
-
-  <bean name="JWBMDDeployer" class="org.jboss.weld.integration.deployer.ext.JBossWeldMetaDataDeployer"/>
-  <bean name="WBFilesDeployer" class="org.jboss.weld.integration.deployer.metadata.WeldFilesDeployer"/>
-  <bean name="ArchiveInfoDeployer" class="org.jboss.weld.integration.deployer.env.ArchiveInfoDeployer"/>
-
-  <!--  Target of the Test -->
-  <bean name="ArchiveDiscoveryDeployer" class="org.jboss.weld.integration.deployer.env.ArchiveDiscoveryDeployer"/>
-
-</deployment>

Copied: projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/resources/org/jboss/test/deployers/test/ArchiveEnvironmentTestCase.xml (from rev 105413, projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/resources/org/jboss/test/deployers/test/ArchiveDiscoveryDeploymentTestCase.xml)
===================================================================
--- projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/resources/org/jboss/test/deployers/test/ArchiveEnvironmentTestCase.xml	                        (rev 0)
+++ projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/resources/org/jboss/test/deployers/test/ArchiveEnvironmentTestCase.xml	2010-07-12 08:14:45 UTC (rev 106575)
@@ -0,0 +1,14 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+  <bean name="EarStructure" class="org.jboss.test.deployers.vfs.structure.ear.support.MockEarStructureDeployer"/>
+  <bean name="WarStructure" class="org.jboss.test.deployers.vfs.structure.war.support.MockWarStructureDeployer"/>
+  <bean name="WarClassLoader" class="org.jboss.test.deployers.vfs.reflect.support.MockWarClassLoaderDeployer"/>
+
+  <bean name="JWBMDDeployer" class="org.jboss.weld.integration.deployer.ext.JBossWeldMetaDataDeployer"/>
+  <bean name="WBFilesDeployer" class="org.jboss.weld.integration.deployer.metadata.WeldFilesDeployer"/>
+  <bean name="ArchiveInfoDeployer" class="org.jboss.weld.integration.deployer.env.ArchiveInfoDeployer"/>
+
+  <!--  Target of the Test -->
+  <bean name="ArchiveDiscoveryDeployer" class="org.jboss.weld.integration.deployer.env.ArchiveDiscoveryDeployer"/>
+
+</deployment>

Copied: projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/resources/org/jboss/test/deployers/test/DeploymentEnvironmentTestCase.xml (from rev 105413, projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/resources/org/jboss/test/deployers/test/JBossDeploymentTestCase.xml)
===================================================================
--- projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/resources/org/jboss/test/deployers/test/DeploymentEnvironmentTestCase.xml	                        (rev 0)
+++ projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/resources/org/jboss/test/deployers/test/DeploymentEnvironmentTestCase.xml	2010-07-12 08:14:45 UTC (rev 106575)
@@ -0,0 +1,33 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+  <bean name="EarStructure" class="org.jboss.test.deployers.vfs.structure.ear.support.MockEarStructureDeployer"/>
+  <bean name="WarStructure" class="org.jboss.test.deployers.vfs.structure.war.support.MockWarStructureDeployer"/>
+  <bean name="WarClassLoader" class="org.jboss.test.deployers.vfs.reflect.support.MockWarClassLoaderDeployer"/>
+
+  <bean name="JWBMDDeployer" class="org.jboss.weld.integration.deployer.ext.JBossWeldMetaDataDeployer"/>
+  <bean name="WBFilesDeployer" class="org.jboss.weld.integration.deployer.metadata.WeldFilesDeployer"/>
+  <bean name="ArchiveInfoDeployer" class="org.jboss.weld.integration.deployer.env.ArchiveInfoDeployer"/>
+  <bean name="ArchiveDiscoveryDeployer" class="org.jboss.weld.integration.deployer.env.ArchiveDiscoveryDeployer"/>
+
+  <beanfactory name="JBossEjbServices" class="org.jboss.test.deployers.support.MockEmptyEjbServices"/>
+
+  <bean name="EjbServicesDeployer" class="org.jboss.weld.integration.deployer.env.EjbServicesDeployer">
+    <property name="ejbServicesClassName">org.jboss.test.deployers.support.MockEmptyEjbServices</property>
+  </bean>
+
+  <!-- Target of the Test -->
+  <bean name="DeploymentDeployer" class="org.jboss.weld.integration.deployer.env.JBossDeploymentDeployer"/>
+
+  <bean name="BootDeployer" class="org.jboss.test.deployers.support.deployer.MockBootDeployer"/>
+
+  <bean name="DynamicDependencyCreator" class="org.jboss.weld.integration.deployer.env.DynamicDependencyCreator">
+    <constructor>
+      <parameter><inject bean="jboss.kernel:service=KernelController"/></parameter>
+    </constructor>
+  </bean>
+
+  <bean name="JBossTransactionServices" class="org.jboss.test.deployers.support.MockTransactionServices"/>
+
+  <bean name="RealTransactionManager" class="java.lang.Object"/>
+
+</deployment>

Deleted: projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/resources/org/jboss/test/deployers/test/JBossDeploymentTestCase.xml
===================================================================
--- projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/resources/org/jboss/test/deployers/test/JBossDeploymentTestCase.xml	2010-07-12 07:49:14 UTC (rev 106574)
+++ projects/weld-int/branches/Deployment_WELDINT-1/deployer/src/test/resources/org/jboss/test/deployers/test/JBossDeploymentTestCase.xml	2010-07-12 08:14:45 UTC (rev 106575)
@@ -1,33 +0,0 @@
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-  <bean name="EarStructure" class="org.jboss.test.deployers.vfs.structure.ear.support.MockEarStructureDeployer"/>
-  <bean name="WarStructure" class="org.jboss.test.deployers.vfs.structure.war.support.MockWarStructureDeployer"/>
-  <bean name="WarClassLoader" class="org.jboss.test.deployers.vfs.reflect.support.MockWarClassLoaderDeployer"/>
-
-  <bean name="JWBMDDeployer" class="org.jboss.weld.integration.deployer.ext.JBossWeldMetaDataDeployer"/>
-  <bean name="WBFilesDeployer" class="org.jboss.weld.integration.deployer.metadata.WeldFilesDeployer"/>
-  <bean name="ArchiveInfoDeployer" class="org.jboss.weld.integration.deployer.env.ArchiveInfoDeployer"/>
-  <bean name="ArchiveDiscoveryDeployer" class="org.jboss.weld.integration.deployer.env.ArchiveDiscoveryDeployer"/>
-
-  <beanfactory name="JBossEjbServices" class="org.jboss.test.deployers.support.MockEmptyEjbServices"/>
-
-  <bean name="EjbServicesDeployer" class="org.jboss.weld.integration.deployer.env.EjbServicesDeployer">
-    <property name="ejbServicesClassName">org.jboss.test.deployers.support.MockEmptyEjbServices</property>
-  </bean>
-
-  <!-- Target of the Test -->
-  <bean name="DeploymentDeployer" class="org.jboss.weld.integration.deployer.env.JBossDeploymentDeployer"/>
-
-  <bean name="BootDeployer" class="org.jboss.test.deployers.support.deployer.MockBootDeployer"/>
-
-  <bean name="DynamicDependencyCreator" class="org.jboss.weld.integration.deployer.env.DynamicDependencyCreator">
-    <constructor>
-      <parameter><inject bean="jboss.kernel:service=KernelController"/></parameter>
-    </constructor>
-  </bean>
-
-  <bean name="JBossTransactionServices" class="org.jboss.test.deployers.support.MockTransactionServices"/>
-
-  <bean name="RealTransactionManager" class="java.lang.Object"/>
-
-</deployment>

