[weld-commits] Weld SVN: r4420 - in core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities: child and 1 other directories.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-10-29 15:38:03 -0400 (Thu, 29 Oct 2009)
New Revision: 4420

Modified:
   core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/ActivitiesTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/SameBeanTypeInChildActivityTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/ELCurrentActivityTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InstanceCurrentActivityTest.java
Log:
remove deprecated method from BeanManager

Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/ActivitiesTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/ActivitiesTest.java	2009-10-29 19:35:18 UTC (rev 4419)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/ActivitiesTest.java	2009-10-29 19:38:03 UTC (rev 4420)
@@ -19,6 +19,7 @@
 import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.BeanManagerImpl;
 import org.jboss.weld.bean.ForwardingBean;
 import org.jboss.weld.literal.DefaultLiteral;
 import org.jboss.weld.test.AbstractWeldTest;
@@ -190,7 +191,7 @@
    {
       assert getBeans(Cow.class).size() == 1;
       Contextual<?> bean = getBeans(Cow.class).iterator().next();
-      BeanManager childActivity = getCurrentManager().createActivity();
+      BeanManagerImpl childActivity = getCurrentManager().createActivity();
       Bean<?> dummyBean = createDummyBean(childActivity, Cow.class);
       childActivity.addBean(dummyBean);
       assert childActivity.getInjectableReference(dummyBean.getInjectionPoints().iterator().next(), childActivity.createCreationalContext(dummyBean)) != null;
@@ -237,7 +238,7 @@
    public void testBeanBelongingToChildActivityCannotBeInjectedIntoParentActivityBean()
    {
       assert getBeans(Cow.class).size() == 1;
-      BeanManager childActivity = getCurrentManager().createActivity();
+      BeanManagerImpl childActivity = getCurrentManager().createActivity();
       Bean<?> dummyBean = createDummyBean(childActivity, Cow.class);
       childActivity.addBean(dummyBean);
       assert getBeans(Object.class, new AnnotationLiteral<Tame>() {}).size() == 0;
@@ -250,7 +251,7 @@
       getCurrentManager().addContext(dummyContext);
       assert getBeans(Cow.class).size() == 1;
       final Bean<Cow> bean = getBeans(Cow.class).iterator().next();
-      BeanManager childActivity = getCurrentManager().createActivity();
+      BeanManagerImpl childActivity = getCurrentManager().createActivity();
       final Set<Annotation> bindingTypes = new HashSet<Annotation>();
       bindingTypes.add(new AnnotationLiteral<Tame>() {});
       childActivity.addBean(new ForwardingBean<Cow>()

Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/SameBeanTypeInChildActivityTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/SameBeanTypeInChildActivityTest.java	2009-10-29 19:35:18 UTC (rev 4419)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/SameBeanTypeInChildActivityTest.java	2009-10-29 19:38:03 UTC (rev 4420)
@@ -15,8 +15,8 @@
 import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.BeanManagerImpl;
 import org.jboss.weld.literal.DefaultLiteral;
-import org.jboss.weld.manager.api.WeldManager;
 import org.jboss.weld.test.AbstractWeldTest;
 import org.testng.annotations.Test;
 
@@ -107,7 +107,7 @@
    @Test(groups = { "broken" }, expectedExceptions = { InjectionException.class })
    public void testSameBeanTypeInChildAsParentInjection()
    {
-      BeanManager childActivity = getCurrentManager().createActivity();
+      BeanManagerImpl childActivity = getCurrentManager().createActivity();
       Bean<?> anotherMyBean = createDummyBean(childActivity);
       childActivity.addBean(anotherMyBean);
    }
@@ -115,8 +115,8 @@
    @Test(groups = { "broken" }, expectedExceptions = { InjectionException.class })
    public void testSameBeanTypeInChildAsIndirectParentInjection()
    {
-      WeldManager childActivity = getCurrentManager().createActivity();
-      WeldManager grandChildActivity = childActivity.createActivity();
+      BeanManagerImpl childActivity = getCurrentManager().createActivity();
+      BeanManagerImpl grandChildActivity = childActivity.createActivity();
       Bean<?> anotherMyBean = createDummyBean(grandChildActivity);
       grandChildActivity.addBean(anotherMyBean);
    }

Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/ELCurrentActivityTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/ELCurrentActivityTest.java	2009-10-29 19:35:18 UTC (rev 4419)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/ELCurrentActivityTest.java	2009-10-29 19:38:03 UTC (rev 4420)
@@ -16,7 +16,7 @@
 import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.manager.api.WeldManager;
+import org.jboss.weld.BeanManagerImpl;
 import org.jboss.weld.test.AbstractWeldTest;
 import org.testng.annotations.Test;
 
@@ -150,7 +150,7 @@
       Context dummyContext = new DummyContext();
       getCurrentManager().addContext(dummyContext);
       assert getBeans(Cow.class).size() == 1;
-      WeldManager childActivity = getCurrentManager().createActivity();
+      BeanManagerImpl childActivity = getCurrentManager().createActivity();
       childActivity.addBean(new Daisy(childActivity));
       childActivity.setCurrent(dummyContext.getScope());
       assert evaluateValueExpression("#{daisy}", Cow.class) != null;

Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InstanceCurrentActivityTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InstanceCurrentActivityTest.java	2009-10-29 19:35:18 UTC (rev 4419)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InstanceCurrentActivityTest.java	2009-10-29 19:38:03 UTC (rev 4420)
@@ -16,7 +16,7 @@
 import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.manager.api.WeldManager;
+import org.jboss.weld.BeanManagerImpl;
 import org.jboss.weld.test.AbstractWeldTest;
 import org.testng.annotations.Test;
 
@@ -158,7 +158,7 @@
       Context dummyContext = new DummyContext();
       getCurrentManager().addContext(dummyContext);
       assert getBeans(Cow.class).size() == 1;
-      WeldManager childActivity = getCurrentManager().createActivity();
+      BeanManagerImpl childActivity = getCurrentManager().createActivity();
       childActivity.addBean(new Daisy(childActivity));
       childActivity.setCurrent(dummyContext.getScope());
       assert createContextualInstance(Field.class).get() != null;