[jboss-svn-commits] JBoss Common SVN: r2050 - in jbossxb/trunk/src/test: java/org/jboss/test/xml resources/org/jboss/test/xml

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

Author: heiko.braun at jboss.com
Date: 2006-09-21 09:46:08 -0400 (Thu, 21 Sep 2006)
New Revision: 2050

Modified:
   jbossxb/trunk/src/test/java/org/jboss/test/xml/XOPUnitTestCase.java
   jbossxb/trunk/src/test/resources/org/jboss/test/xml/XOPUnitTestCase.xsd
   jbossxb/trunk/src/test/resources/org/jboss/test/xml/XOPUnitTestCaseImageWithContentType.xml
   jbossxb/trunk/src/test/resources/org/jboss/test/xml/XOPUnitTestCaseJpeg.xml
Log:
fixed testMarshalImageWithContentType

Modified: jbossxb/trunk/src/test/java/org/jboss/test/xml/XOPUnitTestCase.java
===================================================================
--- jbossxb/trunk/src/test/java/org/jboss/test/xml/XOPUnitTestCase.java	2006-09-21 13:24:16 UTC (rev 2049)
+++ jbossxb/trunk/src/test/java/org/jboss/test/xml/XOPUnitTestCase.java	2006-09-21 13:46:08 UTC (rev 2050)
@@ -205,7 +205,7 @@
             {
                throw new IllegalStateException(e.getMessage());
 
-            }           
+            }
          }
 
          return xopObject;
@@ -534,5 +534,6 @@
       public Image awtImage;
       public Source source;
       public String string;
+      public byte[] octets;
    }
 }

Modified: jbossxb/trunk/src/test/resources/org/jboss/test/xml/XOPUnitTestCase.xsd
===================================================================
--- jbossxb/trunk/src/test/resources/org/jboss/test/xml/XOPUnitTestCase.xsd	2006-09-21 13:24:16 UTC (rev 2049)
+++ jbossxb/trunk/src/test/resources/org/jboss/test/xml/XOPUnitTestCase.xsd	2006-09-21 13:46:08 UTC (rev 2050)
@@ -24,7 +24,10 @@
 
         <xs:element name="awtImage" type="xmime:base64Binary" minOccurs="0"/>
         <xs:element name="source" type="xmime:base64Binary" minOccurs="0"/>
-        <xs:element name="string" type="xmime:base64Binary" minOccurs="0"/>        
+        <xs:element name="string" type="xmime:base64Binary" minOccurs="0"/>
+
+        <xs:element name="octets" type="xs:base64Binary" minOccurs="0"/>
+
       </xs:sequence>
     </xs:complexType>
   </xs:element>

Modified: jbossxb/trunk/src/test/resources/org/jboss/test/xml/XOPUnitTestCaseImageWithContentType.xml
===================================================================
--- jbossxb/trunk/src/test/resources/org/jboss/test/xml/XOPUnitTestCaseImageWithContentType.xml	2006-09-21 13:24:16 UTC (rev 2049)
+++ jbossxb/trunk/src/test/resources/org/jboss/test/xml/XOPUnitTestCaseImageWithContentType.xml	2006-09-21 13:46:08 UTC (rev 2050)
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<e xmlns="http://www.jboss.org/xml/test/xop"
-   xmlns:xmime="http://www.w3.org/2005/05/xmlmime">
-  <imageWithContentType xmime:contentType="image/png">
-    <xop:Include xmlns:xop="http://www.w3.org/2004/08/xop/include" href="cid:imageWithContentType"/>
-  </imageWithContentType>
-</e>
+<ns_e:e xmlns:ns_e='http://www.jboss.org/xml/test/xop'>
+  <ns_e:imageWithContentType>
+    <xop:Include href='cid:imageWithContentType' xmlns:xop='http://www.w3.org/2004/08/xop/include'></xop:Include>
+  </ns_e:imageWithContentType>
+</ns_e:e>

Modified: jbossxb/trunk/src/test/resources/org/jboss/test/xml/XOPUnitTestCaseJpeg.xml
===================================================================
--- jbossxb/trunk/src/test/resources/org/jboss/test/xml/XOPUnitTestCaseJpeg.xml	2006-09-21 13:24:16 UTC (rev 2049)
+++ jbossxb/trunk/src/test/resources/org/jboss/test/xml/XOPUnitTestCaseJpeg.xml	2006-09-21 13:46:08 UTC (rev 2050)
@@ -3,4 +3,4 @@
   <jpeg>
     <xop:Include xmlns:xop="http://www.w3.org/2004/08/xop/include" href="cid:jpeg"/>
   </jpeg>
-</e>
+</e>
\ No newline at end of file