[jboss-cvs] JBossAS SVN: r101403 - in projects/kernel/branches/jsr330/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc: test and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: kabir.khan at jboss.com
Date: 2010-02-24 10:13:48 -0500 (Wed, 24 Feb 2010)
New Revision: 101403

Added:
   projects/kernel/branches/jsr330/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanInjectedFromWeldAndMcFields.java
Modified:
   projects/kernel/branches/jsr330/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/test/InjectWeldInMcBeansTestCase.java
Log:
Test injection from both weld and mc into mc

Added: projects/kernel/branches/jsr330/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanInjectedFromWeldAndMcFields.java
===================================================================
--- projects/kernel/branches/jsr330/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanInjectedFromWeldAndMcFields.java	                        (rev 0)
+++ projects/kernel/branches/jsr330/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanInjectedFromWeldAndMcFields.java	2010-02-24 15:13:48 UTC (rev 101403)
@@ -0,0 +1,50 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, 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.kernel.weld.wbtomc.support;
+
+import javax.inject.Inject;
+
+import org.jboss.kernel.weld.metadata.api.annotations.Weld;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class McBeanInjectedFromWeldAndMcFields
+{
+   @Inject 
+   public Simple simple;
+   
+   @Weld @Inject 
+   public WebBean webBean;
+
+   public Simple getSimple()
+   {
+      return simple;
+   }
+
+   public WebBean getWebBean()
+   {
+      return webBean;
+   }
+}

Modified: projects/kernel/branches/jsr330/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/test/InjectWeldInMcBeansTestCase.java
===================================================================
--- projects/kernel/branches/jsr330/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/test/InjectWeldInMcBeansTestCase.java	2010-02-24 15:00:04 UTC (rev 101402)
+++ projects/kernel/branches/jsr330/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/test/InjectWeldInMcBeansTestCase.java	2010-02-24 15:13:48 UTC (rev 101403)
@@ -57,6 +57,7 @@
 import org.jboss.test.kernel.weld.wbtomc.support.McBean;
 import org.jboss.test.kernel.weld.wbtomc.support.McBeanAnnotationsFromMetaData;
 import org.jboss.test.kernel.weld.wbtomc.support.McBeanInitializerMethod;
+import org.jboss.test.kernel.weld.wbtomc.support.McBeanInjectedFromWeldAndMcFields;
 import org.jboss.test.kernel.weld.wbtomc.support.McBeanMcConstructor;
 import org.jboss.test.kernel.weld.wbtomc.support.McBeanWithPostConstructAndPreDestroy;
 import org.jboss.test.kernel.weld.wbtomc.support.MissingDependenciesConstructorBean;
@@ -379,6 +380,32 @@
          undeploy(context);
       }
    }
+   
+   public void testInjectFromWeldAndMc() throws Exception
+   {
+      WeldKernelControllerContext simpleContext = null;
+      WeldKernelControllerContext mcContext = null;
+      
+      try
+      {
+         simpleContext = deploy(new AbstractBeanMetaData("Simple", Simple.class.getName()));
+         AbstractBeanMetaData metaData = new AbstractBeanMetaData("McBean", McBeanInjectedFromWeldAndMcFields.class.getName());
+         metaData.setAccessMode(BeanAccessMode.ALL);
+         mcContext = deploy(metaData);
+         
+         Simple simple = assertBean("Simple", Simple.class);
+         McBeanInjectedFromWeldAndMcFields mcBean = assertBean("McBean", McBeanInjectedFromWeldAndMcFields.class);
+         
+         assertNotNull(mcBean.getSimple());
+         assertNotNull(mcBean.getWebBean());
+         assertEquals(simple, mcBean.getSimple());
+      }
+      finally
+      {
+         undeploy(mcContext);
+         undeploy(simpleContext);
+      }
+   }
 
    public class NonContextual<T> {