[jboss-svn-commits] JBoss Common SVN: r2702 - in jbossxb/trunk/src/test: java/org/jboss/test/xb/builder/object/jbossxmlmapentry/test and 1 other directories.

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

Author: alex.loubyansky at jboss.com
Date: 2008-01-22 18:37:49 -0500 (Tue, 22 Jan 2008)
New Revision: 2702

Added:
   jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testXmlElementWrapperMap.xml
Modified:
   jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/jbossxmlmapentry/support/Root.java
   jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntryUnitTestCase.java
Log:
JBXB-117 testcase with @XmlWrappedElement

Modified: jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/jbossxmlmapentry/support/Root.java
===================================================================
--- jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/jbossxmlmapentry/support/Root.java	2008-01-18 16:55:54 UTC (rev 2701)
+++ jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/jbossxmlmapentry/support/Root.java	2008-01-22 23:37:49 UTC (rev 2702)
@@ -24,6 +24,7 @@
 import java.util.Map;
 
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
 
 import org.jboss.xb.annotations.JBossXmlMapEntry;
@@ -183,4 +184,17 @@
    {
       this.annotatedMapWithEntryTypeKeyAttributeValueEntry = value;
    }
+   
+   @XmlElementWrapper(name="map")
+   @JBossXmlMapEntry(name = "entry")
+   @JBossXmlMapKeyAttribute(name = "key")
+   public Map<String,Integer> getXmlElementWrapperMap()
+   {
+      return this.stringToInteger;
+   }
+   
+   public void setXmlElementWrapperMap(Map<String, Integer> value)
+   {
+      this.stringToInteger = value;
+   }
 }

Modified: jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntryUnitTestCase.java
===================================================================
--- jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntryUnitTestCase.java	2008-01-18 16:55:54 UTC (rev 2701)
+++ jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntryUnitTestCase.java	2008-01-22 23:37:49 UTC (rev 2702)
@@ -116,6 +116,12 @@
       assertMapWithEntry(map);
    }
 
+   public void testXmlElementWrapperMap() throws Exception
+   {
+      Root root = unmarshalObject(Root.class);
+      assertMap(root.getXmlElementWrapperMap());
+   }
+
    private void assertMapWithEntry(Map<String, EntryTypeKeyAttributeValueEntry> map)
    {
       assertNotNull(map);

Added: jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testXmlElementWrapperMap.xml
===================================================================
--- jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testXmlElementWrapperMap.xml	                        (rev 0)
+++ jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testXmlElementWrapperMap.xml	2008-01-22 23:37:49 UTC (rev 2702)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<root>
+  <map>
+     <entry key="key1">1</entry>
+     <entry key="key2">22</entry>
+     <entry key="key3">333</entry>
+  </map>
+</root>