Improve test and cause it to run

weld · Nov 3, 2009 · 15ba677 · 15ba677
1 parent 8465867
commit 15ba677
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 6 deletions.
diff --git a/.../test/java/org/jboss/weld/test/unit/deployment/structure/nonTransitiveResolution/Bar.java b/.../test/java/org/jboss/weld/test/unit/deployment/structure/nonTransitiveResolution/Bar.java
@@ -1,15 +1,28 @@
 package org.jboss.weld.test.unit.deployment.structure.nonTransitiveResolution;
 
+import javax.enterprise.inject.New;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.inject.Inject;
 
 public class Bar
 {
 
-   @Inject Foo foo;
+   @Inject private Foo foo;
+
+   // Inject the bean manager to make sure the bean is intranstive
+   @Inject private BeanManager beanManager;
+
+   // Inject the @New bean to make sure the bean is intranstive   
+   @Inject @New String str;
 
    public Foo getFoo()
    {
       return foo;
    }
+
+   public BeanManager getBeanManager()
+   {
+      return beanManager;
+   }
 
 }
diff --git a/.../test/java/org/jboss/weld/test/unit/deployment/structure/nonTransitiveResolution/Foo.java b/.../test/java/org/jboss/weld/test/unit/deployment/structure/nonTransitiveResolution/Foo.java
@@ -1,6 +1,21 @@
 package org.jboss.weld.test.unit.deployment.structure.nonTransitiveResolution;
 
+import javax.enterprise.inject.New;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
+
 public class Foo
 {
-
+
+   // Inject the bean manager to make sure the bean is intranstive  
+   @Inject private BeanManager beanManager;
+
+   // Inject the @New bean to make sure the bean is intranstive
+   @Inject @New String str;
+
+   public BeanManager getBeanManager()
+   {
+      return beanManager;
+   }
+
 }
diff --git a/...solution/NonTransitiveResolutionTest.java → ...eResolution/TransitiveResolutionTest.java b/...solution/NonTransitiveResolutionTest.java → ...eResolution/TransitiveResolutionTest.java
@@ -9,11 +9,11 @@
 import org.jboss.weld.mock.TestContainer;
 import org.testng.annotations.Test;
 
-public class NonTransitiveResolutionTest
+public class TransitiveResolutionTest
 {
 
    @Test(description="WELD-236")
-   public void test()
+   public void testTypicalEarStructure()
    { 
 
       // Create the BDA in which we will deploy Foo. This is equivalent to a ejb jar
@@ -41,8 +41,19 @@ public BeanDeploymentArchive loadBeanDeploymentArchive(Class<?> beanClass)
       container.startContainer();
       container.ensureRequestActive();
 
-      // Get the bean manager for bda1 and bda2
-      BeanManagerImpl beanManager1 = container.getBeanManager();
+      // Get the bean manager for war and ejb jar
+      BeanManagerImpl warBeanManager = container.getBeanManager();
+      BeanManagerImpl ejbJarBeanManager = container.getLifecycle().getBootstrap().getManager(ejbJar);
+
+      assert warBeanManager.getBeans(Bar.class).size() == 1;
+      assert warBeanManager.getBeans(Foo.class).size() == 1;
+      assert ejbJarBeanManager.getBeans(Foo.class).size() == 1;
+      assert ejbJarBeanManager.getBeans(Bar.class).size() == 0;
+      Bar bar = warBeanManager.getInstanceByType(Bar.class);
+      assert bar.getFoo() != null;
+      assert bar.getBeanManager() != null;
+      assert bar.getBeanManager().equals(warBeanManager);
+      assert bar.getFoo().getBeanManager().equals(ejbJarBeanManager);
    }
 
 }
diff --git a/tests/unit-tests.xml b/tests/unit-tests.xml
@@ -38,6 +38,7 @@
          <package name="org.jboss.weld.test.unit.definition" />
          <package name="org.jboss.weld.test.unit.deployment.structure.extensions" />
          <package name="org.jboss.weld.test.unit.deployment.structure.resolution" />
+         <package name="org.jboss.weld.test.unit.deployment.structure.nonTransitiveResolution" />
          <package name="org.jboss.weld.test.unit.environments.servlet" />
          <package name="org.jboss.weld.test.unit.extensions" />
          <package name="org.jboss.weld.test.unit.implementation" />