svn commit: r1366504 - in /openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/circular: beans/CircularApplicationScopedBean.java beans/CircularDependentScopedBean.java tests/CircularInjectionTest.java

[struberg]

Author: struberg
Date: Fri Jul 27 19:14:06 2012
New Revision: 1366504

URL: http://svn.apache.org/viewvc?rev=1366504&view=rev
Log:
fix unit test. Without touching the proxy it never gets invoked

Modified:
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/circular/beans/CircularApplicationScopedBean.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/circular/beans/CircularDependentScopedBean.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/circular/tests/CircularInjectionTest.java

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/circular/beans/CircularApplicationScopedBean.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/circular/beans/CircularApplicationScopedBean.java?rev=1366504&r1=1366503&r2=1366504&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/circular/beans/CircularApplicationScopedBean.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/circular/beans/CircularApplicationScopedBean.java
 Fri Jul 27 19:14:06 2012
@@ -21,10 +21,8 @@ package org.apache.webbeans.newtests.inj
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
-import javax.inject.Named;
 
 @ApplicationScoped
-@Named(value="org.apache.webbeans.newtests.injection.circular.beans.CircularApplicationScopedBean")
 public class CircularApplicationScopedBean
 {
     private @Inject
@@ -40,7 +38,6 @@ public class CircularApplicationScopedBe
     @PostConstruct
     public void postConstruct()
     {
-        dependent.hello();
         success = true;
     }
 

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/circular/beans/CircularDependentScopedBean.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/circular/beans/CircularDependentScopedBean.java?rev=1366504&r1=1366503&r2=1366504&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/circular/beans/CircularDependentScopedBean.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/circular/beans/CircularDependentScopedBean.java
 Fri Jul 27 19:14:06 2012
@@ -23,12 +23,10 @@ import java.io.Serializable;
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.Dependent;
 import javax.inject.Inject;
-import javax.inject.Named;
 
 import org.apache.webbeans.test.component.event.normal.Transactional;
 
 @Dependent
-@Named(value="org.apache.webbeans.newtests.injection.circular.beans.CircularDependentScopedBean")
 public class CircularDependentScopedBean implements Serializable
 {
     @Inject CircularApplicationScopedBean app;
@@ -39,7 +37,7 @@ public class CircularDependentScopedBean
     @Transactional
     public void hello()
     {
-        
+        app.hello();
     }
     
     @PostConstruct

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/circular/tests/CircularInjectionTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/circular/tests/CircularInjectionTest.java?rev=1366504&r1=1366503&r2=1366504&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/circular/tests/CircularInjectionTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/circular/tests/CircularInjectionTest.java
 Fri Jul 27 19:14:06 2012
@@ -81,16 +81,11 @@ public class CircularInjectionTest exten
         beanClasses.add(CircularApplicationScopedBean.class);
         
         startContainer(beanClasses, beanXmls);
-        
-        Set<Bean<?>> beans = 
getBeanManager().getBeans("org.apache.webbeans.newtests.injection.circular.beans.CircularDependentScopedBean");
-        Assert.assertNotNull(beans);
-        
-        Bean<CircularDependentScopedBean> dependentBean = 
(Bean<CircularDependentScopedBean>)beans.iterator().next();
-        CreationalContext<CircularDependentScopedBean> ctx = 
getBeanManager().createCreationalContext(dependentBean);
-        
-        Object reference = getBeanManager().getReference(dependentBean, 
CircularDependentScopedBean.class, ctx);
-        
+
+        CircularDependentScopedBean reference = 
getInstance(CircularDependentScopedBean.class);
         Assert.assertTrue(reference instanceof CircularDependentScopedBean);
+
+        reference.hello();
                 
         Assert.assertTrue(CircularDependentScopedBean.success);
         Assert.assertTrue(CircularApplicationScopedBean.success);