Moved xml autotests into new directory structure

Task-number: QTBUG-21260

Change-Id: I7bc30227d4e71e8783f274dbfa758399dca546d4
Reviewed-on: http://codereview.qt.nokia.com/4146
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>

48 files changed, 387 insertions, 0 deletions

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.ent
new file mode 100755
index 0000000000..1cff3fd44f
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.ent
@@ -0,0 +1 @@
+Data

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.xml
new file mode 100644
index 0000000000..147d70d2d1
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [

+<!ELEMENT doc (#PCDATA)>

+<!ENTITY e SYSTEM "001.ent">

+]>

+<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.xml.ref
new file mode 100644
index 0000000000..355c937e11
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.xml.ref
@@ -0,0 +1,10 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="")
+      externalEntityDecl(name="e", publicId="", systemId="001.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+      resolveEntity(publicId="", systemId="001.ent", ret={})
+      skippedEntity(name="e")
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.ent
new file mode 100755
index 0000000000..45f6d8e74e
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.ent
@@ -0,0 +1 @@
+Data
\ No newline at end of file
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.xml
new file mode 100644
index 0000000000..9eaf91724f
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [

+<!ELEMENT doc (#PCDATA)>

+<!ENTITY e SYSTEM "002.ent">

+]>

+<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.xml.ref
new file mode 100644
index 0000000000..f843995646
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.xml.ref
@@ -0,0 +1,10 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="")
+      externalEntityDecl(name="e", publicId="", systemId="002.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+      resolveEntity(publicId="", systemId="002.ent", ret={})
+      skippedEntity(name="e")
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.ent
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.ent
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.xml
new file mode 100644
index 0000000000..bb60b663ef
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [

+<!ELEMENT doc (#PCDATA)>

+<!ENTITY e SYSTEM "003.ent">

+]>

+<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.xml.ref
new file mode 100644
index 0000000000..79d3531637
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.xml.ref
@@ -0,0 +1,10 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="")
+      externalEntityDecl(name="e", publicId="", systemId="003.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+      resolveEntity(publicId="", systemId="003.ent", ret={})
+      skippedEntity(name="e")
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.ent
new file mode 100755
index 0000000000..3436f20001
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.ent
@@ -0,0 +1 @@
+Data
\ No newline at end of file
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.xml
new file mode 100644
index 0000000000..074498ce19
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [

+<!ELEMENT doc (#PCDATA)>

+<!ENTITY e SYSTEM "004.ent">

+]>

+<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.xml.ref
new file mode 100644
index 0000000000..38abcb2fc6
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.xml.ref
@@ -0,0 +1,10 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="")
+      externalEntityDecl(name="e", publicId="", systemId="004.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+      resolveEntity(publicId="", systemId="004.ent", ret={})
+      skippedEntity(name="e")
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.ent
new file mode 100755
index 0000000000..c6e97f821f
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.ent
@@ -0,0 +1 @@
+<e/><e/><e/>
\ No newline at end of file
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.xml
new file mode 100644
index 0000000000..82a6228205
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.xml
@@ -0,0 +1,6 @@
+<!DOCTYPE doc [

+<!ELEMENT doc (e*)>

+<!ELEMENT e EMPTY>

+<!ENTITY e SYSTEM "005.ent">

+]>

+<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.xml.ref
new file mode 100644
index 0000000000..2601030f2a
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.xml.ref
@@ -0,0 +1,10 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="")
+      externalEntityDecl(name="e", publicId="", systemId="005.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+      resolveEntity(publicId="", systemId="005.ent", ret={})
+      skippedEntity(name="e")
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.ent
new file mode 100755
index 0000000000..4df2f0c2ac
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.ent
@@ -0,0 +1,4 @@
+Data

+<e/>

+More data

+<e/>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.xml
new file mode 100644
index 0000000000..0b326cad4c
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.xml
@@ -0,0 +1,6 @@
+<!DOCTYPE doc [

+<!ELEMENT doc (#PCDATA|e)*>

+<!ELEMENT e EMPTY>

+<!ENTITY e SYSTEM "006.ent">

+]>

+<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.xml.ref
new file mode 100644
index 0000000000..17fd238b67
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.xml.ref
@@ -0,0 +1,10 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="")
+      externalEntityDecl(name="e", publicId="", systemId="006.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+      resolveEntity(publicId="", systemId="006.ent", ret={})
+      skippedEntity(name="e")
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.ent
new file mode 100755
index 0000000000..ab1d696dd7
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.ent
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.xml
new file mode 100644
index 0000000000..825e3b286a
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [

+<!ELEMENT doc (#PCDATA)>

+<!ENTITY e SYSTEM "007.ent">

+]>

+<doc>X&e;Z</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.xml.ref
new file mode 100644
index 0000000000..81e7ccdaf3
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.xml.ref
@@ -0,0 +1,11 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="")
+      externalEntityDecl(name="e", publicId="", systemId="007.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+      resolveEntity(publicId="", systemId="007.ent", ret={})
+      skippedEntity(name="e")
+      characters(ch="XZ")
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.ent
new file mode 100755
index 0000000000..c6ca61f9c8
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.ent
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.xml
new file mode 100644
index 0000000000..3c001b6cb3
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [

+<!ELEMENT doc (#PCDATA)>

+<!ENTITY e SYSTEM "008.ent">

+]>

+<doc>X&e;Z</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.xml.ref
new file mode 100644
index 0000000000..eb7f1086e1
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.xml.ref
@@ -0,0 +1,11 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="")
+      externalEntityDecl(name="e", publicId="", systemId="008.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+      resolveEntity(publicId="", systemId="008.ent", ret={})
+      skippedEntity(name="e")
+      characters(ch="XZ")
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.ent
new file mode 100755
index 0000000000..67c3297611
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.ent
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.xml
new file mode 100644
index 0000000000..a5866e5a77
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [

+<!ELEMENT doc (#PCDATA)>

+<!ENTITY e SYSTEM "009.ent">

+]>

+<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.xml.ref
new file mode 100644
index 0000000000..5c294de017
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.xml.ref
@@ -0,0 +1,10 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="")
+      externalEntityDecl(name="e", publicId="", systemId="009.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+      resolveEntity(publicId="", systemId="009.ent", ret={})
+      skippedEntity(name="e")
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.ent
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.ent
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.xml
new file mode 100644
index 0000000000..418e9b0141
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [

+<!ELEMENT doc (#PCDATA)>

+<!ENTITY e SYSTEM "010.ent">

+]>

+<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.xml.ref
new file mode 100644
index 0000000000..4dc03c6dba
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.xml.ref
@@ -0,0 +1,10 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="")
+      externalEntityDecl(name="e", publicId="", systemId="010.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+      resolveEntity(publicId="", systemId="010.ent", ret={})
+      skippedEntity(name="e")
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.ent
new file mode 100755
index 0000000000..b19be3a497
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.ent
@@ -0,0 +1 @@
+xyzzy

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.xml
new file mode 100644
index 0000000000..2ceefa1d21
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [

+<!ELEMENT doc (#PCDATA)>

+<!ENTITY e PUBLIC "a not very interesting file" "011.ent">

+]>

+<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.xml.ref
new file mode 100644
index 0000000000..c078139d84
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.xml.ref
@@ -0,0 +1,10 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="")
+      externalEntityDecl(name="e", publicId="a not very interesting file", systemId="011.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+      resolveEntity(publicId="a not very interesting file", systemId="011.ent", ret={})
+      skippedEntity(name="e")
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.ent
new file mode 100755
index 0000000000..8eb1fb9c41
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.ent
@@ -0,0 +1 @@
+&e4;
\ No newline at end of file
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.xml
new file mode 100644
index 0000000000..5a8f009b4a
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.xml
@@ -0,0 +1,9 @@
+<!DOCTYPE doc [

+<!ENTITY e1 "&e2;">

+<!ENTITY e2 "&e3;">

+<!ENTITY e3 SYSTEM "012.ent">

+<!ENTITY e4 "&e5;">

+<!ENTITY e5 "(e5)">

+<!ELEMENT doc (#PCDATA)>

+]>

+<doc>&e1;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.xml.ref
new file mode 100644
index 0000000000..2af77a3b99
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.xml.ref
@@ -0,0 +1,14 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="")
+      internatlEntityDecl(name="e1", value="&e2;")
+      internatlEntityDecl(name="e2", value="&e3;")
+      externalEntityDecl(name="e3", publicId="", systemId="012.ent")
+      internatlEntityDecl(name="e4", value="&e5;")
+      internatlEntityDecl(name="e5", value="(e5)")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+      resolveEntity(publicId="", systemId="012.ent", ret={})
+      skippedEntity(name="e3")
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.ent
new file mode 100755
index 0000000000..7f25c502dd
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.ent
@@ -0,0 +1 @@
+<e/>
\ No newline at end of file
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.xml
new file mode 100644
index 0000000000..7717c97afe
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.xml
@@ -0,0 +1,10 @@
+<!DOCTYPE doc [

+<!ELEMENT doc (e)>

+<!ELEMENT e (#PCDATA)>

+<!ATTLIST e

+  a1 CDATA "a1 default"

+  a2 NMTOKENS "a2 default"

+>

+<!ENTITY x SYSTEM "013.ent">

+]>

+<doc>&x;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.xml.ref
new file mode 100644
index 0000000000..92fb65a2d2
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.xml.ref
@@ -0,0 +1,12 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="")
+      attributeDecl(eName="e", aName="a1", type="", valueDefault="", value="")
+      attributeDecl(eName="e", aName="a2", type="", valueDefault="", value="")
+      externalEntityDecl(name="x", publicId="", systemId="013.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+      resolveEntity(publicId="", systemId="013.ent", ret={})
+      skippedEntity(name="x")
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.ent
new file mode 100755
index 0000000000..470fd6fe44
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.ent
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.xml
new file mode 100644
index 0000000000..816fd1e796
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [

+<!ELEMENT doc (#PCDATA)>

+<!ENTITY e SYSTEM "014.ent">

+]>

+<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.xml.ref
new file mode 100644
index 0000000000..a087786e69
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.xml.ref
@@ -0,0 +1,10 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="")
+      externalEntityDecl(name="e", publicId="", systemId="014.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+      resolveEntity(publicId="", systemId="014.ent", ret={})
+      skippedEntity(name="e")
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_1.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_1.xml
new file mode 100644
index 0000000000..e91a10895e
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_1.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<!DOCTYPE foo SYSTEM "foo.dtd" [
+    <!ENTITY def "foo">
+]>
+<foo>
+    <!-- check that the call to skippedEntity() is inserted in the right place -->
+    <a>abc&undef;gh</a>
+    <b>&undef;gh</b>
+    <c>abc&undef;</c>
+    <d>&undef;</d>
+    <e>&undef;&def;&undef;&def;</e>
+    <e>a&undef;b&def;c&undef;d&def;e</e>
+</foo>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_1.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_1.xml.ref
new file mode 100644
index 0000000000..67f1fbe808
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_1.xml.ref
@@ -0,0 +1,47 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   processingInstruction(target="xml", data="version='1.0' encoding='UTF-8' standalone='no'")
+   startDTD(name="foo", publicId="", systemId="foo.dtd")
+      internatlEntityDecl(name="def", value="foo")
+   endDTD()
+   startElement(namespaceURI="", localName="foo", qName="foo", atts=[])
+      characters(ch="\n    ")
+      comment(ch=" check that the call to skippedEntity() is inserted in the right place ")
+      characters(ch="\n    ")
+      startElement(namespaceURI="", localName="a", qName="a", atts=[])
+         characters(ch="abc")
+         skippedEntity(name="undef")
+         characters(ch="gh")
+      endElement(namespaceURI="", localName="a", qName="a")
+      characters(ch="\n    ")
+      startElement(namespaceURI="", localName="b", qName="b", atts=[])
+         skippedEntity(name="undef")
+         characters(ch="gh")
+      endElement(namespaceURI="", localName="b", qName="b")
+      characters(ch="\n    ")
+      startElement(namespaceURI="", localName="c", qName="c", atts=[])
+         characters(ch="abc")
+         skippedEntity(name="undef")
+      endElement(namespaceURI="", localName="c", qName="c")
+      characters(ch="\n    ")
+      startElement(namespaceURI="", localName="d", qName="d", atts=[])
+         skippedEntity(name="undef")
+      endElement(namespaceURI="", localName="d", qName="d")
+      characters(ch="\n    ")
+      startElement(namespaceURI="", localName="e", qName="e", atts=[])
+         skippedEntity(name="undef")
+         characters(ch="foo")
+         skippedEntity(name="undef")
+         characters(ch="foo")
+      endElement(namespaceURI="", localName="e", qName="e")
+      characters(ch="\n    ")
+      startElement(namespaceURI="", localName="e", qName="e", atts=[])
+         characters(ch="a")
+         skippedEntity(name="undef")
+         characters(ch="bfooc")
+         skippedEntity(name="undef")
+         characters(ch="dfooe")
+      endElement(namespaceURI="", localName="e", qName="e")
+      characters(ch="\n")
+   endElement(namespaceURI="", localName="foo", qName="foo")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_2.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_2.xml
new file mode 100644
index 0000000000..a1fb393371
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_2.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<!DOCTYPE foo SYSTEM "foo.dtd" [
+    <!ENTITY a1 "&a2;">
+    <!ENTITY a2 "&a3;">
+    <!ENTITY def "foo">
+]>
+<foo>
+    <a>abc&a1;gh</a>
+    <b>&a1;gh</b>
+    <c>abc&a1;</c>
+    <d>&a1;</d>
+    <e>&a1;&def;&a1;&def;</e>
+    <e>a&a1;b&def;c&a1;d&def;e</e>
+</foo>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_2.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_2.xml.ref
new file mode 100644
index 0000000000..a7ed3a2848
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_2.xml.ref
@@ -0,0 +1,47 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   processingInstruction(target="xml", data="version='1.0' encoding='UTF-8' standalone='no'")
+   startDTD(name="foo", publicId="", systemId="foo.dtd")
+      internatlEntityDecl(name="a1", value="&a2;")
+      internatlEntityDecl(name="a2", value="&a3;")
+      internatlEntityDecl(name="def", value="foo")
+   endDTD()
+   startElement(namespaceURI="", localName="foo", qName="foo", atts=[])
+      characters(ch="\n    ")
+      startElement(namespaceURI="", localName="a", qName="a", atts=[])
+         characters(ch="abc")
+         skippedEntity(name="a3")
+         characters(ch="gh")
+      endElement(namespaceURI="", localName="a", qName="a")
+      characters(ch="\n    ")
+      startElement(namespaceURI="", localName="b", qName="b", atts=[])
+         skippedEntity(name="a3")
+         characters(ch="gh")
+      endElement(namespaceURI="", localName="b", qName="b")
+      characters(ch="\n    ")
+      startElement(namespaceURI="", localName="c", qName="c", atts=[])
+         characters(ch="abc")
+         skippedEntity(name="a3")
+      endElement(namespaceURI="", localName="c", qName="c")
+      characters(ch="\n    ")
+      startElement(namespaceURI="", localName="d", qName="d", atts=[])
+         skippedEntity(name="a3")
+      endElement(namespaceURI="", localName="d", qName="d")
+      characters(ch="\n    ")
+      startElement(namespaceURI="", localName="e", qName="e", atts=[])
+         skippedEntity(name="a3")
+         characters(ch="foo")
+         skippedEntity(name="a3")
+         characters(ch="foo")
+      endElement(namespaceURI="", localName="e", qName="e")
+      characters(ch="\n    ")
+      startElement(namespaceURI="", localName="e", qName="e", atts=[])
+         characters(ch="a")
+         skippedEntity(name="a3")
+         characters(ch="bfooc")
+         skippedEntity(name="a3")
+         characters(ch="dfooe")
+      endElement(namespaceURI="", localName="e", qName="e")
+      characters(ch="\n")
+   endElement(namespaceURI="", localName="foo", qName="foo")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_3.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_3.xml
new file mode 100644
index 0000000000..ae745d4da1
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_3.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<!DOCTYPE foo SYSTEM "foo.dtd" [
+    <!ENTITY a1 "&a2;">
+    <!ENTITY a2 "&a3;">
+    <!ENTITY def "foo">
+]>
+<foo>
+    <a attr="foo&a1;bar&def;ding"/>
+</foo>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_3.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_3.xml.ref
new file mode 100644
index 0000000000..09f8e96b9c
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_3.xml.ref
@@ -0,0 +1,16 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   processingInstruction(target="xml", data="version='1.0' encoding='UTF-8' standalone='no'")
+   startDTD(name="foo", publicId="", systemId="foo.dtd")
+      internatlEntityDecl(name="a1", value="&a2;")
+      internatlEntityDecl(name="a2", value="&a3;")
+      internatlEntityDecl(name="def", value="foo")
+   endDTD()
+   startElement(namespaceURI="", localName="foo", qName="foo", atts=[])
+      characters(ch="\n    ")
+      skippedEntity(name="a3")
+      startElement(namespaceURI="", localName="a", qName="a", atts=[{localName="attr", qName="attr", uri="", type="CDATA", value="foobarfooding"}])
+      endElement(namespaceURI="", localName="a", qName="a")
+      characters(ch="\n")
+   endElement(namespaceURI="", localName="foo", qName="foo")
+endDocument()