[jboss-svn-commits] JBoss Common SVN: r2618 - 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-09 08:00:12 -0400 (Tue, 09 Oct 2007)
New Revision: 2618

Modified:
   jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/element/wrapper/support/Foo2.java
   jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/element/wrapper/test/WrapperUnitTestCase.java
   jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/element/wrapper/test/Wrapper_testFoo2Wrapper.xml
Log:
Update the wrapper tests to use multiple bar wrapper elements

Modified: jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/element/wrapper/support/Foo2.java
===================================================================
--- jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/element/wrapper/support/Foo2.java	2007-10-09 11:59:30 UTC (rev 2617)
+++ jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/element/wrapper/support/Foo2.java	2007-10-09 12:00:12 UTC (rev 2618)
@@ -19,8 +19,9 @@
 
    @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),
+      @XmlElement(name="x", required=false, type=MyNumber.class)
    })
    public void setItems(List<Number> 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-09 11:59:30 UTC (rev 2617)
+++ jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/element/wrapper/test/WrapperUnitTestCase.java	2007-10-09 12:00:12 UTC (rev 2618)
@@ -22,15 +22,24 @@
       //enableTrace("org.jboss.xb");
       Foo foo = unmarshalObject(Foo.class);
       List<Number> items = foo.getItems();
-      assertEquals(3, items.size());
+      assertEquals(4, items.size());
+      assertEquals(1, items.get(0));
+      assertEquals(2, items.get(1));
+      assertEquals(new Float(1.1), items.get(2));
+      assertEquals(new MyNumber("123456789"), items.get(3));
    }
-   
+
    public void testFoo2Wrapper()
       throws Exception
    {
       Foo2 foo = unmarshalObject(Foo2.class);
       List<Number> items = foo.getItems();
-      assertEquals(3, items.size());
+      assertEquals(4, items.size());
+      assertEquals(4, items.size());
+      assertEquals(1, items.get(0));
+      assertEquals(2, items.get(1));
+      assertEquals(new Float(1.1), items.get(2));
+      assertEquals(new MyNumber("123456789"), items.get(3));
    }
    
    public void testFoo3Wrapper()

Modified: jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/element/wrapper/test/Wrapper_testFoo2Wrapper.xml
===================================================================
--- jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/element/wrapper/test/Wrapper_testFoo2Wrapper.xml	2007-10-09 11:59:30 UTC (rev 2617)
+++ jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/element/wrapper/test/Wrapper_testFoo2Wrapper.xml	2007-10-09 12:00:12 UTC (rev 2618)
@@ -3,7 +3,14 @@
 <foo2>
   <bar>
     <int>1</int>
-    <int>2</int>
-    <float>1.1</float>
   </bar>
+  <bar>
+    <int>2</int>    
+  </bar>
+  <bar>
+    <float>1.1</float>    
+  </bar>
+  <bar>
+    <x>123456789</x>
+  </bar>
 </foo2>