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

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

Author: scott.stark at jboss.org
Date: 2007-10-06 09:08:06 -0400 (Sat, 06 Oct 2007)
New Revision: 2611

Added:
   jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/element/wrapper/support/Bar.java
   jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/element/wrapper/support/Foo3.java
   jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/element/wrapper/test/Wrapper_testFoo3Wrapper.xml
Modified:
   jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/element/wrapper/support/Foo.java
   jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/element/wrapper/test/WrapperUnitTestCase.java
Log:
Test using JBossXmlChild to pass in a choice to a non-collection type

Added: jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/element/wrapper/support/Bar.java
===================================================================
--- jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/element/wrapper/support/Bar.java	                        (rev 0)
+++ jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/element/wrapper/support/Bar.java	2007-10-06 13:08:06 UTC (rev 2611)
@@ -0,0 +1,35 @@
+package org.jboss.test.xb.builder.object.element.wrapper.support;
+
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.xb.annotations.JBossXmlChild;
+import org.jboss.xb.annotations.JBossXmlChildren;
+
+/**
+ * Wrapper for numbers used by Foo
+ * @author Scott.Stark at jboss.org
+ * @version $Revision:$
+ */
+ at XmlType
+ at JBossXmlChildren
+({
+   @JBossXmlChild(name="int", type=Integer.class),
+   @JBossXmlChild(name="float", type=Float.class),
+})
+public class Bar
+{
+   private Number value;
+
+   public Number getValue()
+   {
+      return value;
+   }
+
+   public void setValue(Number value)
+   {
+      this.value = value;
+   }
+}

Modified: jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/element/wrapper/support/Foo.java
===================================================================
--- jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/element/wrapper/support/Foo.java	2007-10-06 13:07:08 UTC (rev 2610)
+++ jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/element/wrapper/support/Foo.java	2007-10-06 13:08:06 UTC (rev 2611)
@@ -19,8 +19,8 @@
 
    @XmlElementWrapper(name="bar")
    @XmlElements({
-       @XmlElement(name="int", type=Integer.class),
-       @XmlElement(name="float", type=Float.class)
+       @XmlElement(name="int", required=false, type=Integer.class),
+       @XmlElement(name="float", required=false, type=Float.class)
    })
    public void setItems(List items)
    {

Added: jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/element/wrapper/support/Foo3.java
===================================================================
--- jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/element/wrapper/support/Foo3.java	                        (rev 0)
+++ jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/element/wrapper/support/Foo3.java	2007-10-06 13:08:06 UTC (rev 2611)
@@ -0,0 +1,23 @@
+package org.jboss.test.xb.builder.object.element.wrapper.support;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+ at XmlRootElement
+public class Foo3
+{
+   private List<Bar> items;
+
+   public List<Bar> getItems()
+   {
+      return items;
+   }
+
+   @XmlElement(name="bar")
+   public void setItems(List<Bar> items)
+   {
+      this.items = items;
+   }
+}

Modified: jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/element/wrapper/test/WrapperUnitTestCase.java
===================================================================
--- jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/element/wrapper/test/WrapperUnitTestCase.java	2007-10-06 13:07:08 UTC (rev 2610)
+++ jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/element/wrapper/test/WrapperUnitTestCase.java	2007-10-06 13:08:06 UTC (rev 2611)
@@ -3,8 +3,10 @@
 import java.util.List;
 
 import org.jboss.test.xb.builder.AbstractBuilderTest;
+import org.jboss.test.xb.builder.object.element.wrapper.support.Bar;
 import org.jboss.test.xb.builder.object.element.wrapper.support.Foo;
 import org.jboss.test.xb.builder.object.element.wrapper.support.Foo2;
+import org.jboss.test.xb.builder.object.element.wrapper.support.Foo3;
 
 public class WrapperUnitTestCase extends AbstractBuilderTest
 {
@@ -16,6 +18,7 @@
    public void testFooWrapper()
       throws Exception
    {
+      enableTrace("org.jboss.xb");
       Foo foo = unmarshalObject(Foo.class);
       List<Number> items = foo.getItems();
       assertEquals(3, items.size());
@@ -27,4 +30,17 @@
       List<Number> items = foo.getItems();
       assertEquals(3, items.size());
    }
+   public void testFoo3Wrapper()
+      throws Exception
+   {
+      Foo3 foo = unmarshalObject(Foo3.class);
+      List<Bar> items = foo.getItems();
+      assertEquals(3, items.size());
+      Bar bar0 = items.get(0);
+      assertEquals(bar0.getValue(), 1);
+      Bar bar1 = items.get(1);
+      assertEquals(bar1.getValue(), 2);
+      Bar bar2 = items.get(2);
+      assertEquals(bar2.getValue(), new Float(1.1));
+   }
 }

Added: jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/element/wrapper/test/Wrapper_testFoo3Wrapper.xml
===================================================================
--- jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/element/wrapper/test/Wrapper_testFoo3Wrapper.xml	                        (rev 0)
+++ jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/element/wrapper/test/Wrapper_testFoo3Wrapper.xml	2007-10-06 13:08:06 UTC (rev 2611)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<foo3>
+	<bar>
+		<int>1</int>
+	</bar>
+	<bar>
+		<int>2</int>
+	</bar>
+	<bar>
+		<float>1.1</float>
+	</bar>
+</foo3>