Author: veithen
Date: Tue May 21 18:54:00 2013
New Revision: 1484902
URL: http://svn.apache.org/r1484902
Log:
AXIOM-288: Fixed an issue if the first event after switching to pull-through
mode is an END_ELEMENT.
Added:
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderOnNonRootElementPartiallyBuilt.java
(with props)
Modified:
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/AbstractWrapper.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
Modified:
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/AbstractWrapper.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/AbstractWrapper.java?rev=1484902&r1=1484901&r2=1484902&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/AbstractWrapper.java
(original)
+++
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/AbstractWrapper.java
Tue May 21 18:54:00 2013
@@ -62,6 +62,10 @@ abstract class AbstractWrapper extends P
this.reader = reader;
this.serializer = serializer;
depth = startDepth;
+ // Adjust the depth if we start with an END_ELEMENT event
+ if (reader.getEventType() == XMLStreamReader.END_ELEMENT) {
+ depth--;
+ }
}
final DTDReader getDTDReader() {
Modified:
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java?rev=1484902&r1=1484901&r2=1484902&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
(original)
+++
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
Tue May 21 18:54:00 2013
@@ -287,6 +287,10 @@ public class OMTestSuiteBuilder extends
addTest(new
org.apache.axiom.ts.om.element.TestGetXMLStreamReaderCDATAEventFromParser(metaFactory));
addTest(new
org.apache.axiom.ts.om.element.TestGetXMLStreamReaderOnNonRootElement(metaFactory,
true));
addTest(new
org.apache.axiom.ts.om.element.TestGetXMLStreamReaderOnNonRootElement(metaFactory,
false));
+ for (int build=0; build<5; build++) {
+ addTest(new
org.apache.axiom.ts.om.element.TestGetXMLStreamReaderOnNonRootElementPartiallyBuilt(metaFactory,
true, build));
+ addTest(new
org.apache.axiom.ts.om.element.TestGetXMLStreamReaderOnNonRootElementPartiallyBuilt(metaFactory,
false, build));
+ }
addTest(new
org.apache.axiom.ts.om.element.TestGetXMLStreamReaderWithCaching(metaFactory));
addTest(new
org.apache.axiom.ts.om.element.TestGetXMLStreamReaderWithIncompleteDescendant(metaFactory,
true));
addTest(new
org.apache.axiom.ts.om.element.TestGetXMLStreamReaderWithIncompleteDescendant(metaFactory,
false));
Added:
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderOnNonRootElementPartiallyBuilt.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderOnNonRootElementPartiallyBuilt.java?rev=1484902&view=auto
==============================================================================
---
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderOnNonRootElementPartiallyBuilt.java
(added)
+++
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderOnNonRootElementPartiallyBuilt.java
Tue May 21 18:54:00 2013
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.ts.om.element;
+
+import java.util.Iterator;
+
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.axiom.om.OMContainer;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.util.AXIOMUtil;
+import org.apache.axiom.ts.AxiomTestCase;
+import org.apache.axiom.util.stax.debug.XMLStreamReaderValidator;
+
+/**
+ * Tests that {@link OMContainer#getXMLStreamReader(boolean)} produces the
correct sequence of
+ * events when called on an {@link OMElement} that is not the root element and
that may be partially
+ * built.
+ */
+public class TestGetXMLStreamReaderOnNonRootElementPartiallyBuilt extends
AxiomTestCase {
+ private final boolean cache;
+ private final int build;
+
+ public TestGetXMLStreamReaderOnNonRootElementPartiallyBuilt(OMMetaFactory
metaFactory, boolean cache, int build) {
+ super(metaFactory);
+ this.cache = cache;
+ this.build = build;
+ addTestParameter("cache", cache);
+ addTestParameter("build", build);
+ }
+
+ protected void runTest() throws Throwable {
+ OMElement root = AXIOMUtil.stringToOM(metaFactory.getOMFactory(),
+
"<root><child><emptyElement/><element>content</element></child></root>");
+ OMElement child = (OMElement)root.getFirstOMChild();
+
+ // Partially build the tree
+ if (build > 0) {
+ Iterator it = root.getDescendants(false);
+ for (int i=0; i<build; i++) {
+ it.next();
+ }
+ }
+
+ XMLStreamReader reader = new
XMLStreamReaderValidator(child.getXMLStreamReader(cache), true);
+ while (reader.hasNext()) {
+ reader.next();
+ }
+ }
+}
Propchange:
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderOnNonRootElementPartiallyBuilt.java
------------------------------------------------------------------------------
svn:eol-style = native
