[jboss-svn-commits] JBoss Common SVN: r2612 - 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-07 09:41:41 -0400 (Sun, 07 Oct 2007)
New Revision: 2612

Added:
   jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/element/wrapper/support/MyNumber.java
Modified:
   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/test/WrapperUnitTestCase.java
   jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/element/wrapper/test/Wrapper_testFoo3Wrapper.xml
Log:
Add a non-simple child type to JBossXmlChild tests

Modified: 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	2007-10-06 13:08:06 UTC (rev 2611)
+++ jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/element/wrapper/support/Bar.java	2007-10-07 13:41:41 UTC (rev 2612)
@@ -18,6 +18,7 @@
 ({
    @JBossXmlChild(name="int", type=Integer.class),
    @JBossXmlChild(name="float", type=Float.class),
+   @JBossXmlChild(name="x", type=MyNumber.class),
 })
 public class Bar
 {

Added: jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/element/wrapper/support/MyNumber.java
===================================================================
--- jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/element/wrapper/support/MyNumber.java	                        (rev 0)
+++ jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/element/wrapper/support/MyNumber.java	2007-10-07 13:41:41 UTC (rev 2612)
@@ -0,0 +1,70 @@
+package org.jboss.test.xb.builder.object.element.wrapper.support;
+
+import javax.xml.bind.annotation.XmlValue;
+
+public class MyNumber extends Number
+{
+   private String x;
+
+   public MyNumber()
+   {
+      this(null);
+   }
+   public MyNumber(String x)
+   {
+      this.x = x;
+   }
+
+   @Override
+   public double doubleValue()
+   {
+      return 0;
+   }
+
+   @Override
+   public float floatValue()
+   {
+      return 0;
+   }
+
+   @Override
+   public int intValue()
+   {
+      return 0;
+   }
+
+   @Override
+   public long longValue()
+   {
+      return 0;
+   }
+   public String getX()
+   {
+      return x;
+   }
+   @XmlValue
+   public void setX(String x)
+   {
+      this.x = x;
+   }
+   @Override
+   public boolean equals(Object obj)
+   {
+      if (obj instanceof MyNumber)
+         return false;
+      MyNumber n = (MyNumber) obj;
+      return x.equals(n.x);
+   }
+   @Override
+   public int hashCode()
+   {
+      return x.hashCode();
+   }
+   @Override
+   public String toString()
+   {
+      return "MyNumber("+x+")";
+   }
+
+   
+}

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:08:06 UTC (rev 2611)
+++ jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/element/wrapper/test/WrapperUnitTestCase.java	2007-10-07 13:41:41 UTC (rev 2612)
@@ -7,6 +7,7 @@
 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;
+import org.jboss.test.xb.builder.object.element.wrapper.support.MyNumber;
 
 public class WrapperUnitTestCase extends AbstractBuilderTest
 {
@@ -35,12 +36,14 @@
    {
       Foo3 foo = unmarshalObject(Foo3.class);
       List<Bar> items = foo.getItems();
-      assertEquals(3, items.size());
+      assertEquals(4, 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));
+      Bar bar3 = items.get(3);
+      assertEquals(bar3.getValue(), new MyNumber("123456789"));
    }
 }

Modified: 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	2007-10-06 13:08:06 UTC (rev 2611)
+++ jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/element/wrapper/test/Wrapper_testFoo3Wrapper.xml	2007-10-07 13:41:41 UTC (rev 2612)
@@ -10,4 +10,7 @@
 	<bar>
 		<float>1.1</float>
 	</bar>
+	<bar>
+		<x>123456789</x>
+	</bar>
 </foo3>