[Jboss-cvs] JBossAS SVN: r57065 - trunk/testsuite/src/main/org/jboss/test/xml

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

Author: alex.loubyansky at jboss.com
Date: 2006-09-22 04:30:07 -0400 (Fri, 22 Sep 2006)
New Revision: 57065

Modified:
   trunk/testsuite/src/main/org/jboss/test/xml/XOPUnitTestCase.java
Log:
Heiko's changes

Modified: trunk/testsuite/src/main/org/jboss/test/xml/XOPUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/xml/XOPUnitTestCase.java	2006-09-22 07:52:33 UTC (rev 57064)
+++ trunk/testsuite/src/main/org/jboss/test/xml/XOPUnitTestCase.java	2006-09-22 08:30:07 UTC (rev 57065)
@@ -21,31 +21,30 @@
   */
 package org.jboss.test.xml;
 
-import java.awt.*;
-import java.awt.image.ImageObserver;
-import java.awt.image.ImageProducer;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.Arrays;
-import javax.xml.transform.Source;
-import javax.activation.DataHandler;
-import javax.activation.DataSource;
-
 import org.jboss.xb.binding.Unmarshaller;
 import org.jboss.xb.binding.UnmarshallerFactory;
 import org.jboss.xb.binding.sunday.marshalling.MarshallerImpl;
 import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
 import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding;
 import org.jboss.xb.binding.sunday.unmarshalling.XsdBinder;
-import org.jboss.xb.binding.sunday.xop.SimpleDataSource;
 import org.jboss.xb.binding.sunday.xop.XOPMarshaller;
-import org.jboss.xb.binding.sunday.xop.XOPUnmarshaller;
 import org.jboss.xb.binding.sunday.xop.XOPObject;
+import org.jboss.xb.binding.sunday.xop.XOPUnmarshaller;
+import org.jboss.xb.binding.sunday.xop.SimpleDataSource;
 import org.xml.sax.SAXException;
 
+import javax.xml.transform.Source;
+import javax.activation.DataSource;
+import java.awt.*;
+import java.awt.image.ImageObserver;
+import java.awt.image.ImageProducer;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.Arrays;
 
+
 /**
  * @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
  * @version <tt>$Revision$</tt>
@@ -53,10 +52,10 @@
 public class XOPUnitTestCase
    extends AbstractJBossXBTest
 {
-	   public XOPUnitTestCase(String name)
-	   {
-	      super(name);
-	   }
+	public XOPUnitTestCase(String name)
+	{
+	   super(name);
+	}
 
    private static final XOPMarshaller NULLCID_XOP_MARSH = new XOPMarshaller()
    {
@@ -168,8 +167,6 @@
       }
    };
 
-   private static DataHandler DATA_HANDLER = new DataHandler(SOURCE, "application/xml");
-
    private static final XOPUnmarshaller XOP_ENABLED_UNMARSH = new XOPUnmarshaller()
    {
       public boolean isXOPPackage()
@@ -188,24 +185,17 @@
          }
          else if(cid.endsWith("source"))
          {
-            try
-            {
-               xopObject = new XOPObject(DATA_HANDLER.getContent());
-               xopObject.setContentType(DATA_HANDLER.getContentType());
-            }
-            catch (IOException e)
-            {
-               throw new IllegalStateException(e.getMessage());
-            }
+            xopObject = new XOPObject(SOURCE);
+            xopObject.setContentType("application/xml");
          }
          else if(cid.endsWith("string"))
          {
             xopObject = new XOPObject("string");
             xopObject.setContentType("text/xml");
          }
-         else if(cid.endsWith("dataHandler"))
+         else if(cid.endsWith("octets"))
          {
-            xopObject = new XOPObject(DATA_HANDLER);
+            xopObject = new XOPObject("octets".getBytes());
             xopObject.setContentType("application/octet-stream");
          }
          else
@@ -219,9 +209,10 @@
             catch (IOException e)
             {
                throw new IllegalStateException(e.getMessage());
+
             }
          }
-         
+
          return xopObject;
       }
 
@@ -440,11 +431,25 @@
       assertXmlEqual(getOptimizedXml("string"), marshalled);
    }
 
-   public void testUnmarshalString() throws Exception
+   /**
+    * Test a simple xsd:base64Binary declaration
+    */
+   public void testMarshalOctets() throws Exception
    {
+      E e = new E();
+      e.octets = "octets".getBytes();
+      String marshalled = marshal(XOP_ENABLED_MARSH, e);
+      assertXmlEqual(getOptimizedXml("octets"), marshalled);
+   }
+
+    /**
+    * Test unmarshalling of a simple xsd:base64Binary declaration
+    */
+    public void testUnmarshalOctets() throws Exception
+   {
       SCHEMA.setXopUnmarshaller(XOP_ENABLED_UNMARSH);
 
-      String xml = getOptimizedXml("string");
+      String xml = getOptimizedXml("octets");
 
       Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
       Object o = unmarshaller.unmarshal(new StringReader(xml), SCHEMA);
@@ -453,23 +458,15 @@
       assertTrue(o instanceof E);
 
       E e = (E)o;
-      assertNotNull(e.string);
-      assertEquals("string", e.string);
+      assertNotNull(e.octets);
+      assertEquals("octets", new String(e.octets));
    }
 
-   public void testMarshalDataHandler() throws Exception
+   public void testUnmarshalString() throws Exception
    {
-      E e = new E();
-      e.dataHandler = DATA_HANDLER;
-      String marshalled = marshal(XOP_ENABLED_MARSH, e);
-      assertXmlEqual(getOptimizedXml("dataHandler"), marshalled);
-   }
-
-   public void testUnmarshalDataHandler() throws Exception
-   {
       SCHEMA.setXopUnmarshaller(XOP_ENABLED_UNMARSH);
 
-      String xml = getOptimizedXml("dataHandler");
+      String xml = getOptimizedXml("string");
 
       Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
       Object o = unmarshaller.unmarshal(new StringReader(xml), SCHEMA);
@@ -478,11 +475,8 @@
       assertTrue(o instanceof E);
 
       E e = (E)o;
-      assertNotNull(e.dataHandler);
-      Object content = e.dataHandler.getContent();
-      assertNotNull(content);
-      assertTrue(content instanceof Source);
-      assertEquals(SOURCE.getSystemId(), ((Source)content).getSystemId());
+      assertNotNull(e.string);
+      assertEquals("string", e.string);
    }
 
    public void testTopLevelUnmarshalling() throws Exception
@@ -576,6 +570,6 @@
       public Image awtImage;
       public Source source;
       public String string;
-      public DataHandler dataHandler;
+      public byte[] octets;
    }
 }