You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by ch...@apache.org on 2006/09/06 13:34:30 UTC

svn commit: r440693 - in /webservices/commons/trunk/modules/axiom/modules: axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMStAXWrapper.java axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest.java

Author: chinthaka
Date: Wed Sep  6 04:34:29 2006
New Revision: 440693

URL: http://svn.apache.org/viewvc?view=rev&rev=440693
Log:
Fixing a faulty test case which just serialized to the output stream

Modified:
    webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMStAXWrapper.java
    webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest.java

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMStAXWrapper.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMStAXWrapper.java?view=diff&rev=440693&r1=440692&r2=440693
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMStAXWrapper.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMStAXWrapper.java Wed Sep  6 04:34:29 2006
@@ -16,15 +16,7 @@
 
 package org.apache.axiom.om.impl.llom;
 
-import org.apache.axiom.om.OMAttribute;
-import org.apache.axiom.om.OMComment;
-import org.apache.axiom.om.OMContainer;
-import org.apache.axiom.om.OMDocument;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.OMText;
-import org.apache.axiom.om.OMXMLParserWrapper;
+import org.apache.axiom.om.*;
 import org.apache.axiom.om.impl.EmptyOMLocation;
 import org.apache.axiom.om.impl.exception.OMStreamingException;
 import org.apache.axiom.om.impl.llom.util.NamespaceContextImpl;
@@ -35,11 +27,7 @@
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Stack;
+import java.util.*;
 
 /**
  * Note  - This class also implements the streaming constants interface

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest.java?view=diff&rev=440693&r1=440692&r2=440693
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest.java Wed Sep  6 04:34:29 2006
@@ -23,11 +23,10 @@
 import org.apache.axiom.om.impl.serialize.StreamingOMSerializer;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
 
 import javax.xml.stream.*;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileReader;
+import java.io.*;
 
 public class OMSerializerTest extends AbstractTestCase {
     private XMLStreamReader reader;
@@ -50,8 +49,6 @@
 //                        createXMLStreamWriter(new FileOutputStream(tempFile));
 
 
-
-
     }
 
     public void testRawSerializer() throws Exception {
@@ -88,31 +85,36 @@
     }
 
     public void testElementPullStream1WithCacheOff() throws Exception {
-        OMXMLParserWrapper builder = OMXMLBuilderFactory.createStAXSOAPModelBuilder(
-                OMAbstractFactory.getSOAP11Factory(),
-                reader);
+
+        StAXSOAPModelBuilder soapBuilder = new StAXSOAPModelBuilder(reader, null);
         ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
         writer =
                 XMLOutputFactory.newInstance().
                         createXMLStreamWriter(byteArrayOutputStream);
 
-        SOAPEnvelope env = (SOAPEnvelope) builder.getDocumentElement();
+        SOAPEnvelope env = (SOAPEnvelope) soapBuilder.getDocumentElement();
         env.serializeAndConsume(writer);
         writer.flush();
 
         String outputString = new String(byteArrayOutputStream.toByteArray());
         assertTrue(outputString != null && !"".equals(outputString) && outputString.length() > 1);
 
+        writer =
+                XMLOutputFactory.newInstance().
+                        createXMLStreamWriter(byteArrayOutputStream);
+
+        StringWriter stringWriter = new StringWriter();
+
         //now we should not be able to serilaize anything ! this should throw
         //an error
         try {
-           env.serializeAndConsume(writer);
-           fail();
+            env.serializeAndConsume(writer);
+            fail();
         } catch (XMLStreamException e) {
-            e.printStackTrace();
-           assertTrue(true);
+            e.printStackTrace(new PrintWriter(stringWriter, true));
+            assertTrue(stringWriter.toString().indexOf("problem accessing the parser. Parser already accessed!") > -1);
         } catch (Exception e) {
-           assertTrue(true);
+            fail("Expecting an XMLStreamException " + e.getMessage());
         }
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: commons-dev-help@ws.apache.org