[Jboss-cvs] JBossAS SVN: r56312 - in projects/microcontainer/trunk/kernel/src: main/org/jboss/beans/metadata/plugins resources/org/jboss/test/kernel/inject/test tests/org/jboss/test/kernel/inject/test

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

Author: alesj
Date: 2006-08-27 06:52:59 -0400 (Sun, 27 Aug 2006)
New Revision: 56312

Modified:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractMapMetaData.java
   projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/inject/test/PropertyContextualInjection.xml
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/test/PropertyContextualInjectionTestCase.java
Log:
Fixed map injection.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractMapMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractMapMetaData.java	2006-08-27 10:26:38 UTC (rev 56311)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractMapMetaData.java	2006-08-27 10:52:59 UTC (rev 56312)
@@ -190,7 +190,6 @@
 
    public Class getType(MetaDataVisitor visitor, MetaDataVisitorNode previous) throws Throwable
    {
-      // todo equality on cloned nodes
       if (keyType != null)
       {
          for(MetaDataVisitorNode key : keySet())

Modified: projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/inject/test/PropertyContextualInjection.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/inject/test/PropertyContextualInjection.xml	2006-08-27 10:26:38 UTC (rev 56311)
+++ projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/inject/test/PropertyContextualInjection.xml	2006-08-27 10:52:59 UTC (rev 56312)
@@ -20,10 +20,9 @@
       </property>
    </bean>
 
-<!--
    <bean name="testObject4" class="org.jboss.test.kernel.inject.support.PropertyInjectTestObject">
       <property name="map">
-         <map key="org.jboss.test.kernel.inject.support.TesterInterface" valueClass="org.jboss.test.kernel.inject.support.TesterInterface">
+         <map keyClass="org.jboss.test.kernel.inject.support.TesterInterface" valueClass="org.jboss.test.kernel.inject.support.TesterInterface">
             <entry>
                <key><inject/></key>
                <value><inject/></value>
@@ -32,6 +31,7 @@
       </property>
    </bean>
 
+   <!--
    <bean name="testObject5" class="org.jboss.test.kernel.inject.support.PropertyInjectTestObject">
       <property name="map">
          <map>

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/test/PropertyContextualInjectionTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/test/PropertyContextualInjectionTestCase.java	2006-08-27 10:26:38 UTC (rev 56311)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/test/PropertyContextualInjectionTestCase.java	2006-08-27 10:52:59 UTC (rev 56312)
@@ -53,7 +53,10 @@
       assertNotNull(test2.getDuplicateTester());
 
       PropertyInjectTestObject test3 = (PropertyInjectTestObject) getBean("testObject3");
-      assertFalse(test3.getCollection().isEmpty());      
+      assertFalse(test3.getCollection().isEmpty());
+
+      PropertyInjectTestObject test4 = (PropertyInjectTestObject) getBean("testObject4");
+      assertFalse(test4.getMap().isEmpty());      
    }
 
 }