Add failing test for #42

Author: cowtowncoder

src/test/java/failing/TestBasicSax.java

@@ -36,7 +36,8 @@ public void testCData() throws Exception
         int cdatas = handler.getCDATASectionCount();
         int segments = handler.getSegmentCount();
 
-        assertEquals("Should only get a single CDATA segments, got "+cdatas+" (for "+segments+" text segments)", 1, cdatas);
+        assertEquals("Should only get a single CDATA segments, got "+cdatas+" (for "+segments+" text segments)",
+                1, cdatas);
     }
 
     /*

src/test/java/failing/TestParsingModeForEvents.java

@@ -0,0 +1,68 @@
+package failing;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.events.XMLEvent;
+
+import org.codehaus.stax2.XMLEventReader2;
+
+import com.ctc.wstx.api.WstxInputProperties;
+
+import wstxtest.stream.BaseStreamTest;
+
+public class TestParsingModeForEvents
+    extends BaseStreamTest
+{
+    final static String XML_MULTI_DOC =
+            "<?xml version='1.0'?><root>text</root><!--comment-->\n"
+            +"<?xml version='1.0'?><root>text</root>\n"
+            +"<?xml version='1.0' standalone='yes'?><root>text</root><?proc instr><!--comment-->"
+            +"<?xml version='1.0'?><root>text</root><!--comment-->"
+            ;
+
+    // [woodstox-core#42]
+    public void testMultiDocumentWithEventReader() throws XMLStreamException
+    {
+        XMLInputFactory f = getInputFactory();
+        setCoalescing(f, true);
+        f.setProperty(WstxInputProperties.P_INPUT_PARSING_MODE, WstxInputProperties.PARSING_MODE_DOCUMENTS);
+        XMLEventReader2 er = constructEventReader(f, XML_MULTI_DOC);
+
+        _checkEventDoc(er, 0);
+        _checkEventDoc(er, 1);
+        _checkEventDoc(er, 2);
+        _checkEventDoc(er, 3);
+
+        // and then the end
+        assertFalse(er.hasNextEvent());
+    }
+    
+    private void _checkEventDoc(XMLEventReader2 er, int seq) throws XMLStreamException
+    {
+        if (!er.hasNextEvent()) {
+            fail("No more events: should start document #"+seq+" in multi-doc mode");
+        }
+        XMLEvent event;
+        assertTokenType(START_DOCUMENT, er.nextEvent());
+        assertTokenType(START_ELEMENT, (event = er.nextEvent()));
+        assertEquals("root", event.asStartElement().getName().getLocalPart());
+        assertTokenType(CHARACTERS, (event = er.nextEvent()));
+        assertEquals("text", event.asCharacters().getData());
+        assertTokenType(END_ELEMENT, (event = er.nextEvent()));
+        assertEquals("root", event.asEndElement().getName().getLocalPart());
+
+        // may get other types
+        while (true) {
+            event = er.nextEvent();
+            switch (event.getEventType()) {
+            case END_DOCUMENT:
+                return;
+            case PROCESSING_INSTRUCTION:
+            case COMMENT:
+                break;
+            default:
+                fail("Unexpected XMLEvent after document: "+event);
+            }
+        }
+    }
+}

src/test/java/failing/TestW3CSchemaComplexTypes.java

@@ -14,9 +14,10 @@ public class TestW3CSchemaComplexTypes
 {
 	/**
 	 * For problem with MSV: https://github.com/kohsuke/msv/issues/2
-	 * 
+	 *
+	 * 29-Mar-2018, tatu: Oddly enough, problem itself allegedly resolved...
 	 */
-    public void testGithubIssue2() throws Exception
+    public void testMSVGithubIssue2() throws Exception
     {
         XMLValidationSchema schema = parseW3CSchema(
 "<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema' xmlns:tns='http://MySchema' elementFormDefault='qualified' targetNamespace='http://MySchema' version='1.0'>"

src/test/java/failing/W3CSchemaWriteTest.java renamed to src/test/java/stax2/vwstream/W3CSchemaWrite16Test.java

@@ -1,4 +1,4 @@
-package failing;
+package stax2.vwstream;
 
 import java.io.StringWriter;
 
@@ -9,7 +9,7 @@
 import wstxtest.vstream.BaseValidationTest;
 
 // for [woodstox-core#16]
-public class W3CSchemaWriteTest
+public class W3CSchemaWrite16Test
     extends BaseValidationTest
 {
     final static String SIMPLE_WRITE_SCHEMA =

src/test/java/stax2/vwstream/WriteValidate23Test.java renamed to src/test/java/stax2/vwstream/W3CSchemaWrite23Test.java

@@ -5,7 +5,7 @@
 import org.codehaus.stax2.XMLStreamReader2;
 import org.codehaus.stax2.XMLStreamWriter2;
 
-public class WriteValidate23Test
+public class W3CSchemaWrite23Test
     extends BaseOutputTest
 {
     public void testSchemaValidatingCopy23() throws Exception

src/test/java/wstxtest/BaseWstxTest.java

@@ -4,6 +4,7 @@
 import java.util.HashMap;
 
 import javax.xml.stream.*;
+import javax.xml.stream.events.XMLEvent;
 
 import org.codehaus.stax2.*;
 import org.codehaus.stax2.evt.*;
@@ -253,9 +254,8 @@ protected int streamThrough(XMLStreamReader sr)
             int type = sr.next();
             result += type;
             if (sr.hasText()) {
-                /* will also do basic verification for text content, to 
-                 * see that all text accessor methods return same content
-                 */
+                // will also do basic verification for text content, to 
+                // see that all text accessor methods return same content
                 result += getAndVerifyText(sr).hashCode();
             }
             if (sr.hasName()) {
@@ -352,6 +352,26 @@ protected static void assertTokenType(int expType, int actType)
         }
     }
 
+    protected static void assertTokenType(int expType, XMLEvent event)
+    {
+        if (event == null) {
+            fail("Expected event of type "+tokenTypeDesc(expType)+"; got `null`");
+        }
+        int actType = event.getEventType();
+        if (expType != actType) {
+            String expStr = tokenTypeDesc(expType);
+            String actStr = tokenTypeDesc(actType);
+
+            if (expStr == null) {
+                expStr = ""+expType;
+            }
+            if (actStr == null) {
+                actStr = ""+actType;
+            }
+            fail("Expected token "+expStr+"; got "+actStr+".");
+        }
+    }
+    
     /**
      * Helper assertion that assert that the String is either null or
      * empty ("").

src/test/java/wstxtest/stream/TestAttributeLimits.java

@@ -45,6 +45,7 @@ public void close() throws IOException { }
         } catch (XMLStreamException ex) {
             verifyException(ex, "Attribute limit (50)");
         }
+        reader.close();
     }
 
     public void testLongAttribute() throws Exception {

src/test/java/wstxtest/stream/TestParsingMode.java renamed to src/test/java/wstxtest/stream/TestParsingModeForTokens.java

@@ -1,6 +1,9 @@
 package wstxtest.stream;
 
 import javax.xml.stream.*;
+import javax.xml.stream.events.XMLEvent;
+
+import org.codehaus.stax2.XMLEventReader2;
 
 import com.ctc.wstx.api.WstxInputProperties;
 
@@ -9,7 +12,7 @@
  * (set via property {@link WstxInputProperties#P_INPUT_PARSING_MODE})
  * behave as expected
  */
-public class TestParsingMode
+public class TestParsingModeForTokens
     extends BaseStreamTest
 {
     final static String XML_SINGLE_DOC =
@@ -61,8 +64,7 @@ public void testSingleDocumentMode()
                              "Expected an exception for unbalanced xml content");
     }
 
-    public void testMultiDocumentMode()
-        throws XMLStreamException
+    public void testMultiDocumentMode() throws XMLStreamException
     {
         // First the main valid case:
         streamThroughOk(getReader(XML_MULTI_DOC,
@@ -85,7 +87,7 @@ public void testMultiDocumentMode()
 
         // And broken one not
         streamThroughFailing(getReader(XML_UNBALANCED,
-                                       WstxInputProperties.PARSING_MODE_DOCUMENTS),
+                WstxInputProperties.PARSING_MODE_DOCUMENTS),
                              "Expected an exception for unbalanced xml content");
     }