Author: scheu
Date: Mon May 12 06:25:45 2008
New Revision: 655496
URL: http://svn.apache.org/viewvc?rev=655496&view=rev
Log:
Made the OMStAXWrapperTest more robust. The IBM parser had an extra CHARACTERS
event, this is now accomodated by a slight rework in the test logic.
This problem was discovered by Richard Slade.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/llom/OMStAXWrapperTest.java
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/llom/OMStAXWrapperTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/llom/OMStAXWrapperTest.java?rev=655496&r1=655495&r2=655496&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/llom/OMStAXWrapperTest.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/llom/OMStAXWrapperTest.java
Mon May 12 06:25:45 2008
@@ -45,8 +45,14 @@
// Get the XMLStreamReader for the element. This will return an
OMStAXWrapper.
XMLStreamReader reader2 = element.getXMLStreamReader();
// Check the sequence of events
- assertEquals(XMLStreamReader.START_ELEMENT, reader2.next());
- assertEquals(XMLStreamReader.CDATA, reader2.next());
+ int event = reader2.next();
+ assertEquals(XMLStreamReader.START_ELEMENT, event);
+
+ while (reader2.hasNext() && event != XMLStreamReader.CDATA) {
+ event = reader2.next();
+ }
+
+ assertEquals(XMLStreamReader.CDATA, event);
assertEquals("test", reader2.getText()); // WSCOMMONS-341
assertTrue(Arrays.equals("test".toCharArray(),
reader2.getTextCharacters())); // WSCOMMONS-338
assertEquals(XMLStreamReader.END_ELEMENT, reader2.next());